From 025eb5f7debbc8d378e9bbab559806508e0cfd72 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 4 Dec 2014 10:57:13 +0100 Subject: [PATCH 1/5] Delete better_zip (deprecated 2 years ago). --- better_zip | 1 - 1 file changed, 1 deletion(-) delete mode 120000 better_zip diff --git a/better_zip b/better_zip deleted file mode 120000 index 1a26d595b734..000000000000 --- a/better_zip +++ /dev/null @@ -1 +0,0 @@ -base_location \ No newline at end of file From 0f318cf25ee71b1ba24ddc0aa474477e9fbf3b94 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 4 Dec 2014 10:59:17 +0100 Subject: [PATCH 2/5] Remove extra space. --- base_location/better_zip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_location/better_zip.py b/base_location/better_zip.py index c51644a12679..601b1e477d19 100644 --- a/base_location/better_zip.py +++ b/base_location/better_zip.py @@ -24,7 +24,7 @@ class BetterZip(orm.Model): - " City/locations completion object" + "City/locations completion object" _name = "res.better.zip" _description = __doc__ From 6af469f8a9fadc181e780e46a5e1be9530c841a6 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 4 Dec 2014 11:01:00 +0100 Subject: [PATCH 3/5] New translation template. --- base_location/i18n/base_location.pot | 97 +++++++++++++++++----------- 1 file changed, 61 insertions(+), 36 deletions(-) diff --git a/base_location/i18n/base_location.pot b/base_location/i18n/base_location.pot index 078e79ab2921..eab327bd1686 100644 --- a/base_location/i18n/base_location.pot +++ b/base_location/i18n/base_location.pot @@ -1,13 +1,13 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * base_location # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 8.0-536d00d\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-12 22:33+0000\n" -"PO-Revision-Date: 2013-12-12 22:33+0000\n" +"POT-Creation-Date: 2014-12-04 09:59+0000\n" +"PO-Revision-Date: 2014-12-04 09:59+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,35 +15,45 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: base_location +#: model:ir.model,name:base_location.model_res_better_zip +msgid " City/locations completion object" +msgstr "" + #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree msgid "Cites/locations Management" msgstr "" #. module: base_location -#: field:res.better.zip,city:0 -msgid "City" +#: field:res.country.state,better_zip_ids:0 +msgid "Cities" msgstr "" #. module: base_location -#: view:res.better.zip:0 -#: field:res.better.zip,name:0 -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.zip_base +msgid "Cities/Locations Management" msgstr "" #. module: base_location -#: field:res.better.zip,state_id:0 -msgid "State" +#: field:res.better.zip,city:0 +msgid "City" msgstr "" #. module: base_location -#: field:res.better.zip,country_id:0 -msgid "Country" +#: field:res.better.zip,code:0 +msgid "City Code" msgstr "" #. module: base_location -#: field:res.better.zip,priority:0 -msgid "Priority" +#: view:res.company:base_location.view_company_form_city +#: view:res.partner:base_location.view_partner_form +msgid "City completion" +msgstr "" + +#. module: base_location +#: field:res.partner,zip_id:0 +msgid "City/Location" msgstr "" #. module: base_location @@ -52,38 +62,43 @@ msgid "Companies" msgstr "" #. module: base_location -#: field:res.better.zip,code:0 -msgid "City Code" +#: field:res.better.zip,country_id:0 +msgid "Country" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip -msgid " City/locations completion object" +#: model:ir.model,name:base_location.model_res_country_state +msgid "Country state" msgstr "" #. module: base_location -#: help:res.company,better_zip_id:0 -msgid "Use the city name or the zip code to search the location" +#: field:res.better.zip,create_uid:0 +msgid "Created by" msgstr "" #. module: base_location -#: field:res.partner,zip_id:0 -msgid "City/Location" +#: field:res.better.zip,create_date:0 +msgid "Created on" msgstr "" #. module: base_location -#: view:res.better.zip:0 -msgid "Search city" +#: field:res.better.zip,id:0 +msgid "ID" msgstr "" #. module: base_location -#: field:res.company,better_zip_id:0 -msgid "Location" +#: field:res.better.zip,write_uid:0 +msgid "Last Updated by" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.zip_base -msgid "Cities/Locations Management" +#: field:res.better.zip,write_date:0 +msgid "Last Updated on" +msgstr "" + +#. module: base_location +#: field:res.company,better_zip_id:0 +msgid "Location" msgstr "" #. module: base_location @@ -92,19 +107,18 @@ msgid "Partner" msgstr "" #. module: base_location -#: view:res.company:0 -#: view:res.partner:0 -msgid "City completion" +#: field:res.better.zip,priority:0 +msgid "Priority" msgstr "" #. module: base_location -#: field:res.country.state,better_zip_ids:0 -msgid "Cities" +#: view:res.better.zip:base_location.view_better_zip_filter +msgid "Search city" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_country_state -msgid "Country state" +#: field:res.better.zip,state_id:0 +msgid "State" msgstr "" #. module: base_location @@ -112,3 +126,14 @@ msgstr "" msgid "The official code for the city" msgstr "" +#. module: base_location +#: help:res.company,better_zip_id:0 +msgid "Use the city name or the zip code to search the location" +msgstr "" + +#. module: base_location +#: view:res.better.zip:base_location.better_zip_form +#: view:res.better.zip:base_location.better_zip_tree +#: field:res.better.zip,name:0 +msgid "ZIP" +msgstr "" From 34e8a01a7c2383f515ea424e1f53f6e41b085476 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Thu, 4 Dec 2014 11:39:34 +0100 Subject: [PATCH 4/5] Update Spanish translation. --- base_location/i18n/es.po | 129 +++++++++++++++++++++++---------------- 1 file changed, 78 insertions(+), 51 deletions(-) diff --git a/base_location/i18n/es.po b/base_location/i18n/es.po index 3ff60e23194b..bd5e995ab541 100644 --- a/base_location/i18n/es.po +++ b/base_location/i18n/es.po @@ -1,24 +1,40 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * base_location +# * base_location # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.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 \n" +"POT-Creation-Date: 2014-12-04 09:59+0000\n" +"PO-Revision-Date: 2014-12-04 11:38+0100\n" +"Last-Translator: Jairo Llopis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" +"X-Generator: Poedit 1.5.4\n" +"Language: es_ES\n" + +#. 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" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree msgid "Cites/locations Management" -msgstr "Gestión de ciudades/ubicaciones" +msgstr "Gestión de ciudades/localidades" + +#. module: base_location +#: field:res.country.state,better_zip_ids:0 +msgid "Cities" +msgstr "Ciudades" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.zip_base +msgid "Cities/Locations Management" +msgstr "Gestión de ciudades/localidades" #. module: base_location #: field:res.better.zip,city:0 @@ -26,25 +42,20 @@ msgid "City" msgstr "Ciudad" #. module: base_location -#: view:res.better.zip:0 -#: field:res.better.zip,name:0 -msgid "ZIP" -msgstr "C.P." - -#. module: base_location -#: field:res.better.zip,state_id:0 -msgid "State" -msgstr "Provincia" +#: field:res.better.zip,code:0 +msgid "City Code" +msgstr "Código de ciudad" #. module: base_location -#: field:res.better.zip,country_id:0 -msgid "Country" -msgstr "País" +#: view:res.company:base_location.view_company_form_city +#: view:res.partner:base_location.view_partner_form +msgid "City completion" +msgstr "Autocompletar a partir de la ciudad" #. module: base_location -#: field:res.better.zip,priority:0 -msgid "Priority" -msgstr "Prioridad" +#: field:res.partner,zip_id:0 +msgid "City/Location" +msgstr "Ciudad/Localidad" #. module: base_location #: model:ir.model,name:base_location.model_res_company @@ -52,39 +63,44 @@ msgid "Companies" msgstr "Compañías" #. module: base_location -#: field:res.better.zip,code:0 -msgid "City Code" -msgstr "Código de ciudad" +#: field:res.better.zip,country_id:0 +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" +#: field:res.better.zip,create_uid:0 +msgid "Created by" +msgstr "Creado por" #. module: base_location -#: field:res.partner,zip_id:0 -msgid "City/Location" -msgstr "Ciudad/Ubicación" +#: field:res.better.zip,create_date:0 +msgid "Created on" +msgstr "Fecha de creación" #. module: base_location -#: view:res.better.zip:0 -msgid "Search city" -msgstr "Buscar ciudad" +#: field:res.better.zip,id:0 +msgid "ID" +msgstr "ID" #. module: base_location -#: field:res.company,better_zip_id:0 -msgid "Location" -msgstr "Ubicación" +#: field:res.better.zip,write_uid:0 +msgid "Last Updated by" +msgstr "Actualizado la última vez por" #. module: base_location -#: model:ir.ui.menu,name:base_location.zip_base -msgid "Cities/Locations Management" -msgstr "Ciudad/Ubicaciones" +#: field:res.better.zip,write_date:0 +msgid "Last Updated on" +msgstr "Fecha de última actualización" + +#. module: base_location +#: field:res.company,better_zip_id:0 +msgid "Location" +msgstr "Localidad" #. module: base_location #: model:ir.model,name:base_location.model_res_partner @@ -92,19 +108,18 @@ 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" +#: field:res.better.zip,priority:0 +msgid "Priority" +msgstr "Prioridad" #. module: base_location -#: field:res.country.state,better_zip_ids:0 -msgid "Cities" -msgstr "Ciudades" +#: view:res.better.zip: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" +#: field:res.better.zip,state_id:0 +msgid "State" msgstr "Provincia" #. module: base_location @@ -112,3 +127,15 @@ msgstr "Provincia" msgid "The official code for the city" msgstr "El código oficial para la ciudad" +#. 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 localidad" + +#. module: base_location +#: view:res.better.zip:base_location.better_zip_form +#: view:res.better.zip:base_location.better_zip_tree +#: field:res.better.zip,name:0 +msgid "ZIP" +msgstr "C.P." From 5a4814bd6161fcda19d45045d830d473fbd5b362 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 10 Dec 2014 17:03:38 +0100 Subject: [PATCH 5/5] Drop deprecated field. --- base_location/better_zip.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base_location/better_zip.py b/base_location/better_zip.py index 601b1e477d19..8eb026b5e2f9 100644 --- a/base_location/better_zip.py +++ b/base_location/better_zip.py @@ -30,8 +30,7 @@ class BetterZip(orm.Model): _description = __doc__ _order = "priority" - _columns = {'priority': fields.integer('Priority', deprecated=True), - 'name': fields.char('ZIP'), + _columns = {'name': fields.char('ZIP'), 'city': fields.char('City', required=True), 'state_id': fields.many2one('res.country.state', 'State'), 'country_id': fields.many2one('res.country', 'Country'),