[MERGE] forward port branch saas-12.3 up to 409679866b2

1 files changed, 7 insertions, 11 deletions

diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index 3206ef7b47a..5b4480838fe 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -13,6 +13,7 @@ var DateWidget = Widget.extend({
     type_of_date: "date",
     events: {
         'change.datetimepicker': 'changeDatetime',
+        'error.datetimepicker': 'errorDatetime',
         'change .o_datepicker_input': 'changeDatetime',
         'click input': '_onInputClicked',
         'input input': '_onInput',
@@ -112,6 +113,12 @@ var DateWidget = Widget.extend({
         }
     },
     /**
+     * Library clears the wrong date format so just ignore error
+     */
+    errorDatetime: function (e) {
+        return false;
+    },
+    /**
      * Focuses the datepicker input. This function must be called in order to
      * prevent 'input' events triggered by the lib to bubble up, and to cause
      * unwanted effects (like triggering 'field_changed' events)
@@ -276,17 +283,6 @@ var DateWidget = Widget.extend({
      */
     _onKeydown: function (ev) {
         if (ev.which === $.ui.keyCode.ESCAPE) {
-            this.__libInput++;
-            this.$el.datetimepicker('hide');
-            this.__libInput--;
-        }
-    },
-    /**
-     * @private
-     * @param {KeyEvent} ev
-     */
-    _onKeydown: function (ev) {
-        if (ev.which === $.ui.keyCode.ESCAPE) {
             if (this.__isOpen) {
                 // we don't want any other effects than closing the datepicker,
                 // like leaving the edition of a row in editable list view