[MERGE] from trunk

bzr revid: chm@openerp.com-20121207081026-3edlt0698csc6gk8

1 files changed, 1 insertions, 6 deletions

diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index 4ee9fea0584..2c1b5ec9d7d 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -24,7 +24,7 @@ openerp.web.pyeval = function (instance) {
         var mod = a%b;
         // in python, sign(a % b) === sign(b). Not in JS. If wrong side, add a
         // round of b
-        if (mod > 0 && b < 0 || mod < 0  && b > 0) {
+        if (mod > 0 && b < 0 || mod < 0 && b > 0) {
             mod += b;
         }
         return fn(Math.floor(a/b), mod);
@@ -434,11 +434,6 @@ openerp.web.pyeval = function (instance) {
                     throw new Error('ValueError: No known conversion for ' + m);
                 }));
         },
-        today: py.classmethod.fromJSON(function () {
-            var d = new Date();
-            return py.PY_call(
-                datetime.date, [d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate()]);
-        }),
         __eq__: function (other) {
             return (this.year === other.year
                  && this.month === other.month