1 files changed, 36 insertions, 44 deletions

diff --git a/addons/web/static/src/js/views/basic/basic_view.js b/addons/web/static/src/js/views/basic/basic_view.js
index 4566d0b9471..6668392b823 100644
--- a/addons/web/static/src/js/views/basic/basic_view.js
+++ b/addons/web/static/src/js/views/basic/basic_view.js
@@ -96,14 +96,15 @@ var BasicView = AbstractView.extend({
      * @private
      * @returns {Promise}
      */
-    _loadData: function (model) {
+    _loadData: async function (model) {
         if (this.recordID) {
             // Add the fieldsInfo of the current view to the given recordID,
             // as it will be shared between two views, and it must be able to
             // handle changes on fields that are only on this view.
-            model.addFieldsInfo(this.recordID, {
+            await model.addFieldsInfo(this.recordID, {
                 fields: this.fields,
-                fieldsInfo: this.fieldsInfo,
+                fieldInfo: this.fieldsInfo[this.viewType],
+                viewType: this.viewType,
             });
 
             var record = model.get(this.recordID);
@@ -119,7 +120,7 @@ var BasicView = AbstractView.extend({
             // in the form view (e.g. if field is a many2many list in the form
             // view, or if it is displayed by a widget requiring specialData).
             // So when this happens, F is added to the list of fieldNames to fetch.
-            _.each(viewFields, function (name) {
+            _.each(viewFields, (name) => {
                 if (!_.contains(fieldNames, name)) {
                     var fieldType = record.fields[name].type;
                     var fieldInfo = fieldsInfo[name];
@@ -137,30 +138,28 @@ var BasicView = AbstractView.extend({
                     // X2Many case: field is an x2many displayed as a list or
                     // kanban view, but the related fields haven't been loaded yet.
                     if ((fieldType === 'one2many' || fieldType === 'many2many')) {
-                        if (!('fieldsInfo' in record.data[name])) {
+                        var x2mFieldInfo = record.fieldsInfo[this.viewType][name];
+                        var viewType = x2mFieldInfo.viewType || x2mFieldInfo.mode;
+                        var knownFields = Object.keys(record.data[name].fieldsInfo[record.data[name].viewType] || {});
+                        var newFields = Object.keys(record.data[name].fieldsInfo[viewType]);
+                        if (_.difference(newFields, knownFields).length) {
                             fieldNames.push(name);
-                        } else {
+                        }
+
+                        if (record.data[name].viewType === 'default') {
+                            // Use case: x2many (tags) in x2many list views
+                            // When opening the x2many record form view, the
+                            // x2many will be reloaded but it may not have
+                            // the same fields (ex: tags in list and list in
+                            // form) so we need to merge the fieldsInfo to
+                            // avoid losing the initial fields (display_name)
                             var fieldViews = fieldInfo.views || fieldInfo.fieldsInfo || {};
-                            var fieldViewTypes = Object.keys(fieldViews);
-                            var recordViewTypes = Object.keys(record.data[name].fieldsInfo);
-                            if (_.difference(fieldViewTypes, recordViewTypes).length) {
-                                fieldNames.push(name);
-                            }
-
-                            if (record.data[name].viewType === 'default') {
-                                // Use case: x2many (tags) in x2many list views
-                                // When opening the x2many record form view, the
-                                // x2many will be reloaded but it may not have
-                                // the same fields (ex: tags in list and list in
-                                // form) so we need to merge the fieldsInfo to
-                                // avoid losing the initial fields (display_name)
-                                var defaultFieldInfo = record.data[name].fieldsInfo.default;
-                                _.each(fieldViews, function (fieldView) {
-                                    _.each(fieldView.fieldsInfo, function (x2mFieldInfo) {
-                                        _.defaults(x2mFieldInfo, defaultFieldInfo);
-                                    });
+                            var defaultFieldInfo = record.data[name].fieldsInfo.default;
+                            _.each(fieldViews, function (fieldView) {
+                                _.each(fieldView.fieldsInfo, function (x2mFieldInfo) {
+                                    _.defaults(x2mFieldInfo, defaultFieldInfo);
                                 });
-                            }
+                            });
                         }
                     }
                     // Many2one: context is not the same between the different views
@@ -176,25 +175,18 @@ var BasicView = AbstractView.extend({
 
             var def;
             if (fieldNames.length) {
-                // Some fields in the new view weren't in the previous one, so
-                // we might have stored changes for them (e.g. coming from
-                // onchange RPCs), that we haven't been able to process earlier
-                // (because those fields were unknow at that time). So we ask
-                // the model to process them.
-                def = model.applyRawChanges(record.id, viewType).then(function () {
-                    if (model.isNew(record.id)) {
-                        return model.applyDefaultValues(record.id, {}, {
-                            fieldNames: fieldNames,
-                            viewType: viewType,
-                        });
-                    } else {
-                        return model.reload(record.id, {
-                            fieldNames: fieldNames,
-                            keepChanges: true,
-                            viewType: viewType,
-                        });
-                    }
-                });
+                if (model.isNew(record.id)) {
+                    def = model.applyDefaultValues(record.id, {}, {
+                        fieldNames: fieldNames,
+                        viewType: viewType,
+                    });
+                } else {
+                    def = model.reload(record.id, {
+                        fieldNames: fieldNames,
+                        keepChanges: true,
+                        viewType: viewType,
+                    });
+                }
             }
             return Promise.resolve(def).then(function () {
                 return model.get(record.id);