diff --git a/base_location/README.rst b/base_location/README.rst
index 0fb7de7a5..d3434c556 100644
--- a/base_location/README.rst
+++ b/base_location/README.rst
@@ -1,3 +1,8 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=======================
 Enhanced ZIP management
 =======================
 
@@ -7,6 +12,23 @@ It enables zip, city, state and country auto-completion on partners and companie
 
 Also allows different search filters.
 
+Usage
+=====
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/134/9.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/
+partner_contact/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here <https://github.com/OCA/
+partner_contact/issues/new?body=module:%20
+base_location%0Aversion:%20
+9.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Credits
 =======
@@ -14,11 +36,12 @@ Credits
 Contributors
 ------------
 
-* Nicolas Bessi. (Copyright Camptocamp SA)
+* Nicolas Bessi (Camptocamp)
 * Ignacio Ibeas (Acysos S.L.)
 * Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
 * Alejandro Santana <alejandrosantana@anubia.es>
-- Sandy Carter <sandy.carter@savoirfairelinux.com>
+* Sandy Carter <sandy.carter@savoirfairelinux.com>
+* Yannick Vaucher <yannick.vaucher@camptocamp.com>
 
 Icon
 ----
diff --git a/base_location/__openerp__.py b/base_location/__openerp__.py
index bb9a25e36..b987141b9 100644
--- a/base_location/__openerp__.py
+++ b/base_location/__openerp__.py
@@ -22,7 +22,7 @@
 ##############################################################################
 {
     'name': 'Location management (aka Better ZIP)',
-    'version': '8.0.1.0.0',
+    'version': '9.0.1.0.0',
     'depends': ['base'],
     'author': "Camptocamp,"
               "ACYSOS S.L.,"
@@ -31,10 +31,12 @@
               "Odoo Community Association (OCA)",
     'license': "AGPL-3",
     'contributors': [
+        'Nicolas Bessi <nicolas.bessi@camptocamp.com>',
         'Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>',
         'Ignacio Ibeas (Acysos S.L.)',
         'Alejandro Santana <alejandrosantana@anubia.es>',
         'Sandy Carter <sandy.carter@savoirfairelinux.com>',
+        'Yannick Vaucher <yannick.vaucher@camptocamp.com>',
     ],
     'summary': '''Enhanced zip/npa management system''',
     'website': 'http://www.camptocamp.com',
@@ -48,5 +50,5 @@
         'demo/better_zip.xml',
     ],
     'installable': True,
-    'active': False,
+    'auto_install': False,
 }
diff --git a/base_location/i18n/da.po b/base_location/i18n/da.po
index 456ceb4c0..cd7b6f2a4 100644
--- a/base_location/i18n/da.po
+++ b/base_location/i18n/da.po
@@ -1,21 +1,22 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* base_location
-#
+# * base_location
+# 
+# Translators:
+# Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: partner-contact (9.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-12 22:33+0000\n"
-"PO-Revision-Date: 2015-05-22 13:19+0100\n"
-"Last-Translator: Hans Henrik Gabelgaard <hhg@gabelgaard.org>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-12-17 01:36+0000\n"
+"PO-Revision-Date: 2015-12-15 11:17+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Danish (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8\n"
-"Language: da_DK\n"
 
 #. module: base_location
 #: model:ir.actions.act_window,name:base_location.action_zip_tree
@@ -23,29 +24,40 @@ msgid "Cites/locations Management"
 msgstr "By/Postnummer/Lokations administration"
 
 #. module: base_location
-#: field:res.better.zip,city:0
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Byer"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Byer/Loaktions administration"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
 msgid "City"
 msgstr "By"
 
 #. module: base_location
-#: view:res.better.zip:0 field:res.better.zip,name:0
-msgid "ZIP"
-msgstr "Postnr."
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Postnummer"
 
 #. module: base_location
-#: field:res.better.zip,state_id:0
-msgid "State"
-msgstr "Delstat"
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Slå by/postnummer op"
 
 #. module: base_location
