summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/pyeval.js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-10-11 09:57:59 +0200
committerXavier Morel <xmo@openerp.com>2012-10-11 09:57:59 +0200
commitb94e9c30a78e0047457977bf8ff5bd6bdda81372 (patch)
tree853a57aab6248366b6896eb73ada1af859e808fd /addons/web/static/src/js/pyeval.js
parent1fa00288b269e68a47849eaa3fefc090759a357d (diff)
[FIX] after discussions with odo, date/datetime/time for locally-evaluated contexts and domains should be local, not UTC
bzr revid: xmo@openerp.com-20121011075759-qfwkfws5tu9yidab
Diffstat (limited to 'addons/web/static/src/js/pyeval.js')
-rw-r--r--addons/web/static/src/js/pyeval.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index a00fd186d58..51fdc63e84c 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -46,14 +46,14 @@ openerp.web.pyeval = function (instance) {
now: py.classmethod.fromJSON(function () {
var d = new Date();
return py.PY_call(datetime.datetime,
- [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
- d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds(),
- d.getUTCMilliseconds() * 1000]);
+ [d.getFullYear(), d.getMonth() + 1, d.getDate(),
+ d.getHours(), d.getMinutes(), d.getSeconds(),
+ d.getMilliseconds() * 1000]);
}),
today: py.classmethod.fromJSON(function () {
var d = new Date();
return py.PY_call(datetime.datetime,
- [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]);
+ [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
}),
combine: py.classmethod.fromJSON(function () {
var args = py.PY_parseArgs(arguments, 'date time');
@@ -91,7 +91,7 @@ openerp.web.pyeval = function (instance) {
today: py.classmethod.fromJSON(function () {
var d = new Date();
return py.PY_call(
- datetime.date, [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]);
+ datetime.date, [d.getFullYear(), d.getMonth() + 1, d.getDate()]);
})
});
datetime.time = py.type('time', null, {