[MERGE] forward port branch saas-14 up to 47fdd9ca71

addons/base_address_city/models/res_partner.py

@@ -20,10 +20,10 @@ class Partner(models.Model):
     @api.model
     def _fields_view_get_address(self, arch):
         arch = super(Partner, self)._fields_view_get_address(arch)
-        if not self._context.get('no_address_format'):
-            return arch
         # render the partner address accordingly to address_view_id
         doc = etree.fromstring(arch)
+        if doc.xpath("//field[@name='city_id']"):
+           return arch
         for city_node in doc.xpath("//field[@name='city']"):
             replacement_xml = """
             <div>

doc/cla/corporate/merchise.md

@@ -18,3 +18,5 @@ Henrik Pestano henrik@merchise.org https://github.com/hpestano
 Oraldo Jacinto Simón oraldo@merchise.org
 Sergio Valdés sergiov@merchise.org
 Medardo Rodríguez med@merchise.org https://github.com/med-merchise
+Abel Firvida firvida@merchise.org
+Abel Firvida abel@merchise.org