-#: field:res.better.zip,country_id:0
-msgid "Country"
-msgstr "Land."
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Postnr/by "
 
 #. module: base_location
-#: field:res.better.zip,priority:0
-msgid "Priority"
-msgstr "Prioritet"
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr ""
 
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_company
@@ -53,39 +65,61 @@ msgid "Companies"
 msgstr "Virksomheder"
 
 #. module: base_location
-#: field:res.better.zip,code:0
-msgid "City Code"
-msgstr "Postnummer"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Land."
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_better_zip
-msgid " City/locations completion object"
-msgstr " Slå by/postnummer op"
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Delstat/region"
 
 #. module: base_location
-#: help:res.company,better_zip_id:0
-msgid "Use the city name or the zip code to search the location"
-msgstr "Søg på bynavn eller postnummer"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr ""
 
 #. module: base_location
-#: field:res.partner,zip_id:0
-msgid "City/Location"
-msgstr "Postnr/by "
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr ""
 
 #. module: base_location
-#: view:res.better.zip:0
-msgid "Search city"
-msgstr "Søg by"
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr ""
 
 #. module: base_location
-#: field:res.company,better_zip_id:0
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
 msgid "Location"
 msgstr "Postnr/by "
 
 #. module: base_location
-#: model:ir.ui.menu,name:base_location.zip_base
-msgid "Cities/Locations Management"
-msgstr "Byer/Loaktions administration"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Navn"
 
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_partner
@@ -93,21 +127,29 @@ msgid "Partner"
 msgstr "Partner"
 
 #. module: base_location
-#: view:res.company:0 view:res.partner:0
-msgid "City completion"
-msgstr "Slå by/postnummer op"
-
-#. module: base_location
-#: field:res.country.state,better_zip_ids:0
-msgid "Cities"
-msgstr "Byer"
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Søg by"
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_country_state
-msgid "Country state"
-msgstr "Delstat/region"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr "Delstat"
 
 #. module: base_location
