diff --git a/base_location/i18n/it.po b/base_location/i18n/it.po
index b51245325..2f35a8528 100644
--- a/base_location/i18n/it.po
+++ b/base_location/i18n/it.po
@@ -9,19 +9,20 @@ msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-13 03:42+0000\n"
-"PO-Revision-Date: 2017-12-13 03:42+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
+"PO-Revision-Date: 2018-12-24 17:58+0000\n"
+"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.3\n"
 
 #. module: base_location
 #: model:res.city,name:base_location.demo_brussels_city
 msgid "Brussels"
-msgstr ""
+msgstr "Bruxelles"
 
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities
@@ -29,6 +30,8 @@ msgid ""
 "Check this box to ensure every address created in that country has a 'City' "
 "chosen in the list of the country's cities."
 msgstr ""
+"Selezionare questa casella per verificare che tutte le città degli indirizzi "
+"creati provengano dall'elenco \"Città\" della nazione."
 
 #. module: base_location
 #: model:ir.actions.act_window,name:base_location.action_res_city_full
@@ -44,9 +47,8 @@ msgstr "Città"
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_company__city_id
-#, fuzzy
 msgid "City ID"
-msgstr "Città"
+msgstr "ID città"
 
 #. module: base_location
 #: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city
@@ -57,7 +59,7 @@ msgstr "Completamento città"
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_city_zip
 msgid "City/locations completion object"
-msgstr "Città/luoghi di completamento oggetto"
+msgstr "Oggetto completamento città/luoghi"
 
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_company
@@ -72,7 +74,7 @@ msgstr "Contatto"
 #. module: base_location
 #: model_terms:ir.ui.view,arch_db:base_location.view_country_search
 msgid "Country"
-msgstr "Paese"
+msgstr "Nazione"
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid
@@ -87,7 +89,7 @@ msgstr "Creato il"
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name
 msgid "Display Name"
-msgstr "Nome da visualizzare"
+msgstr "Nome visualizzato"
 
 #. module: base_location
 #: model_terms:ir.actions.act_window,help:base_location.action_res_city_full
@@ -116,51 +118,50 @@ msgstr "Ultima modifica il"
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid
 msgid "Last Updated by"
-msgstr "Ultimo caricamento il"
+msgstr "Ultimo aggiornamento il"
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date
 msgid "Last Updated on"
-msgstr "Ultimo caricamento di"
+msgstr "Ultimo aggiornamento di"
 
 #. module: base_location
 #: model_terms:ir.ui.view,arch_db:base_location.view_partner_form
 msgid "Location completion"
-msgstr ""
+msgstr "Completamento luogo"
 
 #. module: base_location
 #: model:ir.actions.act_window,name:base_location.action_zip_tree
 msgid "Locations"
-msgstr ""
+msgstr "Luoghi"
 
 #. module: base_location
 #: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter
-#, fuzzy
 msgid "Search zip"
-msgstr "Ricerca città"
+msgstr "Ricerca CAP"
 
 #. module: base_location
 #: code:addons/base_location/models/res_partner.py:67
 #, python-format
 msgid "The city of partner %s differs from that in location %s"
-msgstr ""
+msgstr "La città del partner %s è diversa da quella del luogo %s"
 
 #. module: base_location
 #: code:addons/base_location/models/res_partner.py:63
 #, python-format
 msgid "The country of the partner %s differs from that in location %s"
-msgstr ""
+msgstr "La nazione del partner %s è diversa dal quella del luogo %s"
 
 #. module: base_location
 #: code:addons/base_location/models/res_partner.py:59
 #, python-format
 msgid "The state of the partner %s differs from that in location %s"
-msgstr ""
+msgstr "Lo stato del partner %s è diverso da quello del luogo %s"
 
 #. module: base_location
 #: model:ir.model.fields,help:base_location.field_res_company__zip_id
 msgid "Use the city name or the zip code to search the location"
-msgstr "Usare il nome della città o il codice CAP per ricercare la locazione"
+msgstr "Usare il nome della città o il codice CAP per cercare il luogo"
 
 #. module: base_location
 #: sql_constraint:res.city:0
@@ -191,7 +192,7 @@ msgstr ""
 #. module: base_location
 #: model_terms:ir.ui.view,arch_db:base_location.city_zip_form
 msgid "Zip"
-msgstr ""
+msgstr "CAP"
 
 #. module: base_location
 #: model:ir.ui.menu,name:base_location.locations_menu_zips
@@ -199,12 +200,12 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:base_location.view_city_form
 #: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form
 msgid "Zips"
-msgstr ""
+msgstr "CAP"
 
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids
 msgid "Zips in this city"
-msgstr ""
+msgstr "CAP in questa città"
 
 #~ msgid "City Code"
 #~ msgstr "Codice Città"
diff --git a/base_location/migrations/12.0.1.0.0/post-migration.py b/base_location/migrations/12.0.1.0.0/post-migration.py
new file mode 100644
index 000000000..3f8ba212a
--- /dev/null
+++ b/base_location/migrations/12.0.1.0.0/post-migration.py
@@ -0,0 +1,35 @@
+# Copyright 2018 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from psycopg2.extensions import AsIs
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    column_name = openupgrade.get_legacy_name('better_zip_id')
+    openupgrade.logged_query(
+        "ALTER TABLE res_city_zip ADD %s INTEGER", (AsIs(column_name), ),
+    )
+    openupgrade.logged_query(
+        env.cr, """
+        INSERT INTO res_city_zip (
+            %s, name, city_id
+        )
+        SELECT
+            id, name, city_id
+        FROM res_better_zip
+        WHERE city_id IS NOT NULL""",
+        (AsIs(column_name), ),
+    )
+    # Recompute display name for entries inserted by SQL
+    env['res.city.zip'].search([])._compute_new_display_name()
+    # Link res.partner with corresponding new entries
+    openupgrade.logged_query(
+        env.cr, """
+        UPDATE res_partner rp
+        SET zip_id = rcz.id
+        FROM res_city_zip rcz
+        WHERE rcz.%s = rp.%s""",
+        (AsIs(column_name), AsIs(openupgrade.get_legacy_name('zip_id')), ),
+    )
diff --git a/base_location/migrations/12.0.1.0.0/pre-migration.py b/base_location/migrations/12.0.1.0.0/pre-migration.py
new file mode 100644
index 000000000..f9a069612
--- /dev/null
+++ b/base_location/migrations/12.0.1.0.0/pre-migration.py
@@ -0,0 +1,15 @@
+# Copyright 2018 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.rename_columns(
+        env.cr, {
+            'res_partner': [
+                ('zip_id', None),
+            ]
+        }
+    )