pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] after discussions with odo, date/datetime/time for locally-evaluated contexts and domains should be local, not UTC

Browse Source 
bzr revid: xmo@openerp.com-20121011075759-qfwkfws5tu9yidab
This commit is contained in:
Xavier Morel
2012-10-11 09:57:59 +02:00
parent 1fa00288b2
commit b94e9c30a7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/pyeval.js
+5 -5
View File
@@ -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, {
addons/web/static/test/evals.js
+4 -4
View File
@@ -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", {