[MERGE] forward port branch saas-11 up to 1304d13

2 files changed, 25 insertions, 2 deletions

diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index be2acdb1365..4b88d9f06e5 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -196,6 +196,13 @@ odoo.define_section('list.edition', ['web.data', 'web.ListView', 'web.data_manag
         mock.add('demo:onchange', function () {
             return {};
         });
+        mock.add('demo:fields_get', function () {
+            return {
+                a: {type: 'char', string: "A"},
+                b: {type: 'char', string: "B"},
+                c: {type: 'char', string: "C"}
+            };
+        });
     }
 
     test('newrecord', function (assert, data, ListView, data_manager) {
@@ -263,6 +270,13 @@ odoo.define_section('list.edition.events', ['web.data', 'web.ListView', 'web.dat
         mock.add('demo:read', function () {
             return [{ id: 1, a: 'foo', b: 'bar', c: 'baz' }];
         });
+        mock.add('demo:fields_get', function () {
+            return {
+                a: {type: 'char', string: "A"},
+                b: {type: 'char', string: "B"},
+                c: {type: 'char', string: "C"}
+            };
+        });
     }
 
     test('edition events',function (assert, data, ListView, data_manager) {
@@ -345,6 +359,13 @@ odoo.define_section('list.edition.onwrite', ['web.data', 'web.ListView', 'web.da
         mock.add('demo:default_get', function () { return {}; });
         mock.add('demo:create', function () { return 1; });
         mock.add('demo:on_write', function () { return [42]; });
+        mock.add('demo:fields_get', function () {
+            return {
+                a: {type: 'char', string: "A"},
+                b: {type: 'char', string: "B"},
+                c: {type: 'char', string: "C"}
+            };
+        });
 
         var ds = new data.DataSetStatic(null, 'demo', null, []);
         var fields_view = data_manager._postprocess_fvg({
diff --git a/addons/web/static/test/list.js b/addons/web/static/test/list.js
index 9d1d1b9ec7d..49adabba13d 100644
--- a/addons/web/static/test/list.js
+++ b/addons/web/static/test/list.js
@@ -2,7 +2,7 @@ odoo.define_section('list.buttons', ['web.ListView', 'web.data', 'web.data_manag
 
     test('record-deletion', function (assert, ListView, data, data_manager) {
         assert.expect(2);
-        
+
         mock.add('demo:read', function (args, kwargs) {
             if (_.isEqual(args[0], [1, 2, 3])) {
                 return [
@@ -18,7 +18,9 @@ odoo.define_section('list.buttons', ['web.ListView', 'web.data', 'web.data_manag
             throw new Error(JSON.stringify(_.toArray(arguments)));
         });
         mock.add('/web/dataset/call_button', function () { return false; });
-
+        mock.add('demo:fields_get', function() {
+            return {a: {type: 'char', string: "A"}};
+        });
 
         var ds = new data.DataSetStatic(null, 'demo', null, [1, 2, 3]);
         var fields_view = data_manager._postprocess_fvg({