[MERGE] forward port branch 10.0 up to 6804085b8ce

4 files changed, 20 insertions, 17 deletions

diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js
index d084b285f6c..479fa1082cd 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 a15b588a297..46136e21565 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1062,8 +1062,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 () {
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 2468db8cbcf..572fcbff95f 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1502,20 +1502,16 @@ ListView.Groups = Class.extend({
         });
     },
     setup_resequence_rows: function (list, dataset) {
+        var sequence_field = _(this.columns).findWhere({'widget': 'handle'});
+        var seqname = sequence_field ? sequence_field.name : 'sequence';
+
         // drag and drop enabled if list is not sorted (unless it is sorted by
-        // sequence (ASC)), and there is a visible column with @widget=handle
-        // or "sequence" column in the view.
-        if ((dataset.sort && dataset.sort() && dataset.sort() !== 'sequence'
-            && dataset.sort() !== 'sequence ASC')
-            || !_(this.columns).any(function (column) {
-                    return column.widget === 'handle'
-                        || column.name === 'sequence'; })) {
+        // its sequence field (ASC)), and there is a visible column with
+        // @widget=handle or "sequence" column in the view.
+        if ((dataset.sort && [seqname, seqname + 'ASC', ''].indexOf(dataset.sort()) === -1)
+            || !_(this.columns).findWhere({'name': seqname})) {
             return;
         }
-        var sequence_field = _(this.columns).find(function (c) {
-            return c.widget === 'handle';
-        });
-        var seqname = sequence_field ? sequence_field.name : 'sequence';
 
         // ondrop, move relevant record & fix sequences
         list.$current.sortable({
diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index 30adbd64017..d3135f86ba6 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -408,6 +408,7 @@ var DataExport = Dialog.extend({
     },
     add_field: function(field_id, string) {
         var $field_list = this.$('.o_fields_list');
+        field_id = this.records[field_id].value || field_id;
         if($field_list.find("option[value='" + field_id + "']").length === 0) {
             $field_list.append(new Option(string, field_id));
         }