[MERGE] forward port branch 9.0 up to 0997a1cf6dc

2 files changed, 12 insertions, 6 deletions

diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js
index 90cecd5398d..bddc40f424d 100644
--- a/addons/web/static/src/js/framework/formats.js
+++ b/addons/web/static/src/js/framework/formats.js
@@ -161,26 +161,30 @@ function parse_value (value, descriptor, value_if_empty) {
             return parse_value(value, {type: "float"});
         case 'datetime':
             var datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero, moment.ISO_8601], true);
-            if (datetime.isValid())
+            if (datetime.isValid() && datetime.year() >= 1900)
                 return time.datetime_to_str(datetime.toDate());
             datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero, moment.ISO_8601]);
             if (datetime.isValid()) {
                 if (datetime.year() === 0) {
                     datetime.year(moment.utc().year());
                 }
-                return time.datetime_to_str(datetime.toDate());
+                if (datetime.year() >= 1900) {
+                    return time.datetime_to_str(datetime.toDate());
+                }
             }
             throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value));
         case 'date':
             var date = moment(value, [date_pattern, date_pattern_wo_zero, moment.ISO_8601], true);
-            if (date.isValid())
+            if (date.isValid() && date.year() >= 1900)
                 return time.date_to_str(date.toDate());
             date = moment(value, [date_pattern, date_pattern_wo_zero, moment.ISO_8601]);
             if (date.isValid()) {
                 if (date.year() === 0) {
                     date.year(moment.utc().year());
                 }
-                return time.date_to_str(date.toDate());
+                if (date.year() >= 1900) {
+                    return time.date_to_str(date.toDate());
+                }
             }
             throw new Error(_.str.sprintf(_t("'%s' is not a correct date"), value));
         case 'time':
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 1a3f9e6a1cc..9a24eef6ae5 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1061,8 +1061,10 @@ var One2ManyListView = X2ManyListView.extend({
             this._dataset_changed = false;
         });
 
-        this.on('warning', this, function(e) { // In case of a one2many, we do not want any warning which comes from the editor
-            e.stop_propagation();
+        this.on('warning', this, function(e) { // In case of editable list view, we do not want any warning which comes from the editor
+            if (this.editable()) {
+                e.stop_propagation();
+            }
         });
     },
     do_add_record: function () {