From ba8479a91cb738e767fd88b8db12739b36a7bccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A0n=20Todorovich?= <ivan.todorovich@gmail.com>
Date: Thu, 8 Jul 2021 16:08:44 -0300
Subject: [PATCH] [FIX] city_id no longer shown.

We want to use a domain that requires city_id to be on the view
but we can't add it directly there, otherwise _fields_view_get_address
in base_address_city won't do its magic, as it immediately returns
if city_id is already in there.

On the other hand, if city_id is not in the
views, odoo won't let us use it in zip_id's domain.

Fixes a bug introduced here: 5fd93fb8d138cb9a650410d49745b0777be43be0
---
 base_location/models/res_partner.py      | 28 +++++++++++++++++++++---
 base_location/views/res_partner_view.xml |  2 --
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/base_location/models/res_partner.py b/base_location/models/res_partner.py
index 3a3b989c1..b441e4d6a 100644
--- a/base_location/models/res_partner.py
+++ b/base_location/models/res_partner.py
@@ -2,6 +2,8 @@
 # Copyright 2018 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+from lxml import etree
+
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
@@ -16,9 +18,6 @@ class ResPartner(models.Model):
         compute="_compute_zip_id",
         readonly=False,
         store=True,
-        domain="[('city_id', '=?', city_id), "
-        "('city_id.country_id', '=?', country_id), "
-        "('city_id.state_id', '=?', state_id)]",
     )
     city_id = fields.Many2one(
         index=True,  # add index for performance
@@ -117,3 +116,26 @@ class ResPartner(models.Model):
                     _("The zip of the partner %s differs from that in location %s")
                     % (rec.name, rec.zip_id.name)
                 )
+
+    def _zip_id_domain(self):
+        return """
+            [
+                ("city_id", "=?", city_id),
+                ("city_id.country_id", "=?", country_id),
+                ("city_id.state_id", "=?", state_id),
+            ]
+        """
+
+    @api.model
+    def _fields_view_get_address(self, arch):
+        # We want to use a domain that requires city_id to be on the view
+        # but we can't add it directly there, otherwise _fields_view_get_address
+        # in base_address_city won't do its magic, as it immediately returns
+        # if city_id is already in there. On the other hand, if city_id is not in the
+        # views, odoo won't let us use it in zip_id's domain.
+        # For this reason we need to set the domain here.
+        arch = super()._fields_view_get_address(arch)
+        doc = etree.fromstring(arch)
+        for node in doc.xpath("//field[@name='zip_id']"):
+            node.attrib["domain"] = self._zip_id_domain()
+        return etree.tostring(doc, encoding="unicode")
diff --git a/base_location/views/res_partner_view.xml b/base_location/views/res_partner_view.xml
index 2fa118d38..5609f7f1f 100644
--- a/base_location/views/res_partner_view.xml
+++ b/base_location/views/res_partner_view.xml
@@ -6,7 +6,6 @@
         <field name="inherit_id" ref="base.view_partner_form" />
         <field name="arch" type="xml">
             <field name="city" position="before">
-                <field name="city_id" invisible="1" />
                 <field
                     name="zip_id"
                     options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
@@ -19,7 +18,6 @@
                 expr="//field[@name='child_ids']/form//field[@name='city']"
                 position="before"
             >
-                <field name="city_id" invisible="1" />
                 <field
                     name="zip_id"
                     options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"