FIX base_location blocking editing company address.

Steps:

 - Open company form
 - Set 'city completion' field

Get 'The state of the partner My Company differs from that in location X'

Disabling _check_zip while writing 'zip' fields from company, as incompatible with the sequence of write operations.

Automatic test is added too.

base_location/__manifest__.py

@@ -4,7 +4,7 @@
 
 {
     'name': 'Location management (aka Better ZIP)',
-    'version': '12.0.1.0.0',
+    'version': '12.0.1.0.1',
     'depends': [
         'base_address_city',
         'contacts',

base_location/i18n/am.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/ar.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/base_location.pot

@@ -129,19 +129,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/bg.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/bs.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/ca.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/cs.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/da.po

@@ -140,19 +140,19 @@ msgid "Search zip"
 msgstr "Søg by"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/de.po

@@ -144,19 +144,19 @@ msgid "Search zip"
 msgstr "Suche Stadt"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr "Die Stadt des Partners %s weicht von der des Standorts %s ab"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr "Das Land des Partners %s unterscheidet sich vom dem des Standorts %s"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/el_GR.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/en_GB.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es.po

@@ -141,19 +141,19 @@ msgid "Search zip"
 msgstr "Buscar ciudad"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_AR.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_CL.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_CO.po

@@ -142,19 +142,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_CR.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_DO.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_EC.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_ES.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_MX.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_PE.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_PY.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/es_VE.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/et.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/eu.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/fa.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/fi.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/fr.po

@@ -143,19 +143,19 @@ msgid "Search zip"
 msgstr "Rechercher ville"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/fr_CA.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/fr_CH.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/gl.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/gl_ES.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/he.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/hr.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/hr_HR.po

@@ -142,19 +142,19 @@ msgid "Search zip"
 msgstr "Pretraži gradove"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/hu.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/id.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/it.po

@@ -141,19 +141,19 @@ msgid "Search zip"
 msgstr "Ricerca CAP"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr "La città del partner %s è diversa da quella del luogo %s"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr "La nazione del partner %s è diversa dal quella del luogo %s"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr "Lo stato del partner %s è diverso da quello del luogo %s"

base_location/i18n/ja.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/ko.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/lt.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/lt_LT.po

@@ -140,19 +140,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/lv.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/mk.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/mn.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/nb.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/nb_NO.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/nl.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/nl_BE.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/nl_NL.po

@@ -142,19 +142,19 @@ msgid "Search zip"
 msgstr "Zoek plaats"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/pl.po

@@ -140,19 +140,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/pt.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/pt_BR.po

@@ -141,19 +141,19 @@ msgid "Search zip"
 msgstr "Buscar cidade"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/pt_PT.po

@@ -141,19 +141,19 @@ msgid "Search zip"
 msgstr "Procurar cidade"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/ro.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/ru.po

@@ -140,19 +140,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/sk.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/sl.po

@@ -141,19 +141,19 @@ msgid "Search zip"
 msgstr "Iskanje kraja"
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/sr.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/sr@latin.po

@@ -140,19 +140,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/sv.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/th.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/tr.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/tr_TR.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/uk.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/vi.po

@@ -138,19 +138,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/vi_VN.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/zh_CN.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/i18n/zh_TW.po

@@ -139,19 +139,19 @@ msgid "Search zip"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:67
+#: code:addons/base_location/models/res_partner.py:69
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:63
+#: code:addons/base_location/models/res_partner.py:65
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
 msgstr ""
 
 #. module: base_location
-#: code:addons/base_location/models/res_partner.py:59
+#: code:addons/base_location/models/res_partner.py:61
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
 msgstr ""

base_location/migrations/12.0.1.0.0/post-migration.py

@@ -9,6 +9,7 @@ from openupgradelib import openupgrade
 def migrate(env, version):
     column_name = openupgrade.get_legacy_name('better_zip_id')
     openupgrade.logged_query(
+        env.cr,
         "ALTER TABLE res_city_zip ADD %s INTEGER", (AsIs(column_name), ),
     )
     openupgrade.logged_query(

base_location/models/res_company.py

@@ -47,11 +47,21 @@ class ResCompany(models.Model):
 
     def _inverse_city_id(self):
         for company in self:
-            company.partner_id.city_id = company.city_id
+            company.with_context(
+                skip_check_zip=True).partner_id.city_id = company.city_id
 
     def _inverse_zip_id(self):
         for company in self:
-            company.partner_id.zip_id = company.zip_id
+            company.with_context(
+                skip_check_zip=True).partner_id.zip_id = company.zip_id
+
+    def _inverse_state(self):
+        return super(ResCompany, self.with_context(
+            skip_check_zip=True))._inverse_state()
+
+    def _inverse_country(self):
+        return super(ResCompany, self.with_context(
+            skip_check_zip=True))._inverse_country()
 
     @api.onchange('zip_id')
     def _onchange_zip_id(self):

base_location/models/res_partner.py

@@ -52,6 +52,8 @@ class ResPartner(models.Model):
 
     @api.constrains('zip_id', 'country_id', 'city_id', 'state_id')
     def _check_zip(self):
+        if self.env.context.get('skip_check_zip'):
+            return
         for rec in self:
             if not rec.zip_id:
                 continue

base_location/static/description/index.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Location management (aka Better ZIP)</title>
 <style type="text/css">
 

base_location/tests/test_base_location.py

@@ -135,6 +135,9 @@ class TestBaseLocation(common.SavepointCase):
                 'zip_id': self.barcelona.id,
             })
 
+    def test_writing_company(self):
+        self.company.zip_id = self.barcelona
+
     def test_constrains_partner_country(self):
         """Test partner country constraints"""
         partner = self.partner_obj.create({