[MERGE] forward port branch saas-15 up to 4d79a1ff58f

1 files changed, 16 insertions, 0 deletions

diff --git a/addons/web/static/src/js/core/pyeval.js b/addons/web/static/src/js/core/pyeval.js
index 75efc9e813f..502c6a4ce90 100644
--- a/addons/web/static/src/js/core/pyeval.js
+++ b/addons/web/static/src/js/core/pyeval.js
@@ -435,6 +435,22 @@ datetime.datetime = py.type('datetime', null, {
             this.second,
             this.microsecond / 1000);
     },
+    __add__: function (other) {
+        if (!py.PY_isInstance(other, datetime.timedelta)) {
+            return py.NotImplemented;
+        }
+        var s = tmxxx(this.year, this.month, this.day + other.days, this.hour, this.minute, this.second + other.seconds);
+        return datetime.datetime.fromJSON(s.year, s.month, s.day, s.hour, s.minute, s.second);
+    },
+    __sub__: function (other) {
+        if (py.PY_isInstance(other, datetime.timedelta)) {
+            return py.PY_add(this, py.PY_negative(other));
+        }
+        return py.NotImplemented;
+    },
+    fromJSON: function (year, month, day, hour, minute, second) {
+        return py.PY_call(datetime.datetime, [year, month, day, hour, minute, second]);
+    },
 });
 
 datetime.date = py.type('date', null, {