From: Xavier Morel <xmo@openerp.com>
Date: Thu, 11 Oct 2012 07:57:59 +0000 (+0200)
Subject: [FIX] after discussions with odo, date/datetime/time for locally-evaluated contexts... 
X-Git-Tag: 7.0-server~723^2~32
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;ds=sidebyside;h=b94e9c30a78e0047457977bf8ff5bd6bdda81372;p=odoo%2Fodoo.git

[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
---

diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index a00fd18..51fdc63 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, {
diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index 72503d5..276636c 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -12,15 +12,15 @@ $(document).ready(function () {
         var context = openerp.web.pyeval.context();
         strictEqual(
             py.eval("time.strftime('%Y')", context),
-            String(d.getUTCFullYear()));
+            String(d.getFullYear()));
         strictEqual(
             py.eval("time.strftime('%Y')+'-01-30'", context),
-            String(d.getUTCFullYear()) + '-01-30');
+            String(d.getFullYear()) + '-01-30');
         strictEqual(
             py.eval("time.strftime('%Y-%m-%d %H:%M:%S')", context),
             _.str.sprintf('%04d-%02d-%02d %02d:%02d:%02d',
-                d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate(),
-                d.getUTCHours(), d.getUTCMinutes(), d.getUTCSeconds()));
+                d.getFullYear(), d.getMonth() + 1, d.getDate(),
+                d.getHours(), d.getMinutes(), d.getSeconds()));
     });
 
     module("eval.contexts", {