From 13b25fedbfb817726ac92674c7386c76c23c8c3c Mon Sep 17 00:00:00 2001 From: Laurent Smet Date: Mon, 9 Oct 2017 13:52:41 +0200 Subject: [PATCH 1/3] [FIX] base_address_city: revert 7dd344129e2ae30a857f72fdf61dca6e40768983 -opw: 774206 --- addons/base_address_city/models/res_partner.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py index f6fcbf61d42..afa5cd759e8 100644 --- a/addons/base_address_city/models/res_partner.py +++ b/addons/base_address_city/models/res_partner.py @@ -20,8 +20,6 @@ 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) for city_node in doc.xpath("//field[@name='city']"): From 165d13bdb5439e4ad78f31dc97ab99a314352d65 Mon Sep 17 00:00:00 2001 From: Laurent Smet Date: Mon, 9 Oct 2017 13:53:42 +0200 Subject: [PATCH 2/3] [FIX] base_address_city: avoid city_id field duplication In base/res_partner.py, _fields_view_get calls _fields_view_get_address that could calls again _fields_view_get in case of address_view_id is specified. That leads to issue in base_address_city because the _fields_view_get_address method will replace two times the city field and then, we get a view with two city_id fields. see #16870 for screenshots --- addons/base_address_city/models/res_partner.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py index afa5cd759e8..abf94f02165 100644 --- a/addons/base_address_city/models/res_partner.py +++ b/addons/base_address_city/models/res_partner.py @@ -22,6 +22,8 @@ class Partner(models.Model): arch = super(Partner, self)._fields_view_get_address(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 = """
From 0c4ba97f35228fb4957b3f63eb93b43bea168142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=A1zquez=20Acosta?= Date: Mon, 9 Oct 2017 09:51:22 -0400 Subject: [PATCH 3/3] [CLA] add member to merchise CCLA Closes #19568 --- doc/cla/corporate/merchise.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/cla/corporate/merchise.md b/doc/cla/corporate/merchise.md index 6cc3e022152..d8d5e75f830 100644 --- a/doc/cla/corporate/merchise.md +++ b/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