From d7af73dcb1b4ef3ada39bcafa7ad23972e487b45 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Tue, 1 Sep 2020 10:16:39 +0000
Subject: [PATCH] [FIX] base_address_city: avoid showing city and city_id field
 together

Before this commit, when the city_id field was set and then removed,
both city and city_id were shown, you would see 2 city fields in a weird
way.

opw-2312641

closes odoo/odoo#56896

X-original-commit: b381fb0b644cf3c94e798319ceecf5d6b97df9ad
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Signed-off-by: Jorge Pinna Puissant (jpp) <jpp@odoo.com>
---
 addons/base_address_city/models/res_partner.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/base_address_city/models/res_partner.py b/addons/base_address_city/models/res_partner.py
index e7e03742484..bc40c169477 100644
--- a/addons/base_address_city/models/res_partner.py
+++ b/addons/base_address_city/models/res_partner.py
@@ -19,6 +19,10 @@ class Partner(models.Model):
             self.city = self.city_id.name
             self.zip = self.city_id.zipcode
             self.state_id = self.city_id.state_id
+        else:
+            self.city = False
+            self.zip = False
+            self.state_id = False
 
     @api.model
     def _fields_view_get_address(self, arch):