[MERGE] forward port branch saas-12.3 up to 120359bf0c9

4 files changed, 66 insertions, 2 deletions

diff --git a/odoo/addons/test_testing_utilities/ir.model.access.csv b/odoo/addons/test_testing_utilities/ir.model.access.csv
index c069b568ad4..c43b736c531 100644
--- a/odoo/addons/test_testing_utilities/ir.model.access.csv
+++ b/odoo/addons/test_testing_utilities/ir.model.access.csv
@@ -12,7 +12,10 @@ access_test_testing_utilities_parent,access_test_testing_utilities_parent,model_
 access_test_testing_utilities_sub,access_test_testing_utilities_sub,model_test_testing_utilities_sub,,1,0,0,0
 access_test_testing_utilities_sub2,access_test_testing_utilities_sub2,model_test_testing_utilities_sub2,,1,0,0,0
 access_test_testing_utilities_sub3,access_test_testing_utilities_sub3,model_test_testing_utilities_sub3,,1,0,0,0
+access_test_testing_utilities_recursive,access_test_testing_utilities_recursive,model_test_testing_utilities_recursive,,1,0,0,0
 access_test_testing_utilities_onchange_parent,access_test_testing_utilities_onchange_parent,model_test_testing_utilities_onchange_parent,,1,0,0,0
 access_test_testing_utilities_onchange_line,access_test_testing_utilities_onchange_line,model_test_testing_utilities_onchange_line,,1,0,0,0
 access_model_test_testing_utilities_onchange_count,access_model_test_testing_utilities_onchange_count,model_test_testing_utilities_onchange_count,,1,1,1,1
 access_test_testing_utilities_onchange_count_sub,access_test_testing_utilities_onchange_count_sub,model_test_testing_utilities_onchange_count_sub,,1,1,1,1
+access_o2m_readonly_subfield_parent,access_o2m_readonly_subfield_parent,model_o2m_readonly_subfield_parent,,1,1,1,1
+access_o2m_readonly_subfield_child,access_o2m_readonly_subfield_child,model_o2m_readonly_subfield_child,,1,1,1,1
diff --git a/odoo/addons/test_testing_utilities/menu.xml b/odoo/addons/test_testing_utilities/menu.xml
index fa5f4f37163..491a74dda46 100644
--- a/odoo/addons/test_testing_utilities/menu.xml
+++ b/odoo/addons/test_testing_utilities/menu.xml
@@ -151,4 +151,17 @@
             </form>
         </field>
     </record>
+
+    <record id="o2m_recursive_relation_view" model="ir.ui.view">
+        <field name="name">Recursive Relation Test View</field>
+        <field name="model">test_testing_utilities.recursive</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <field name="one_to_many_id"/>
+                    <field name="many_to_one_ids"/>
+                </sheet>
+            </form>
+        </field>
+    </record>
 </odoo>
diff --git a/odoo/addons/test_testing_utilities/models.py b/odoo/addons/test_testing_utilities/models.py
index fbdec47a7cf..0c04bc06e8d 100644
--- a/odoo/addons/test_testing_utilities/models.py
+++ b/odoo/addons/test_testing_utilities/models.py
@@ -188,6 +188,13 @@ class O2MSub3(models.Model):
             r.name = str(r.v)
 
 
+class O2MRecursive(models.Model):
+    _name = _description = 'test_testing_utilities.recursive'
+
+    one_to_many_id = fields.Many2one('test_testing_utilities.recursive', readonly=True)
+    many_to_one_ids = fields.One2many('test_testing_utilities.recursive', 'one_to_many_id', readonly=True)
+
+
 class O2MOnchangeParent(models.Model):
     _name = 'test_testing_utilities.onchange_parent'
     _description = 'Testing Utilities Onchange Parent'
@@ -233,3 +240,24 @@ class O2MChangeSub(models.Model):
 
     parent = fields.Many2one('test_testing_utilities.onchange_count')
     name = fields.Char()
+
+class O2MReadonlySubfield(models.Model):
+    _name = 'o2m_readonly_subfield_parent'
+    _description = _name
+
+    line_ids = fields.One2many('o2m_readonly_subfield_child', 'parent_id')
+
+class O2MReadonlySubfieldChild(models.Model):
+    _name = _description = 'o2m_readonly_subfield_child'
+
+    name = fields.Char()
+    parent_id = fields.Many2one('o2m_readonly_subfield_parent')
+    f = fields.Integer(compute='_compute_f', inverse='_inverse_f', readonly=True)
+
+    @api.depends('name')
+    def _compute_f(self):
+        for r in self:
+            r.f = len(r.name) if r.name else 0
+
+    def _inverse_f(self):
+        raise AssertionError("Inverse of f should not be called")
diff --git a/odoo/addons/test_testing_utilities/tests/test_form_impl.py b/odoo/addons/test_testing_utilities/tests/test_form_impl.py
index c13dbd73a60..0191a4da7ad 100644
--- a/odoo/addons/test_testing_utilities/tests/test_form_impl.py
+++ b/odoo/addons/test_testing_utilities/tests/test_form_impl.py
@@ -359,7 +359,7 @@ class TestO2M(TransactionCase):
 
         self.assertEqual(
             [get(s) for s in r.subs],
-            [("5", 2, 5)]
+            [("5", 0, 5)]
         )
 
     def test_o2m_inner_default(self):
@@ -409,7 +409,10 @@ class TestO2M(TransactionCase):
             self.assertEqual(sub.value, 1)
             self.assertEqual(sub.v, 1)
 
-    def test_m2o_readonly(self):
+    def test_readonly_o2m(self):
+        """ Tests that o2m fields flagged as readonly (readonly="1" in the
+        view) can't be written to
+        """
         r = self.env['test_testing_utilities.parent'].create({
             'subs': [(0, 0, {})]
         })
@@ -422,6 +425,20 @@ class TestO2M(TransactionCase):
         with self.assertRaises(AssertionError):
             f.subs.remove(index=0)
 
+    def test_o2m_readonly_subfield(self):
+        """ Tests that readonly is applied to the field of the o2m = not sent
+        as part of the create / write values
+        """
+        f = Form(self.env['o2m_readonly_subfield_parent'])
+        with f.line_ids.new() as new_line:
+            new_line.name = "ok"
+            self.assertEqual(new_line.f, 2)
+        r = f.save()
+        self.assertEqual(
+            (r.line_ids.name, r.line_ids.f),
+            ('ok', 2)
+        )
+
     def test_o2m_dyn_onchange(self):
         f = Form(self.env['test_testing_utilities.onchange_parent'], view='test_testing_utilities.m2o_onchange_view')
 
@@ -467,6 +484,9 @@ class TestO2M(TransactionCase):
             self.assertEqual(commands(), [0, 2, 2], "should contain 1 '0' command and 2 deletions")
         self.assertEqual(len(r.line_ids), 1)
 
+    def test_o2m_self_recursive(self):
+        Form(self.env['test_testing_utilities.recursive'], view='test_testing_utilities.o2m_recursive_relation_view')
+
 class TestEdition(TransactionCase):
     """ These use the context manager form as we don't need the record
     post-save (we already have it) and it's easier to see what bits act on