Merge pull request #317 from OpenCode/10.0-mig-base_location

[MIG] 10.0 mig base location
8 years ago · 3b8c64b533
20 changed files with 645 additions and 299 deletions
--- a/base_location/README.rst
+++ b/base_location/README.rst
@ -17,7 +17,7 @@ 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
+   :target: https://runbot.odoo-community.org/runbot/134/10.0

 Bug Tracker
 ===========
@ -28,7 +28,7 @@ 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**>`_.
+10.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

 Credits
 =======
@ -42,6 +42,7 @@ Contributors
 * Alejandro Santana <alejandrosantana@anubia.es>
 * Sandy Carter <sandy.carter@savoirfairelinux.com>
 * Yannick Vaucher <yannick.vaucher@camptocamp.com>
+* Francesco Apruzzese <f.apruzzese@apuliasoftware.it>

 Icon
 ----
--- a/base_location/init.py
+++ b/base_location/init.py
@ -1,24 +1,5 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#                 Ignacio Ibeas <ignacio@acysos.com>
-#                 Alejandro Santana <alejandrosantana@anubia.es>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 from . import models
--- a/base_location/manifest.py
+++ b/base_location/manifest.py
@ -1,43 +1,19 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#                 Ignacio Ibeas <ignacio@acysos.com>
-#                 Alejandro Santana <alejandrosantana@anubia.es>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 {
    'name': 'Location management (aka Better ZIP)',
-    'version': '9.0.1.0.0',
-    'depends': ['base'],
+    'version': '10.0.1.0.0',
+    'depends': [
+        'base',
+    ],
    'author': "Camptocamp,"
              "ACYSOS S.L.,"
              "Alejandro Santana,"
              "Serv. Tecnol. Avanzados - Pedro M. Baeza,"
              "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',
    'data': ['views/better_zip_view.xml',
@ -49,6 +25,6 @@
    'demo': [
        'demo/better_zip.xml',
    ],
-    'installable': False,
+    'installable': True,
    'auto_install': False,
 }
--- a/base_location/i18n/bg.po
+++ b/base_location/i18n/bg.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-10-06 12:09+0000\n"
+"PO-Revision-Date: 2015-12-15 11:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/bg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: bg\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 ""
+
+#. 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 "Създадено от"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "Създадено на"
+
+#. 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 "Последно обновено от"
+
+#. module: base_location
+#: 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 ""
+
+#. 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 ""
--- a/base_location/i18n/hr.po
+++ b/base_location/i18n/hr.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-10-06 12:09+0000\n"
+"PO-Revision-Date: 2015-12-15 11:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Croatian (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: 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 ""
+
+#. 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 ""
+
+#. 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 "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 ""
+
+#. 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 "Zadnje modificirano"
+
+#. 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žuriranje"
+
+#. 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 "Partner"
+
+#. 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 ""
--- a/base_location/i18n/pt_BR.po
+++ b/base_location/i18n/pt_BR.po
@ -3,13 +3,17 @@
 # * base_location
 # 
 # Translators:
+# Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2016
 # danimaribeiro <danimaribeiro@gmail.com>, 2015
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015-2016
+# Paolo Valier, 2016
+# Rudolf Schnapka <rs@techno-flex.de>, 2016
 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"
+"POT-Creation-Date: 2016-10-06 12:09+0000\n"
+"PO-Revision-Date: 2016-10-04 09:43+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"
@ -99,7 +103,7 @@ msgstr "ID"
 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Última atualização em"

 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid
--- a/base_location/i18n/tr.po
+++ b/base_location/i18n/tr.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (9.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-20 23:45+0000\n"
+"POT-Creation-Date: 2016-10-06 12:09+0000\n"
 "PO-Revision-Date: 2015-12-15 11:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: Turkish (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/tr/)\n"
@ -88,7 +88,7 @@ msgstr "Oluşturuldu"
 #. module: base_location
 #: model:ir.ui.view,arch_db:base_location.view_better_zip_filter
 msgid "Group By"
-msgstr ""
+msgstr "Grupla"

 #. module: base_location
 #: model:ir.model.fields,field_description:base_location.field_res_better_zip_id
--- a/base_location/i18n/zh_CN.po
+++ b/base_location/i18n/zh_CN.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-10-06 12:09+0000\n"
+"PO-Revision-Date: 2015-12-15 11:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-partner-contact-9-0/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\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 ""
+
+#. 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 "创建者"
+
+#. module: base_location
+#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date
+msgid "Created on"
+msgstr "创建时间"
+
+#. 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 "最后更新者"
+
+#. module: base_location
+#: 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 ""
+
+#. 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 ""
--- a/base_location/models/init.py
+++ b/base_location/models/init.py
@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-#
-# License, author and contributors information in:
-# __openerp__.py file at the root folder of this module.
-#
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

 from . import better_zip
 from . import partner
--- a/base_location/models/better_zip.py
+++ b/base_location/models/better_zip.py
@ -1,25 +1,8 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#                 Ignacio Ibeas <ignacio@acysos.com>
-#                 Alejandro Santana <alejandrosantana@anubia.es>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-from openerp import models, fields, api
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields, api


 class BetterZip(models.Model):
--- a/base_location/models/company.py
+++ b/base_location/models/company.py
@ -1,33 +1,14 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#                 Ignacio Ibeas <ignacio@acysos.com>
-#                 Alejandro Santana <alejandrosantana@anubia.es>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-from openerp import models, fields, api
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields, api


 class ResCompany(models.Model):

    _inherit = 'res.company'

-    @api.one
    @api.onchange('better_zip_id')
    def on_change_city(self):
        if self.better_zip_id:
@ -39,6 +20,5 @@ class ResCompany(models.Model):
    better_zip_id = fields.Many2one(
        'res.better.zip',
        string='Location',
-        select=1,
        help='Use the city name or the zip code to search the location',
    )
--- a/base_location/models/partner.py
+++ b/base_location/models/partner.py
@ -1,33 +1,14 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#                 Ignacio Ibeas <ignacio@acysos.com>
-#                 Alejandro Santana <alejandrosantana@anubia.es>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-from openerp import models, fields, api
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields, api


 class ResPartner(models.Model):
    _inherit = 'res.partner'
    zip_id = fields.Many2one('res.better.zip', 'City/Location')

-    @api.one
    @api.onchange('zip_id')
    def onchange_zip_id(self):
        if self.zip_id:
--- a/base_location/models/state.py
+++ b/base_location/models/state.py
@ -1,26 +1,8 @@
 # -*- coding: utf-8 -*-
-#
-#
-#    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Contributor: Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
-#                 Ignacio Ibeas <ignacio@acysos.com>
-#                 Alejandro Santana <alejandrosantana@anubia.es>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-from openerp import models, fields
+# Copyright 2016 Nicolas Bessi, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, fields


 class ResCountryState(models.Model):
--- a/base_location/tests/init.py
+++ b/base_location/tests/init.py
@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
-# © 2015 Yannick Vaucher (Camptocamp)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# Copyright 2015 Yannick Vaucher, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
 from . import test_completion
--- a/base_location/tests/test_completion.py
+++ b/base_location/tests/test_completion.py
@ -1,9 +1,8 @@
 # -*- 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."""
+# Copyright 2015 Yannick Vaucher, Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

-from openerp.tests.common import TransactionCase
+from odoo.tests.common import TransactionCase


 class TestCompletion(TransactionCase):
--- a/base_location/views/better_zip_view.xml
+++ b/base_location/views/better_zip_view.xml
@ -1,70 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
+<odoo>

-        <record model="ir.ui.view" id="better_zip_form">
-            <field name="name">res.better.zip.form</field>
-            <field name="model">res.better.zip</field>
-            <field name="arch" type="xml">
-                <form string="ZIP">
-                    <group col="4">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="city"/>
-                    <field name="state_id"/>
-                    <field name="country_id"/>
-                    </group>
-                </form>
-            </field>
-        </record>
+    <record model="ir.ui.view" id="better_zip_form">
+        <field name="name">res.better.zip.form</field>
+        <field name="model">res.better.zip</field>
+        <field name="arch" type="xml">
+            <form string="City">
+                <group col="4">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="city"/>
+                <field name="state_id"/>
+                <field name="country_id"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="better_zip_tree">
+        <field name="name">res.better.zip.tree</field>
+        <field name="model">res.better.zip</field>
+        <field name="arch" type="xml">
+            <tree string="Cities">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="city"/>
+                <field name="state_id"/>
+                <field name="country_id"/>
+            </tree>
+        </field>
+    </record>

-        <record model="ir.ui.view" id="better_zip_tree">
-            <field name="name">res.better.zip.tree</field>
-            <field name="model">res.better.zip</field>
-            <field name="arch" type="xml">
-                <tree string="ZIP">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="city"/>
-                    <field name="state_id"/>
-                    <field name="country_id"/>
-                </tree>
-            </field>
-        </record>
+    <record id="view_better_zip_filter" model="ir.ui.view">
+        <field name="name">res.better.zip.select</field>
+        <field name="model">res.better.zip</field>
+        <field name="arch" type="xml">
+            <search string="Search city">
+                <field name="name"/>
+                <field name="code"/>
+                <field name="city"/>
+                <field name="state_id"/>
+                <field name="country_id"/>
+                    <group expand="0" string="Group By">
+                        <filter string="State" domain="[]" context="{'group_by':'state_id'}"/>
+                        <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
+                    </group>
+            </search>
+        </field>
+    </record>

-        <record id="view_better_zip_filter" model="ir.ui.view">
-            <field name="name">res.better.zip.select</field>
-            <field name="model">res.better.zip</field>
-            <field name="arch" type="xml">
-                <search string="Search city">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="city"/>
-                    <field name="state_id"/>
-                    <field name="country_id"/>
-                        <group expand="0" string="Group By">
-                            <filter string="State" domain="[]" context="{'group_by':'state_id'}"/>
-                            <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
-                        </group>
-                </search>
-            </field>
-        </record>
+    <record id="action_zip_tree" model="ir.actions.act_window">
+        <field name="name">Cites/locations</field>
+        <field name="res_model">res.better.zip</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field ref="better_zip_tree" name="view_id"/>
+        <field name="search_view_id" ref="view_better_zip_filter"/>
+    </record>

-        <record id="action_zip_tree" model="ir.actions.act_window">
-            <field name="name">Cites/locations Management</field>
-            <field name="res_model">res.better.zip</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field ref="better_zip_tree" name="view_id"/>
-            <field name="search_view_id" ref="view_better_zip_filter"/>
-        </record>
+    <menuitem
+        name="Cities/Locations Management"
+        id="locations_root_menu"
+        parent="base.menu_custom"
+        />

-        <menuitem
-            name="Cities/Locations Management"
-            id="zip_base"
-            parent="base.menu_localisation"
-            action="action_zip_tree"
-            />
+    <menuitem
+        name="Cities/Locations"
+        id="locations_menu"
+        parent="locations_root_menu"
+        action="action_zip_tree"
+        />

-    </data>
-</openerp>
+</odoo>
--- a/base_location/views/company_view.xml
+++ b/base_location/views/company_view.xml
@ -1,21 +1,19 @@
 <?xml version="1.0"?>
-<openerp>
-    <data>
+<odoo>

-        <!-- Add cities to the company form -->
-        <record id="view_company_form_city" model="ir.ui.view">
-            <field name="name">res.company.form.city</field>
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="base.view_company_form" />
-            <field name="arch" type="xml">
-                <field name="street2" position="after">
-                    <field name="better_zip_id"
-                        options="{'create_name_field': 'city'}"
-                        colspan="4"
-                        placeholder="City completion" />
-                </field>
+    <!-- Add cities to the company form -->
+    <record id="view_company_form_city" model="ir.ui.view">
+        <field name="name">res.company.form.city</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form" />
+        <field name="arch" type="xml">
+            <field name="street2" position="after">
+                <field name="better_zip_id"
+                    options="{'create_name_field': 'city'}"
+                    colspan="4"
+                    placeholder="City completion" />
            </field>
-        </record>
+        </field>
+    </record>

-    </data>
-</openerp>
+</odoo>
--- a/base_location/views/partner_view.xml
+++ b/base_location/views/partner_view.xml
@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
+<odoo>

-        <record id="view_partner_form" model="ir.ui.view">
-            <field name="name">res.partner.zip_id.2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="arch" type="xml">
-                <field name="city" position="before">
-                    <field name="zip_id"
-                        options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
-                        placeholder="City completion"
-                        class="oe_edit_only" />
-                </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"
-                        class="oe_edit_only" />
-                </xpath>
+    <record id="view_partner_form" model="ir.ui.view">
+        <field name="name">res.partner.zip_id.2</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form" />
+        <field name="arch" type="xml">
+            <field name="city" position="before">
+                <field name="zip_id"
+                    options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
+                    placeholder="City completion"
+                    class="oe_edit_only" />
            </field>
-        </record>
+            <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"
+                    class="oe_edit_only" />
+            </xpath>
+        </field>
+    </record>

-    </data>
-</openerp>
+</odoo>
--- a/base_location/views/res_country_view.xml
+++ b/base_location/views/res_country_view.xml
@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>

-        <record id="view_country_search" model="ir.ui.view">
-            <field name="name">res.country.search</field>
-            <field name="model">res.country</field>
-            <field name="arch" type="xml">
-                <search string="Country">
-                    <field name="name"/>
-                    <field name="code"/>
-                </search>
-            </field>
-        </record>
+    <record id="view_country_search" model="ir.ui.view">
+        <field name="name">res.country.search</field>
+        <field name="model">res.country</field>
+        <field name="arch" type="xml">
+            <search string="Country">
+                <field name="name"/>
+                <field name="code"/>
+            </search>
+        </field>
+    </record>

-    </data>
-</openerp>
+</odoo>
--- a/base_location/views/state_view.xml
+++ b/base_location/views/state_view.xml
@ -1,26 +1,26 @@
 <?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Add cities to the State form -->
-        <record model="ir.ui.view" id="view_country_state_form2">
-            <field name="name">view_country_state_form2</field>
-            <field name="model">res.country.state</field>
-            <field name="inherit_id" ref="base.view_country_state_form"/>
-            <field name="arch" type="xml">
-                <field name="country_id" position="after">
-                    <field name="better_zip_ids"
-                        context="{'country_id': country_id}"
-                        colspan="4"
-                        nolabel="1">
-                        <tree editable="top">
-                            <field name="name"/>
-                            <field name="code"/>
-                            <field name="city"/>
-                            <field name="country_id"/>
-                        </tree>
-                    </field>
+<odoo>
+
+    <!-- Add cities to the State form -->
+    <record model="ir.ui.view" id="view_country_state_form2">
+        <field name="name">view_country_state_form2</field>
+        <field name="model">res.country.state</field>
+        <field name="inherit_id" ref="base.view_country_state_form"/>
+        <field name="arch" type="xml">
+            <field name="country_id" position="after">
+                <field name="better_zip_ids"
+                    context="{'country_id': country_id}"
+                    colspan="4"
+                    nolabel="1">
+                    <tree editable="top">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="city"/>
+                        <field name="country_id"/>
+                    </tree>
                </field>
            </field>
-        </record>
-    </data>
-</openerp>
+        </field>
+    </record>
+
+</odoo>