[MERGE] forward port branch 11.0 up to f96a797fe62

1 files changed, 6 insertions, 2 deletions

diff --git a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
index 8f0724bbb00..19f261ff4fc 100644
--- a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
+++ b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
@@ -479,8 +479,12 @@
             },
 
             notifyEvent = function (e) {
-                if (e.type === 'dp.change' && ((e.date && e.date.isSame(e.oldDate)) || (!e.date && !e.oldDate))) {
-                    return;
+                if (e.type === 'dp.change') {
+                    // check _isUTC flag to ensure that we are not comparing apples and oranges
+                    var bothUTC = e.date && e.oldDate && e.date._isUTC === e.oldDate._isUTC; 
+                    if ((bothUTC && e.date.isSame(e.oldDate)) || (!e.date && !e.oldDate)) {
+                        return;
+                    }
                 }
                 element.trigger(e);
             },