[MERGE] forward port branch saas-12 up to 10cde43

2 files changed, 3 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 22ca3e0b1ad..327edcbb052 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1092,8 +1092,8 @@ ListView.List = Class.extend({
                                    _(names).pluck(1).join(', '));
                         record.set(column.id, ids);
                     });
-                // temp empty value
-                record.set(column.id, false);
+                // temporary empty display name
+                record.set(column.id + '__display', false);
             }
         }
         return column.format(record.toForm().data, {
diff --git a/addons/web/static/src/js/views/tree_view.js b/addons/web/static/src/js/views/tree_view.js
index aeb206257fe..604c9204b42 100644
--- a/addons/web/static/src/js/views/tree_view.js
+++ b/addons/web/static/src/js/views/tree_view.js
@@ -49,7 +49,7 @@ var TreeView = View.extend({
     },
     willStart: function () {
         _(this.fields_view.arch.children).each(function (field) {
-            if (field.attrs.modifiers) {
+            if (field.attrs.modifiers && typeof field.attrs.modifiers === "string") {
                 field.attrs.modifiers = JSON.parse(field.attrs.modifiers);
             }
         });