Merge PR #1195 into 14.0

Signed-off-by pedrobaeza

base_location/models/res_partner.py

@@ -149,4 +149,4 @@ class ResPartner(models.Model):
 
     @api.model
     def _address_fields(self):
-        return super()._address_fields() + ["zip_id", "city_id"]
+        return super()._address_fields() + ["zip_id"]

base_location/tests/test_base_location.py

@@ -212,6 +212,7 @@ class TestBaseLocation(common.SavepointCase):
                 "is_company": True,
                 "street": "123 Fake St.",
                 "city": "Springfield",
+                "city_id": self.barcelona.city_id.id,
                 "state_id": self.barcelona.state_id.id,
                 "country_id": self.barcelona.country_id.id,
                 "zip_id": self.barcelona.id,
@@ -224,7 +225,9 @@ class TestBaseLocation(common.SavepointCase):
                 "parent_id": parent.id,
             }
         )
+        parent = Form(parent)
         parent.zip_id = self.lausanne
+        parent.save()
         self.assertEqual(contact.zip_id, self.lausanne, "Contact should be synced")
 
     def test_display_name(self):