Skip to content

Commit

Permalink
Merge 5a4814b into 1eb2fb9
Browse files Browse the repository at this point in the history
  • Loading branch information
yajo committed Dec 18, 2014
2 parents 1eb2fb9 + 5a4814b commit 2f59167
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 91 deletions.
5 changes: 2 additions & 3 deletions base_location/better_zip.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@

class BetterZip(orm.Model):

" City/locations completion object"
"City/locations completion object"

_name = "res.better.zip"
_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'),
Expand Down
97 changes: 61 additions & 36 deletions base_location/i18n/base_location.pot
Original file line number Diff line number Diff line change
@@ -1,49 +1,59 @@
# 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"
"Content-Type: text/plain; charset=UTF-8\n"
"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
Expand All @@ -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
Expand All @@ -92,23 +107,33 @@ 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
#: help:res.better.zip,code:0
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 ""
129 changes: 78 additions & 51 deletions base_location/i18n/es.po
Original file line number Diff line number Diff line change
@@ -1,114 +1,141 @@
# 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 <pedro.baeza@serviciosbaeza.com>\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 <j.llopis@grupoesoc.es>\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
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
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
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
#: help:res.better.zip,code:0
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."
1 change: 0 additions & 1 deletion better_zip

This file was deleted.

0 comments on commit 2f59167

Please sign in to comment.