fixup! [IMP] util/fields: Convert to company dependent without company field

Author: aj-fuentes

src/base/tests/test_util.py

@@ -1177,6 +1177,7 @@ def test_convert_field_to_company_dependent(self):
         )
 
         c1 = self.env["res.company"].create({"name": "Flancrest"})
+        c2 = self.env["res.company"].create({"name": "Flancrest2"})
 
         test_partners = self.env["res.partner"].create(
             [
@@ -1189,15 +1190,30 @@ def test_convert_field_to_company_dependent(self):
 
         # Using company_id as default, only records with company set are updated
         util.make_field_company_dependent(cr, "res.partner", "x_test_cd_1", "char")
-        self.assertEqual(test_partners[0].x_test_cd_1, {str(c1.id): "A"})
-        self.assertFalse(test_partners[1].x_test_cd_1)
-        self.assertFalse(test_partners[2].x_test_cd_1)
-
-        # Ignoring company field and composing value for all companies
         util.make_field_company_dependent(cr, "res.partner", "x_test_cd_2", "char", company_field=False)
-        self.assertEqual(test_partners[0].x_test_cd_2, {str(id): "A" for id in self.env["res.company"].search([]).ids})
-        self.assertEqual(test_partners[1].x_test_cd_2, {str(id): "B" for id in self.env["res.company"].search([]).ids})
-        self.assertFalse(test_partners[2].x_test_cd_2)
+
+        # TODO: make the ORM re-read the info about these manual fields from the DB
+        test_partners._fields["x_test_cd_1"].company_dependent = True
+        test_partners._fields["x_test_cd_2"].company_dependent = True
+
+        test_partners_c1 = test_partners.with_company(c1.id)
+        self.assertEqual(test_partners_c1[0].x_test_cd_1, "A")
+        self.assertFalse(test_partners_c1[1].x_test_cd_1)
+        self.assertFalse(test_partners_c1[2].x_test_cd_1)
+        self.assertEqual(test_partners_c1[0].x_test_cd_2, "A")
+        self.assertEqual(test_partners_c1[1].x_test_cd_2, "B")
+        self.assertFalse(test_partners_c1[2].x_test_cd_2)
+
+        # AFU: a bug? We need to invalidate in order to get the value of the other company
+        test_partners.invalidate_recordset()
+        test_partners_c2 = test_partners.with_company(c2.id)
+
+        self.assertFalse(test_partners_c2[0].x_test_cd_1)
+        self.assertFalse(test_partners_c2[1].x_test_cd_1)
+        self.assertFalse(test_partners_c2[2].x_test_cd_1)
+        self.assertEqual(test_partners_c2[0].x_test_cd_2, "A")
+        self.assertEqual(test_partners_c2[1].x_test_cd_2, "B")
+        self.assertFalse(test_partners_c2[2].x_test_cd_2)
 
 
 class TestHelpers(UnitTestCase):