[MERGE] forward port branch 13.0 up to f4105eb9c70

2 files changed, 38 insertions, 2 deletions

diff --git a/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js b/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js
index 4d5b5d8aa89..081bd4e3598 100644
--- a/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js
+++ b/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js
@@ -557,7 +557,7 @@ QUnit.module('fields', {}, function () {
 
             // save the modal and make sure an onchange is triggered
             await testUtils.dom.click($('.modal .modal-footer .btn-primary').first());
-            assert.verifySteps(['read', 'get_formview_id', 'load_views', 'read', 'write', 'onchange', 'read']);
+            assert.verifySteps(['read', 'get_formview_id', 'load_views', 'read', 'write', 'read', 'onchange']);
 
             // save the main record, and check that no extra rpcs are done (record
             // is not dirty, only a related record was modified)
@@ -571,7 +571,7 @@ QUnit.module('fields', {}, function () {
 
             const list = await createView({
                 arch: `
-                    <tree editable="top">
+                    <tree multi_edit="1">
                         <field name="trululu"/>
                     </tree>`,
                 data: this.data,
diff --git a/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js b/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js
index 35b4be9f25e..60f3398c88c 100644
--- a/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js
+++ b/addons/web/static/tests/fields/relational_fields/field_one2many_tests.js
@@ -8705,6 +8705,42 @@ QUnit.module('fields', {}, function () {
 
             form.destroy();
         });
+
+        QUnit.test('editable one2many list with oe_read_only button', async function (assert) {
+            assert.expect(9);
+
+            const form = await createView({
+                View: FormView,
+                model: 'partner',
+                data: this.data,
+                arch: `<form>
+                        <field name="turtles">
+                            <tree editable="bottom">
+                                <field name="turtle_foo"/>
+                                <button name="do_it" type="object" class="oe_read_only"/>
+                            </tree>
+                        </field>
+                    </form>`,
+                res_id: 1,
+            });
+
+            assert.containsN(form, '.o_list_view thead th:visible', 2);
+            assert.containsN(form, '.o_list_view tbody .o_data_row td:visible', 2);
+            assert.containsN(form, '.o_list_view tfoot td:visible', 2);
+            assert.containsNone(form, '.o_list_record_remove_header');
+
+            await testUtils.form.clickEdit(form);
+
+            // should have two visible columns in edit: foo + trash
+            assert.hasClass(form.$('.o_form_view'), 'o_form_editable');
+            assert.containsN(form, '.o_list_view thead th:visible', 2);
+            assert.containsN(form, '.o_list_view tbody .o_data_row td:visible', 2);
+            assert.containsN(form, '.o_list_view tfoot td:visible', 2);
+            assert.containsOnce(form, '.o_list_record_remove_header');
+
+            form.destroy();
+        });
+
     });
 });
 });