-#: help:res.better.zip,code:0
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Postnummer"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Søg på bynavn eller postnummer"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "Postnr."
diff --git a/base_location/i18n/de.po b/base_location/i18n/de.po
new file mode 100644
index 000000000..25f20f340
--- /dev/null
+++ b/base_location/i18n/de.po
@@ -0,0 +1,163 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_location
+# 
+# Translators:
+# Antonio Trueba, 2016
+# Carles Antoli <carlesantoli@hotmail.com>, 2015
+# Carles Antoli <carlesantoli@hotmail.com>, 2015
+# Christophe CHAUVET <christophe.chauvet@gmail.com>, 2015
+# Christophe CHAUVET <christophe.chauvet@gmail.com>, 2015
+# Hotellook, 2014
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2016
+# Rudolf Schnapka <rs@techno-flex.de>, 2016
+# Rudolf Schnapka <schnapkar@golive-saar.de>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: partner-contact (9.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-17 04:14+0000\n"
+"PO-Revision-Date: 2016-04-21 08:44+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
+"Language-Team: German (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Standorte-Verwaltung"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Orte"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Standorte-Verwaltung"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr "Stadt"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Ortskennung"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Orts-Vervollständigung"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Stadt/Standort"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr "Stadt/Standorte-Vervollständungsobjekt"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr "Unternehmen"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Land"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Bundesland"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "erstellt von"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "erstellt am"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr "Gruppiere"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr "Zuletzt verändert am"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "zuletzt aktualisiert von"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "zuletzt aktualisiert am"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
+msgid "Location"
+msgstr "Standort"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Suche Ort"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr "Bundesland"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
+msgid "The official code for the city"
+msgstr "Die offizielle Kennung der Stadt"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Verwenden Sie den Stadtnamen oder die PLZ, um nach diesem Standort zu suchen"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "PLZ"
diff --git a/base_location/i18n/en.po b/base_location/i18n/en.po
deleted file mode 100644
index 6d35374c8..000000000
--- a/base_location/i18n/en.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#       * better_zip
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-07 14:17+0000\n"
-"PO-Revision-Date: 2013-05-08 12:03+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: better_zip
-#: model:ir.actions.act_window,name:better_zip.action_zip_tree
-msgid "Cites/locations Management"
-msgstr "Cites/locations Management"
-
-#. module: better_zip
-#: field:res.better.zip,city:0
-msgid "City"
-msgstr "City"
-
-#. module: better_zip
-#: view:res.better.zip:0 field:res.better.zip,name:0
-msgid "ZIP"
-msgstr "ZIP"
-
-#. module: better_zip
-#: field:res.better.zip,country_id:0
-msgid "Country"
-msgstr "Country"
-
-#. module: better_zip
-#: field:res.better.zip,priority:0
-msgid "Priority"
-msgstr "Priority"
-
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_company
-msgid "Companies"
-msgstr "Companies"
-
-#. module: better_zip
-#: field:res.better.zip,code:0
-msgid "City Code"
-msgstr "City Code"
-
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_better_zip
-msgid " City/locations completion object"
-msgstr " City/locations completion object"
-
-#. module: better_zip
-#: help:res.company,better_zip_id:0
-msgid "Use the city name or the zip code to search the location"
-msgstr "Use the city name or the zip code to search the location"
-
-#. module: better_zip
-#: field:res.partner,zip_id:0
-msgid "City/Location"
-msgstr "City/Location"
-
-#. module: better_zip
-#: field:res.better.zip,state_id:0
-msgid "State"
-msgstr "State"
-
-#. module: better_zip
-#: field:res.company,better_zip_id:0
-msgid "Location"
-msgstr "Location"
-
-#. module: better_zip
-#: model:ir.ui.menu,name:better_zip.zip_base
-msgid "Cities/Locations Management"
-msgstr "Cities/Locations Management"
-
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: better_zip
-#: view:res.company:0 view:res.partner:0
-msgid "City completion"
-msgstr "City completion"
-
-#. module: better_zip
-#: field:res.country.state,better_zip_ids:0
-msgid "Cities"
-msgstr "Cities"
-
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_country_state
-msgid "Country state"
-msgstr "Country state"
-
-#. module: better_zip
-#: help:res.better.zip,code:0
-msgid "The official code for the city"
-msgstr "The official code for the city"
diff --git a/base_location/i18n/es.po b/base_location/i18n/es.po
index 3ff60e231..06c30de92 100644
--- a/base_location/i18n/es.po
+++ b/base_location/i18n/es.po
@@ -1,19 +1,23 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* base_location
-#
+# * base_location
+# 
+# Translators:
+# Antonio Trueba, 2016
+# Francisco Palm <francisco.palm@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: partner-contact (9.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-12 22:34+0000\n"
-"PO-Revision-Date: 2013-12-12 23:34+0100\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2015-12-19 20:35+0000\n"
+"PO-Revision-Date: 2016-01-01 09:03+0000\n"
+"Last-Translator: Antonio Trueba\n"
+"Language-Team: Spanish (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: \n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: base_location
 #: model:ir.actions.act_window,name:base_location.action_zip_tree
@@ -21,30 +25,40 @@ msgid "Cites/locations Management"
 msgstr "Gestión de ciudades/ubicaciones"
 
 #. module: base_location
-#: field:res.better.zip,city:0
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Ciudades"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Ciudad/Ubicaciones"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
 msgid "City"
 msgstr "Ciudad"
 
 #. module: base_location
-#: view:res.better.zip:0
-#: field:res.better.zip,name:0
-msgid "ZIP"
-msgstr "C.P."
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Código de ciudad"
 
 #. module: base_location
-#: field:res.better.zip,state_id:0
-msgid "State"
-msgstr "Provincia"
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Autocompletado a partir de la ciudad"
 
 #. module: base_location
-#: field:res.better.zip,country_id:0
-msgid "Country"
-msgstr "País"
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Ciudad/Ubicación"
 
 #. module: base_location
