audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix date error

Browse Source
This commit is contained in:
ivan deng
2017-11-16 04:37:27 +08:00
parent ee90161267
commit 15c1d04cbf
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app_search_range/static/src/js/pivot.js
View File

@@ -210,7 +210,7 @@ PivotView.include({
moment.locale(tz); moment.locale(tz);
var l10n = _t.database.parameters; var l10n = _t.database.parameters;
if (start_date) { if (start_date) {
if (field_type = 'date') { if (field_type == 'date') {
//日期类型，无须utc处理 //日期类型，无须utc处理
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD'); start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD');
domain.push([field, '>=', start_date]); domain.push([field, '>=', start_date]);
@@ -218,13 +218,13 @@ PivotView.include({
//日期时间，处理utc //日期时间，处理utc
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00'); start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00');
start_utc = moment(start_date) start_utc = moment(start_date)
domain.push([field, '<=', start_utc]); domain.push([field, '>=', start_utc]);
} }
} }
if (end_date) { if (end_date) {
if (field_type = 'date') { if (field_type == 'date') {
end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD'); end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD');
domain.push([field, '>=', end_date]); domain.push([field, '<=', end_date]);
} else { } else {
end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00'); end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00');
end_utc = moment(end_date) end_utc = moment(end_date)

8
app_search_range/static/src/js/tree.js
View File

@@ -225,7 +225,7 @@ ListView.include({
moment.locale(tz); moment.locale(tz);
var l10n = _t.database.parameters; var l10n = _t.database.parameters;
if (start_date) { if (start_date) {
if (field_type = 'date') { if (field_type === 'date') {
//日期类型，无须utc处理 //日期类型，无须utc处理
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD'); start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD');
domain.push([field, '>=', start_date]); domain.push([field, '>=', start_date]);
@@ -233,13 +233,13 @@ ListView.include({
//日期时间，处理utc //日期时间，处理utc
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00'); start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00');
start_utc = moment(start_date) start_utc = moment(start_date)
domain.push([field, '<=', start_utc]); domain.push([field, '>=', start_utc]);
} }
} }
if (end_date) { if (end_date) {
if (field_type = 'date') { if (field_type === 'date') {
end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD'); end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD');
domain.push([field, '>=', end_date]); domain.push([field, '<=', end_date]);
} else { } else {
end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00'); end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00');
end_utc = moment(end_date) end_utc = moment(end_date)