From ba1a2d7145606e22ae316a636a1852a7ae80a3df Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 10 Mar 2017 12:27:57 +0100
Subject: [FIX] web: DataModel _postprocess was called at a wrong time

The _postprocess method should always be called after _parseServerData,
otherwise the localData between each call is inconsistent for the
relational fields (Array or key pointing to another localData).
---
 addons/web/static/src/js/views/basic/basic_model.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'addons/web/static/src/js/views/basic/basic_model.js')

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 9f2242751e6..f6c2021f2e8 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1320,13 +1320,14 @@ var BasicModel = AbstractModel.extend({
             .then(function (result) {
                 result = result[0];
                 record.data = _.extend({}, record.data, result);
-            }).then(function () {
+            })
+            .then(function () {
+                self._parseServerData(fieldNames, record.fields, record.data);
+            })
+            .then(function () {
                 return self._fetchX2Manys(record, oldData, fieldNames).then(function () {
                     return self._postprocess(record);
                 });
-            }).then(function (record) {
-                self._parseServerData(fieldNames, record.fields, record.data);
-                return record;
             });
     },
     /**
@@ -1836,7 +1837,8 @@ var BasicModel = AbstractModel.extend({
                 var field_values = _.mapObject(record.data, function (val, key) {
                     var fieldType = record.fields[key].type;
                     if (fieldType === 'many2one') {
-                        return val instanceof Array && val[0];
+                        var element = self.localData[val];
+                        return element && element.data.id || false;
                     }
                     return val;
                 });
@@ -1864,13 +1866,14 @@ var BasicModel = AbstractModel.extend({
                 defs.push(fetch_status_information);
             }
             if (options.always_reload) {
-                if (record.data[name] instanceof Array) {
+                if (record.fields[name].type === 'many2one' && record.data[name]) {
+                    var element = self.localData[record.data[name]];
                     defs.push(self._rpc(field.relation, 'name_get')
-                        .args([record.data[name][0]])
+                        .args([element.data.id])
                         .withContext(self._getContext(record, {fieldName: name}))
                         .exec()
                         .then(function (result) {
-                            record.data[name] = result[0];
+                            element.data.display_name = result[0][1];
                         }));
                 }
             }
-- 
cgit v1.2.3