-#: field:res.better.zip,priority:0
-msgid "Priority"
-msgstr "Prioridad"
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr "Autocompletado de objetos a partir de ciudades/ubicaciones"
 
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_company
@@ -52,39 +66,61 @@ msgid "Companies"
 msgstr "Compañías"
 
 #. module: base_location
-#: field:res.better.zip,code:0
-msgid "City Code"
-msgstr "Código de ciudad"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "País"
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_better_zip
-msgid " City/locations completion object"
-msgstr " Objeto de completado de ciudad/ubicación"
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Provincia"
 
 #. module: base_location
-#: help:res.company,better_zip_id:0
-msgid "Use the city name or the zip code to search the location"
-msgstr "Utilice el nombre de ciudad o el código postal para buscar la ubicación"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Creado por"
 
 #. module: base_location
-#: field:res.partner,zip_id:0
-msgid "City/Location"
-msgstr "Ciudad/Ubicación"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Creado en"
 
 #. module: base_location
-#: view:res.better.zip:0
-msgid "Search city"
-msgstr "Buscar ciudad"
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr "Modificado por última vez el"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Última actualización por"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Última actualización en"
 
 #. module: base_location
-#: field:res.company,better_zip_id:0
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
 msgid "Location"
 msgstr "Ubicación"
 
 #. module: base_location
-#: model:ir.ui.menu,name:base_location.zip_base
-msgid "Cities/Locations Management"
-msgstr "Ciudad/Ubicaciones"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Nombre"
 
 #. module: base_location
 #: model:ir.model,name:base_location.model_res_partner
@@ -92,23 +128,29 @@ msgid "Partner"
 msgstr "Empresa"
 
 #. module: base_location
-#: view:res.company:0
-#: view:res.partner:0
-msgid "City completion"
-msgstr "Autocompletado a partir de la ciudad"
-
-#. module: base_location
-#: field:res.country.state,better_zip_ids:0
-msgid "Cities"
-msgstr "Ciudades"
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Buscar ciudad"
 
 #. module: base_location
-#: model:ir.model,name:base_location.model_res_country_state
-msgid "Country state"
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
 msgstr "Provincia"
 
 #. module: base_location
-#: help:res.better.zip,code:0
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "El código oficial para la ciudad"
 
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Utilice el nombre de ciudad o el código postal para buscar la ubicación"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "C.P."
diff --git a/base_location/i18n/fi.po b/base_location/i18n/fi.po
new file mode 100644
index 000000000..3d36cda58
--- /dev/null
+++ b/base_location/i18n/fi.po
@@ -0,0 +1,154 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_location
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: partner-contact (9.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-30 12:05+0000\n"
+"PO-Revision-Date: 2015-12-15 11:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Finnish (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Maa"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Luonut"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Luotu"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Viimeksi päivitetty"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Viimeksi päivittänyt"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
+msgid "Location"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
+msgid "The official code for the city"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr ""
diff --git a/base_location/i18n/fr.po b/base_location/i18n/fr.po
index c7d5fc968..ff09b5bc9 100644
--- a/base_location/i18n/fr.po
+++ b/base_location/i18n/fr.po
@@ -1,107 +1,154 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#       * better_zip
-#
+# * base_location
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: partner-contact (9.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-07 14:17+0000\n"
-"PO-Revision-Date: 2013-05-08 12:03+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"Language: \n"
+"POT-Creation-Date: 2016-03-20 01:52+0000\n"
+"PO-Revision-Date: 2016-03-23 10:34+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. module: better_zip
-#: model:ir.actions.act_window,name:better_zip.action_zip_tree
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
 msgid "Cites/locations Management"
 msgstr "Cites/locations Management"
 
-#. module: better_zip
-#: field:res.better.zip,city:0
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Villes"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Cities/Locations Management"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
 msgid "City"
 msgstr "Ville"
 
-#. module: better_zip
-#: view:res.better.zip:0 field:res.better.zip,name:0
-msgid "ZIP"
-msgstr "ZIP"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Code de la ville"
 
-#. module: better_zip
-#: field:res.better.zip,country_id:0
-msgid "Country"
-msgstr "Pays"
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Complétion par ville"
 
-#. module: better_zip
-#: field:res.better.zip,priority:0
-msgid "Priority"
-msgstr "Priorité"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Ville/location"
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_company
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
 msgid "Companies"
 msgstr "Sociétés"
 
-#. module: better_zip
-#: field:res.better.zip,code:0
-msgid "City Code"
-msgstr "Code de la ville"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Pays"
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_better_zip
-msgid " City/locations completion object"
-msgstr " City/locations completion object"
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Etat"
 
-#. module: better_zip
-#: help:res.company,better_zip_id:0
-msgid "Use the city name or the zip code to search the location"
-msgstr "Utilisez le nom de la ville ou le zip lors des recherches"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Créé par"
 
-#. module: better_zip
-#: field:res.partner,zip_id:0
-msgid "City/Location"
-msgstr "Ville/location"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Créé le"
 
-#. module: better_zip
-#: field:res.better.zip,state_id:0
-msgid "State"
-msgstr "Etat"
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "Identifiant"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
 
-#. module: better_zip
-#: field:res.company,better_zip_id:0
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Mis à jour par"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Mis à jour le"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
 msgid "Location"
 msgstr "Location"
 
-#. module: better_zip
-#: model:ir.ui.menu,name:better_zip.zip_base
-msgid "Cities/Locations Management"
-msgstr "Cities/Locations Management"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr ""
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_partner
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
 msgid "Partner"
 msgstr "Partenaire"
 
-#. module: better_zip
-#: view:res.company:0 view:res.partner:0
-msgid "City completion"
-msgstr "Complétion par ville"
-
-#. module: better_zip
-#: field:res.country.state,better_zip_ids:0
-msgid "Cities"
-msgstr "Villes"
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr ""
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_country_state
-msgid "Country state"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
 msgstr "Etat"
 
-#. module: better_zip
-#: help:res.better.zip,code:0
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Code officiel de la ville"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Utilisez le nom de la ville ou le zip lors des recherches"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "ZIP"
diff --git a/base_location/i18n/hr_HR.po b/base_location/i18n/hr_HR.po
new file mode 100644
index 000000000..e14c2ea21
--- /dev/null
+++ b/base_location/i18n/hr_HR.po
@@ -0,0 +1,155 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_location
+# 
+# Translators:
+# Bole <bole@dajmi5.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: partner-contact (9.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-08 05:38+0000\n"
+"PO-Revision-Date: 2016-05-31 18:41+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>\n"
+"Language-Team: Croatian (Croatia) (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/hr_HR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: hr_HR\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Upravljanje gradovima/lokacijama"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Gradovi"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Upravljanje gradovima/lokacijama"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr "Grad"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Šifra grada"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Popunjavanje grada"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Grad/Lokacija"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr "Objekt popunjavanja Grada/Lokacije"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr "Poduzeća"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Država"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Oblast/Županija"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Kreirao"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Kreirano"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr "Prupiraj po"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr "Zadnji modificirao"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Zadnji ažurirao"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Zadnje ažurirano"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
+msgid "Location"
+msgstr "Lokacija"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Naziv"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Pretraži gradove"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr "Oblast/Županija"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
+msgid "The official code for the city"
+msgstr "Službena šifra ovog grada"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Koristite naziv ili šifru grada za pretraživanje"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "ZIP"
diff --git a/base_location/i18n/it.po b/base_location/i18n/it.po
index e87fffdee..cb80dd6cc 100644
--- a/base_location/i18n/it.po
+++ b/base_location/i18n/it.po
@@ -1,107 +1,155 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#       * better_zip
-#
+# * base_location
+# 
+# Translators:
+# Paolo Valier, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: partner-contact (9.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-07 14:17+0000\n"
-"PO-Revision-Date: 2014-09-22 16:32+0100\n"
-"Last-Translator: Franco Tampieri <franco@tampieri.info>\n"
-"Language-Team: \n"
-"Language: it\n"
+"POT-Creation-Date: 2016-03-20 01:37+0000\n"
+"PO-Revision-Date: 2016-03-19 05:58+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Italian (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.9\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. module: better_zip
-#: model:ir.actions.act_window,name:better_zip.action_zip_tree
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
 msgid "Cites/locations Management"
 msgstr "Gestione Città/Locazioni"
 
-#. module: better_zip
-#: field:res.better.zip,city:0
-msgid "City"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
 msgstr "Città"
 
-#. module: better_zip
-#: view:res.better.zip:0 field:res.better.zip,name:0
-msgid "ZIP"
-msgstr "CAP"
-
-#. module: better_zip
-#: field:res.better.zip,country_id:0
-msgid "Country"
-msgstr "Paese"
-
-#. module: better_zip
-#: field:res.better.zip,priority:0
-msgid "Priority"
-msgstr "Priorità"
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Gestione Città/Locazioni"
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_company
-msgid "Companies"
-msgstr "Aziende"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr "Città"
 
-#. module: better_zip
-#: field:res.better.zip,code:0
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
 msgid "City Code"
 msgstr "Codice Città"
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_better_zip
-msgid " City/locations completion object"
-msgstr " oggetto completamento Città/locazioni"
-
-#. module: better_zip
-#: help:res.company,better_zip_id:0
-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"
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Completamento città"
 
-#. module: better_zip
-#: field:res.partner,zip_id:0
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
 msgid "City/Location"
 msgstr "Città/Locazione"
 
-#. module: better_zip
-#: field:res.better.zip,state_id:0
-msgid "State"
-msgstr "Provincia"
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr "Aziende"
 
-#. module: better_zip
-#: field:res.company,better_zip_id:0
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Paese"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Provincia Paese"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Creato da"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Creato il"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr "Raggruppa per"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr "Ultima modifica il"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Ultimo caricamento il"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Ultimo caricamento di"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
 msgid "Location"
 msgstr "Locazione"
 
-#. module: better_zip
-#: model:ir.ui.menu,name:better_zip.zip_base
-msgid "Cities/Locations Management"
-msgstr "Gestione Città/Locazioni"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Nome"
 
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_partner
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
 msgid "Partner"
 msgstr "Partner"
 
-#. module: better_zip
-#: view:res.company:0 view:res.partner:0
-msgid "City completion"
-msgstr "Completamento città"
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Ricerca città"
 
-#. module: better_zip
-#: field:res.country.state,better_zip_ids:0
-msgid "Cities"
-msgstr "Città"
-
-#. module: better_zip
-#: model:ir.model,name:better_zip.model_res_country_state
-msgid "Country state"
-msgstr "Provincia Paese"
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr "Provincia"
 
-#. module: better_zip
-#: help:res.better.zip,code:0
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
 msgid "The official code for the city"
 msgstr "Il codice ufficiale per la città"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_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"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "CAP"
diff --git a/base_location/i18n/nl.po b/base_location/i18n/nl.po
new file mode 100644
index 000000000..dcd6295d2
--- /dev/null
+++ b/base_location/i18n/nl.po
@@ -0,0 +1,155 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_location
+# 
+# Translators:
+# Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: partner-contact (9.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-20 01:52+0000\n"
+"PO-Revision-Date: 2016-03-25 12:34+0000\n"
+"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>\n"
+"Language-Team: Dutch (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr "Plaats"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr ""
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Plaats/Locatie"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Land"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Aangemaakt door"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Aangemaakt op"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Laatst bijgewerkt door"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Laatst bijgewerkt op"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
+msgid "Location"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
+msgid "The official code for the city"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr ""
diff --git a/base_location/i18n/pt_BR.po b/base_location/i18n/pt_BR.po
new file mode 100644
index 000000000..572adff93
--- /dev/null
+++ b/base_location/i18n/pt_BR.po
@@ -0,0 +1,155 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_location
+# 
+# Translators:
+# danimaribeiro <danimaribeiro@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: partner-contact (9.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-17 01:36+0000\n"
+"PO-Revision-Date: 2015-12-15 11:17+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Gerenciamento de Cidade/locais"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Cidades"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Gerenciamento Cidade/Locais"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr "Cidade"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Código da cidade"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Autocompletar de cidades"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Cidade/Localização"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr "Objeto autocompletar de Cidades/Locais"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "País"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Estado"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Criado por"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Útima atualização por"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Útima atualização em"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
+msgid "Location"
+msgstr "Localização"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Nome"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Buscar cidade"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr "Estado"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
+msgid "The official code for the city"
+msgstr "O código oficial da cidade"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Use o nome da cidade ou o CEP para pesquisar a localização"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "CEP"
diff --git a/base_location/i18n/sl.po b/base_location/i18n/sl.po
new file mode 100644
index 000000000..3b9e20558
--- /dev/null
+++ b/base_location/i18n/sl.po
@@ -0,0 +1,155 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * base_location
+# 
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: partner-contact (9.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-17 01:36+0000\n"
+"PO-Revision-Date: 2015-12-15 13:22+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/sl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. module: base_location
+#: model:ir.actions.act_window,name:base_location.action_zip_tree
+msgid "Cites/locations Management"
+msgstr "Upravljanje krajev/lokacij"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids
+msgid "Cities"
+msgstr "Kraji"
+
+#. module: base_location
+#: model:ir.ui.menu,name:base_location.zip_base
+msgid "Cities/Locations Management"
+msgstr "Kraji/Upravljanje lokacij"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city
+msgid "City"
+msgstr "Kraj"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code
+msgid "City Code"
+msgstr "Koda kraja"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_company_form_city
+#: model:ir.ui.view,arch_db:base_location.view_partner_form
+msgid "City completion"
+msgstr "Izpolnjevanje kraja"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id
+msgid "City/Location"
+msgstr "Kraj/Lokacija"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_better_zip
+msgid "City/locations completion object"
+msgstr "Objekt izpolnjevanja kraja/lokacije"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_company
+msgid "Companies"
+msgstr "Družbe"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_country_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+#: model:ir.ui.view,arch_db:base_location.view_country_search
+msgid "Country"
+msgstr "Država"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_country_state
+msgid "Country state"
+msgstr "Zvezna država"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid
+msgid "Created by"
+msgstr "Ustvaril"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Ustvarjeno"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Group By"
+msgstr "Združi po"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
+msgid "ID"
+msgstr "ID"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
+msgid "Last Modified on"
+msgstr "Zadnjič spremenjeno"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
+msgid "Last Updated by"
+msgstr "Zadnji posodobil"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date
+msgid "Last Updated on"
+msgstr "Zadnjič posodobljeno"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_company_better_zip_id
+msgid "Location"
+msgstr "Lokacija"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name
+msgid "Name"
+msgstr "Naziv"
+
+#. module: base_location
+#: model:ir.model,name:base_location.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_location
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "Search city"
+msgstr "Iskanje kraja"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_state_id
+#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
+msgid "State"
+msgstr "Zvezna država"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_better_zip_code
+msgid "The official code for the city"
+msgstr "Uradna koda kraja"
+
+#. module: base_location
+#: model:ir.model.fields,help:base_location.field_res_company_better_zip_id
+msgid "Use the city name or the zip code to search the location"
+msgstr "Iskanje lokacije z uporabo imena kraja ali poštne številke"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name
+#: model:ir.ui.view,arch_db:base_location.better_zip_form
+#: model:ir.ui.view,arch_db:base_location.better_zip_tree
+msgid "ZIP"
+msgstr "Poštna številka"
diff --git a/base_location/tests/__init__.py b/base_location/tests/__init__.py
new file mode 100644
index 000000000..78c6dfa4c
--- /dev/null
+++ b/base_location/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © 2015 Yannick Vaucher (Camptocamp)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import test_completion
diff --git a/base_location/tests/test_completion.py b/base_location/tests/test_completion.py
new file mode 100644
index 000000000..30ea0a743
--- /dev/null
+++ b/base_location/tests/test_completion.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# © 2015 Yannick Vaucher (Camptocamp)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+"""Test a city completion and onchanges."""
+
+from openerp.tests.common import TransactionCase
+
+
+class TestCompletion(TransactionCase):
+
+    def test_onchange_better_zip_state_id(self):
+        """ Test onchange on res.better.zip """
+        usa_MA = self.env.ref('base.state_us_34')
+        self.better_zip1.state_id = usa_MA
+        self.better_zip1.onchange_state_id()
+        self.assertEqual(self.better_zip1.country_id, usa_MA.country_id)
+
+    def test_onchange_partner_city_completion(self):
+        self.partner1.zip_id = self.better_zip1
+        self.partner1.onchange_zip_id()
+        self.assertEqual(self.partner1.zip, self.better_zip1.name)
+        self.assertEqual(self.partner1.city, self.better_zip1.city)
+        self.assertEqual(self.partner1.state_id, self.better_zip1.state_id)
+        self.assertEqual(self.partner1.country_id, self.better_zip1.country_id)
+
+    def test_onchange_company_city_completion(self):
+        self.company.better_zip_id = self.better_zip1
+        self.company.on_change_city()
+        self.assertEqual(self.company.zip, self.better_zip1.name)
+        self.assertEqual(self.company.city, self.better_zip1.city)
+        self.assertEqual(self.company.state_id, self.better_zip1.state_id)
+        self.assertEqual(self.company.country_id, self.better_zip1.country_id)
+
+    def setUp(self):
+        super(TestCompletion, self).setUp()
+        state_vd = self.env['res.country.state'].create({
+            'name': 'Vaud',
+            'code': 'VD',
+            'country_id': self.ref('base.ch'),
+        })
+        self.company = self.env.ref('base.main_company')
+        self.better_zip1 = self.env['res.better.zip'].create({
+            'name': 1000,
+            'city': 'Lausanne',
+            'state_id': state_vd.id,
+            'country_id': self.ref('base.ch'),
+        })
+        self.partner1 = self.env['res.partner'].create({
+            'name': 'Camptocamp',
+        })
diff --git a/base_location/views/better_zip_view.xml b/base_location/views/better_zip_view.xml
index d0e1782a7..cfe13bc52 100644
--- a/base_location/views/better_zip_view.xml
+++ b/base_location/views/better_zip_view.xml
@@ -6,7 +6,7 @@
             <field name="name">res.better.zip.form</field>
             <field name="model">res.better.zip</field>
             <field name="arch" type="xml">
-                <form string="ZIP" version="7.0">
+                <form string="ZIP">
                     <group col="4">
                     <field name="name"/>
                     <field name="code"/>
diff --git a/base_location/views/partner_view.xml b/base_location/views/partner_view.xml
index 517a179e9..cade97e03 100644
--- a/base_location/views/partner_view.xml
+++ b/base_location/views/partner_view.xml
@@ -7,17 +7,16 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="arch" type="xml">
-                <div class="address_format" position="before">
+                <field name="city" position="before">
                     <field name="zip_id"
-                        options="{'create_name_field': 'city'}"
+                        options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
                         placeholder="City completion"
-                        attrs="{'invisible': [('use_parent_address','=',True)]}"
                         class="oe_edit_only" />
-                </div>
-                <xpath expr="//field[@name='child_ids']/form//div[@class='address_format']" position="before">
-                    <field name="zip_id" options="{'create_name_field': 'city'}"
+                </field>
+                <xpath expr="//field[@name='child_ids']/form//field[@name='city']" position="before">
+                    <field name="zip_id"
+                        options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
                         placeholder="City completion"
-                        attrs="{'invisible': [('use_parent_address','=',True)]}"
                         class="oe_edit_only" />
                 </xpath>
             </field>