From 67baf9196b76a93597cf93984eb7b682e3c86b5e Mon Sep 17 00:00:00 2001 From: Aitor Bouzas Date: Mon, 8 Oct 2018 17:04:28 +0200 Subject: [PATCH] [MIG] base_location: Migration to 12.0 This module has now been refactored to be more consistent with what base_address_city offers to the location management. Added dependency to contacts so that I could change the menu location for cities / zip management. Now, every res.city record has a relation One2many to res.city.zip (old res.better.zip). This way, every zip has a realted city too. Zips can be searched through city code, zip or city name (same as before). Modified tests and deleted not needed tests. Added sql contraints so that zips and cities are unique within it's country / state / city. --- base_location/README.rst | 106 ++-- base_location/__init__.py | 1 - base_location/__manifest__.py | 24 +- base_location/demo/better_zip.xml | 8 - base_location/demo/res_city_zip.xml | 13 + base_location/i18n/am.po | 148 +++--- base_location/i18n/ar.po | 153 +++--- base_location/i18n/base_location.pot | 144 +++--- base_location/i18n/bg.po | 153 +++--- base_location/i18n/bs.po | 153 +++--- base_location/i18n/ca.po | 153 +++--- base_location/i18n/cs.po | 153 +++--- base_location/i18n/da.po | 179 +++---- base_location/i18n/de.po | 206 ++++---- base_location/i18n/el_GR.po | 153 +++--- base_location/i18n/en_GB.po | 153 +++--- base_location/i18n/es.po | 183 +++---- base_location/i18n/es_AR.po | 153 +++--- base_location/i18n/es_CL.po | 153 +++--- base_location/i18n/es_CO.po | 159 +++--- base_location/i18n/es_CR.po | 153 +++--- base_location/i18n/es_DO.po | 153 +++--- base_location/i18n/es_EC.po | 153 +++--- base_location/i18n/es_ES.po | 148 +++--- base_location/i18n/es_MX.po | 153 +++--- base_location/i18n/es_PE.po | 153 +++--- base_location/i18n/es_PY.po | 153 +++--- base_location/i18n/es_VE.po | 153 +++--- base_location/i18n/et.po | 153 +++--- base_location/i18n/eu.po | 153 +++--- base_location/i18n/fa.po | 153 +++--- base_location/i18n/fi.po | 151 +++--- base_location/i18n/fr.po | 185 +++---- base_location/i18n/fr_CA.po | 148 +++--- base_location/i18n/fr_CH.po | 148 +++--- base_location/i18n/gl.po | 153 +++--- base_location/i18n/gl_ES.po | 148 +++--- base_location/i18n/he.po | 153 +++--- base_location/i18n/hr.po | 153 +++--- base_location/i18n/hr_HR.po | 179 +++---- base_location/i18n/hu.po | 153 +++--- base_location/i18n/id.po | 153 +++--- base_location/i18n/it.po | 179 +++---- base_location/i18n/ja.po | 153 +++--- base_location/i18n/ko.po | 153 +++--- base_location/i18n/lt.po | 153 +++--- base_location/i18n/lt_LT.po | 148 +++--- base_location/i18n/lv.po | 153 +++--- base_location/i18n/mk.po | 153 +++--- base_location/i18n/mn.po | 153 +++--- base_location/i18n/nb.po | 153 +++--- base_location/i18n/nb_NO.po | 153 +++--- base_location/i18n/nl.po | 156 +++--- base_location/i18n/nl_BE.po | 153 +++--- base_location/i18n/nl_NL.po | 182 +++---- base_location/i18n/pl.po | 153 +++--- base_location/i18n/pt.po | 153 +++--- base_location/i18n/pt_BR.po | 185 +++---- base_location/i18n/pt_PT.po | 176 ++++--- base_location/i18n/ro.po | 153 +++--- base_location/i18n/ru.po | 148 +++--- base_location/i18n/sk.po | 153 +++--- base_location/i18n/sl.po | 179 +++---- base_location/i18n/sr.po | 153 +++--- base_location/i18n/sr@latin.po | 153 +++--- base_location/i18n/sv.po | 153 +++--- base_location/i18n/th.po | 153 +++--- base_location/i18n/tr.po | 153 +++--- base_location/i18n/tr_TR.po | 148 +++--- base_location/i18n/uk.po | 153 +++--- base_location/i18n/vi.po | 153 +++--- base_location/i18n/vi_VN.po | 148 +++--- base_location/i18n/zh_CN.po | 153 +++--- base_location/i18n/zh_TW.po | 153 +++--- base_location/models/__init__.py | 9 +- base_location/models/better_zip.py | 108 ---- base_location/models/res_city.py | 19 + base_location/models/res_city_zip.py | 40 ++ .../models/{company.py => res_company.py} | 46 +- .../models/{partner.py => res_partner.py} | 60 ++- base_location/models/state.py | 11 - base_location/readme/CONFIGURE.rst | 10 + base_location/readme/CONTRIBUTORS.rst | 9 + base_location/readme/CREDITS.rst | 1 + base_location/readme/DESCRIPTION.rst | 5 + base_location/readme/USAGE.rst | 3 + base_location/security/ir.model.access.csv | 3 +- base_location/static/description/index.html | 463 ++++++++++++++++++ base_location/tests/__init__.py | 1 - base_location/tests/test_base_location.py | 394 +++++++-------- base_location/views/better_zip_view.xml | 85 ---- base_location/views/res_city_view.xml | 63 +++ base_location/views/res_city_zip_view.xml | 56 +++ ...{company_view.xml => res_company_view.xml} | 0 base_location/views/res_country_view.xml | 2 +- ...{partner_view.xml => res_partner_view.xml} | 1 - base_location/views/state_view.xml | 26 - 97 files changed, 6029 insertions(+), 6351 deletions(-) delete mode 100644 base_location/demo/better_zip.xml create mode 100644 base_location/demo/res_city_zip.xml delete mode 100644 base_location/models/better_zip.py create mode 100644 base_location/models/res_city.py create mode 100644 base_location/models/res_city_zip.py rename base_location/models/{company.py => res_company.py} (62%) rename base_location/models/{partner.py => res_partner.py} (55%) delete mode 100644 base_location/models/state.py create mode 100644 base_location/readme/CONFIGURE.rst create mode 100644 base_location/readme/CONTRIBUTORS.rst create mode 100644 base_location/readme/CREDITS.rst create mode 100644 base_location/readme/DESCRIPTION.rst create mode 100644 base_location/readme/USAGE.rst create mode 100644 base_location/static/description/index.html delete mode 100644 base_location/views/better_zip_view.xml create mode 100644 base_location/views/res_city_view.xml create mode 100644 base_location/views/res_city_zip_view.xml rename base_location/views/{company_view.xml => res_company_view.xml} (100%) rename base_location/views/{partner_view.xml => res_partner_view.xml} (99%) delete mode 100644 base_location/views/state_view.xml diff --git a/base_location/README.rst b/base_location/README.rst index 160dbf7c0..33b6fe83c 100644 --- a/base_location/README.rst +++ b/base_location/README.rst @@ -1,33 +1,54 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +==================================== +Location management (aka Better ZIP) +==================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpartner--contact-lightgray.png?logo=github + :target: https://github.com/OCA/partner-contact/tree/12.0/base_location + :alt: OCA/partner-contact +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/partner-contact-12-0/partner-contact-12-0-base_location + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/134/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module introduces a zip model that allows you to manage locations in a better way. + +The zips will allow the users to complete automatically all address-related fields by just filling the zip. -======================= -Enhanced ZIP management -======================= - -This module introduces a better zip/npa management system. +Also allows different search filters. -It enables zip, city, state and country auto-completion on partners and companies. +**Table of contents** -Also allows different search filters. +.. contents:: + :local: Configuration ============= -#. Activate the developer mode in *Settings*. -#. Go to *Settings / Technical / Locations Management / Locations*. -#. Create a new Location. +#. Go to *Contacts / Configuration / Localization / Cities*. +#. Create a new City. + +#. Go to *Contacts / Configuration / Localization / Zips*. +#. Create a new Zip and relate it to the city (you can also create the Zip from the City). or, with module 'Contacts Directory' installed: #. Go to *Contacts / Configuration / Localization / Countries*. #. Locate the desired country. -#. Press on the button 'Locations'. - -or, -#. Go to *Contacts / Configuration / Localization / Fed. States* -#. Locate the desired state. -#. Enter the desired Locations. +#. Press on the button 'Cities' / 'Zips'. Usage ===== @@ -36,52 +57,59 @@ Usage #. Fill the field *Location completion* #. Information about country, state, city and zip will be filled automatically - - -.. 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/11.0 - Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smash it by providing detailed and welcomed feedback. +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Icon park: `Icon http://icon-park.com/icon/location-map-pin-orange3/` +* Camptocamp +* ACYSOS S.L. +* Alejandro Santana +* Tecnativa +* AdaptiveCity Contributors ------------- +~~~~~~~~~~~~ * Nicolas Bessi (Camptocamp) * Ignacio Ibeas (Acysos S.L.) -* Pedro M. Baeza +* Pedro M. Baeza * Alejandro Santana * Sandy Carter * Yannick Vaucher * Francesco Apruzzese * Dave Lasley +* Aitor Bouzas + +Other credits +~~~~~~~~~~~~~ + +* Icon park: `Icon http://icon-park.com/icon/location-map-pin-orange3/` +Maintainers +~~~~~~~~~~~ -Maintainer ----------- +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/partner-contact `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_location/__init__.py b/base_location/__init__.py index e2aed6e67..69f7babdf 100644 --- a/base_location/__init__.py +++ b/base_location/__init__.py @@ -1,4 +1,3 @@ -# Copyright 2016 Nicolas Bessi, Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/base_location/__manifest__.py b/base_location/__manifest__.py index 1d4810eba..532856707 100644 --- a/base_location/__manifest__.py +++ b/base_location/__manifest__.py @@ -4,26 +4,30 @@ { 'name': 'Location management (aka Better ZIP)', - 'version': '11.0.1.0.1', + 'version': '12.0.1.0.0', 'depends': [ - 'base_address_city' + 'base_address_city', + 'contacts', ], 'author': "Camptocamp," "ACYSOS S.L.," "Alejandro Santana," "Tecnativa," + "AdaptiveCity," "Odoo Community Association (OCA)", 'license': "AGPL-3", 'summary': '''Enhanced zip/npa management system''', - 'website': 'http://www.camptocamp.com', - 'data': ['views/better_zip_view.xml', - 'views/state_view.xml', - 'views/res_country_view.xml', - 'views/company_view.xml', - 'views/partner_view.xml', - 'security/ir.model.access.csv'], + 'website': 'https://github.com/OCA/partner-contact', + 'data': [ + 'security/ir.model.access.csv', + 'views/res_city_zip_view.xml', + 'views/res_city_view.xml', + 'views/res_country_view.xml', + 'views/res_company_view.xml', + 'views/res_partner_view.xml', + ], 'demo': [ - 'demo/better_zip.xml', + 'demo/res_city_zip.xml', ], 'installable': True, 'auto_install': False, diff --git a/base_location/demo/better_zip.xml b/base_location/demo/better_zip.xml deleted file mode 100644 index 0c7f3b9ee..000000000 --- a/base_location/demo/better_zip.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - 1000 - Brussels - - - diff --git a/base_location/demo/res_city_zip.xml b/base_location/demo/res_city_zip.xml new file mode 100644 index 000000000..e940e49f1 --- /dev/null +++ b/base_location/demo/res_city_zip.xml @@ -0,0 +1,13 @@ + + + + + Brussels + + + + + 1000 + + + diff --git a/base_location/i18n/am.po b/base_location/i18n/am.po index 3c6e925d1..583262dfa 100644 --- a/base_location/i18n/am.po +++ b/base_location/i18n/am.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/ar.po b/base_location/i18n/ar.po index 036856d90..127bafb3b 100644 --- a/base_location/i18n/ar.po +++ b/base_location/i18n/ar.po @@ -20,40 +20,42 @@ msgstr "" "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "أنشئ بواسطة" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "أنشئ في" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "اسم العرض" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "تجميع حسب" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "المعرف" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "آخر تحديث في" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "تجميع حسب" diff --git a/base_location/i18n/base_location.pot b/base_location/i18n/base_location.pot index 17ed884bd..b65883179 100644 --- a/base_location/i18n/base_location.pot +++ b/base_location/i18n/base_location.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,38 +14,40 @@ msgstr "" "Plural-Forms: \n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "Check this box to ensure every address created in that country has a 'City' chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -60,156 +62,132 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "You already have a city with that name in the same state.The city must have a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "You already have a zip with that code in the same city. The zip code must be unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/bg.po b/base_location/i18n/bg.po index 692c4bcb6..5ecab1f58 100644 --- a/base_location/i18n/bg.po +++ b/base_location/i18n/bg.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Създадено от" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Създадено на" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Име за показване" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Групиране по" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Последно обновено на" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Групиране по" diff --git a/base_location/i18n/bs.po b/base_location/i18n/bs.po index cbb118f88..e0edd089d 100644 --- a/base_location/i18n/bs.po +++ b/base_location/i18n/bs.po @@ -20,40 +20,42 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Kreirano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Prikaži naziv" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupiši po" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Zadnje mijenjano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Zadnje ažurirano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupiši po" diff --git a/base_location/i18n/ca.po b/base_location/i18n/ca.po index c4542aafc..d0e00bde7 100644 --- a/base_location/i18n/ca.po +++ b/base_location/i18n/ca.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creat per" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creat el" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Veure el nom" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupa Per" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Darrera modificació el" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Darrera Actualització per" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Darrera Actualització el" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupa Per" diff --git a/base_location/i18n/cs.po b/base_location/i18n/cs.po index 759b82371..b58fec447 100644 --- a/base_location/i18n/cs.po +++ b/base_location/i18n/cs.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Vytvořil(a)" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Vytvořeno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Zobrazovaný název" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Seskupit podle" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Naposled upraveno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Naposled upraveno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Naposled upraveno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Seskupit podle" diff --git a/base_location/i18n/da.po b/base_location/i18n/da.po index aa6bd4cf9..3b42ae71b 100644 --- a/base_location/i18n/da.po +++ b/base_location/i18n/da.po @@ -19,40 +19,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Byer" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "By" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "Postnummer" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "By" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Slå by/postnummer op" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +70,153 @@ msgid "Contact" 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 +#: model_terms: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 "Delstat/region" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Oprettet af" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Oprettet den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Vist navn" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Gruppér efter" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Sidst ændret den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Sidst opdateret af" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Sidst opdateret den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Søg by" #. 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 "Delstat" - -#. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" -msgstr "Postnummer" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Søg på bynavn eller postnummer" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "Søg på bynavn eller postnummer" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "Postnr." #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Postnummer" + +#~ msgid "Country state" +#~ msgstr "Delstat/region" + +#~ msgid "Group By" +#~ msgstr "Gruppér efter" + +#~ msgid "State" +#~ msgstr "Delstat" + +#~ msgid "The official code for the city" +#~ msgstr "Postnummer" diff --git a/base_location/i18n/de.po b/base_location/i18n/de.po index 37521f9cb..ffee5d15b 100644 --- a/base_location/i18n/de.po +++ b/base_location/i18n/de.po @@ -20,8 +20,12 @@ msgstr "" "X-Generator: Weblate 3.1.1\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." @@ -31,32 +35,31 @@ msgstr "" "Landes ausgewählt ist." #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Orte" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id 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" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Stadt" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Orts-Vervollständigung" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Stadt/Standorte-Vervollständungsobjekt" @@ -71,158 +74,175 @@ msgid "Contact" msgstr "Kontakt" #. 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "erstellt am" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Anzeigename" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" -msgstr "Städte erzwingen" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." +msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Gruppiere" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "Städte erzwingen" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "zuletzt aktualisiert am" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "Breitengrad" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "Standortvervollständigung" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "Standorte" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "Standorteverwaltung" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "Längengrad" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Suche Stadt" #. 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 -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "Die Stadt des Partners %s weicht von der des Standorts %s ab" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "Das Land der Stadt unterscheidet sich vom Land des Standorts %s" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "Das Land des Partners %s unterscheidet sich vom dem des Standorts %s" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" -msgstr "Das Land des Bundeslands unterscheidet sich vom Land des Standorts %s" - -#. 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" +msgid "The state of the partner %s differs from that in location %s" +msgstr "" +"Das Bundesland des Partners %s unterscheidet sich von dem am Standort %s" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" -"Das Bundesland der Stadt unterscheidet sich vom Bundesland am Standort %s" +"Verwenden Sie den Stadtnamen oder die PLZ, um nach diesem Standort zu suchen" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" -"Das Bundesland des Partners %s unterscheidet sich von dem am Standort %s" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" 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.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "PLZ" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "Standort-PLZ" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Ortskennung" + +#~ msgid "Country state" +#~ msgstr "Bundesland" + +#~ msgid "Group By" +#~ msgstr "Gruppiere" + +#~ msgid "Latitude" +#~ msgstr "Breitengrad" + +#~ msgid "Locations Management" +#~ msgstr "Standorteverwaltung" + +#~ msgid "Longitude" +#~ msgstr "Längengrad" + +#~ msgid "State" +#~ msgstr "Bundesland" + +#~ msgid "The country of the city differs from the country in location %s" +#~ msgstr "Das Land der Stadt unterscheidet sich vom Land des Standorts %s" + +#~ msgid "The country of the state differs from the country in location %s" +#~ msgstr "" +#~ "Das Land des Bundeslands unterscheidet sich vom Land des Standorts %s" + +#~ msgid "The official code for the city" +#~ msgstr "Die offizielle Kennung der Stadt" + +#~ msgid "The state of the city differs from the state in location %s" +#~ msgstr "" +#~ "Das Bundesland der Stadt unterscheidet sich vom Bundesland am Standort %s" diff --git a/base_location/i18n/el_GR.po b/base_location/i18n/el_GR.po index 699becb0c..cf5086c37 100644 --- a/base_location/i18n/el_GR.po +++ b/base_location/i18n/el_GR.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Δημιουργήθηκε από " #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Δημιουργήθηκε στις" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Ομαδοποίηση Ανά" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "Κωδικός" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Τελευταία ενημέρωση στις" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Ομαδοποίηση Ανά" diff --git a/base_location/i18n/en_GB.po b/base_location/i18n/en_GB.po index 1f0032216..6cfd41a32 100644 --- a/base_location/i18n/en_GB.po +++ b/base_location/i18n/en_GB.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Created by" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Created on" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Display Name" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Last Modified on" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Last Updated by" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Last Updated on" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Group By" diff --git a/base_location/i18n/es.po b/base_location/i18n/es.po index 71fa54b3a..0a1aecd1f 100644 --- a/base_location/i18n/es.po +++ b/base_location/i18n/es.po @@ -20,40 +20,43 @@ msgstr "" "X-Generator: Weblate 3.0.1\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Ciudades" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "Ciudad" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "Código de ciudad" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Ciudad" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Autocompletado a partir de la ciudad" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Autocompletado de objetos a partir de ciudades/ubicaciones" @@ -68,156 +71,160 @@ msgid "Contact" msgstr "Contacto" #. 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 +#: model_terms: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 "Provincia" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre mostrado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "Latitud" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "Longitud" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Buscar ciudad" #. 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: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the partner %s differs from that in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" +"Utilice el nombre de ciudad o el código postal para buscar la ubicación" #. module: base_location -#: 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" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" +msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" +msgstr "C.P." + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" 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 -msgid "ZIP" -msgstr "C.P." +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "City Code" +#~ msgstr "Código de ciudad" + +#~ msgid "Country state" +#~ msgstr "Provincia" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" + +#~ msgid "Latitude" +#~ msgstr "Latitud" + +#~ msgid "Longitude" +#~ msgstr "Longitud" + +#~ msgid "State" +#~ msgstr "Provincia" + +#~ msgid "The official code for the city" +#~ msgstr "El código oficial para la ciudad" diff --git a/base_location/i18n/es_AR.po b/base_location/i18n/es_AR.po index f82d675b4..78385e00a 100644 --- a/base_location/i18n/es_AR.po +++ b/base_location/i18n/es_AR.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Mostrar Nombre" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última modificación en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Última actualización realizada por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización el" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_CL.po b/base_location/i18n/es_CL.po index 814c05f20..c3838889f 100644 --- a/base_location/i18n/es_CL.po +++ b/base_location/i18n/es_CL.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre mostrado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID (identificación)" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última modificación en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Última actualización de" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_CO.po b/base_location/i18n/es_CO.po index 7da14d70e..42e4de7bd 100644 --- a/base_location/i18n/es_CO.po +++ b/base_location/i18n/es_CO.po @@ -22,40 +22,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Ciudades" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "Ciudad" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "Código Ciudad" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Ciudad" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -70,155 +73,143 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre Público" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última Modificación el" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Actualizado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Actualizado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "City Code" +#~ msgstr "Código Ciudad" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_CR.po b/base_location/i18n/es_CR.po index 19f8cdcb4..bcbe630aa 100644 --- a/base_location/i18n/es_CR.po +++ b/base_location/i18n/es_CR.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Ultima actualización por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultima actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_DO.po b/base_location/i18n/es_DO.po index 227bde8fb..aeb41d936 100644 --- a/base_location/i18n/es_DO.po +++ b/base_location/i18n/es_DO.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre mostrado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última modificación en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Última actualización de" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_EC.po b/base_location/i18n/es_EC.po index 822ae95e0..abebb03c6 100644 --- a/base_location/i18n/es_EC.po +++ b/base_location/i18n/es_EC.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre mostrado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID (identificación)" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última modificación en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Última actualización de" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_ES.po b/base_location/i18n/es_ES.po index 0e94d69f8..bf2817e37 100644 --- a/base_location/i18n/es_ES.po +++ b/base_location/i18n/es_ES.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre para mostrar" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última modificación en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/es_MX.po b/base_location/i18n/es_MX.po index ccf836d53..cecb4f14d 100644 --- a/base_location/i18n/es_MX.po +++ b/base_location/i18n/es_MX.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre desplegado" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Ultima modificacion realizada" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Ultima actualizacion por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultima actualización realizada" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/es_PE.po b/base_location/i18n/es_PE.po index 897def3aa..ff13bbcd2 100644 --- a/base_location/i18n/es_PE.po +++ b/base_location/i18n/es_PE.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nombre a Mostrar" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupado por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Ultima Modificación en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Actualizado última vez por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultima Actualización" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupado por" diff --git a/base_location/i18n/es_PY.po b/base_location/i18n/es_PY.po index e896833cd..86e10ab4b 100644 --- a/base_location/i18n/es_PY.po +++ b/base_location/i18n/es_PY.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupado por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Ultima actualización por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultima actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupado por" diff --git a/base_location/i18n/es_VE.po b/base_location/i18n/es_VE.po index cc59e5c72..3843cb404 100644 --- a/base_location/i18n/es_VE.po +++ b/base_location/i18n/es_VE.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Mostrar nombre" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Modificada por última vez" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Última actualización realizada por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultima actualizacion en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/et.po b/base_location/i18n/et.po index 2dbb116d2..2fc7c5da2 100644 --- a/base_location/i18n/et.po +++ b/base_location/i18n/et.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Loonud" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Loodud" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Näidatav nimi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Rühmitamine" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Viimati muudetud" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Viimati uuendatud" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Viimati uuendatud" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Rühmitamine" diff --git a/base_location/i18n/eu.po b/base_location/i18n/eu.po index 6717f0924..dad26ebc6 100644 --- a/base_location/i18n/eu.po +++ b/base_location/i18n/eu.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Nork sortua" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Created on" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Izena erakutsi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Last Updated by" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Last Updated on" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Group By" diff --git a/base_location/i18n/fa.po b/base_location/i18n/fa.po index 7672e8277..e170f337e 100644 --- a/base_location/i18n/fa.po +++ b/base_location/i18n/fa.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "ایجاد شده توسط" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "ایجاد شده در" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "نام نمایشی" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "گروه‌بندی برمبنای" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "شناسه" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "آخرین به روز رسانی در" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "گروه‌بندی برمبنای" diff --git a/base_location/i18n/fi.po b/base_location/i18n/fi.po index 9636485e1..6b41f190d 100644 --- a/base_location/i18n/fi.po +++ b/base_location/i18n/fi.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Luotu" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nimi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Viimeksi muokattu" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" 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 "Tila" - -#. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "State" +#~ msgstr "Tila" diff --git a/base_location/i18n/fr.po b/base_location/i18n/fr.po index 835013380..5d8b7785e 100644 --- a/base_location/i18n/fr.po +++ b/base_location/i18n/fr.po @@ -20,8 +20,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." @@ -30,32 +34,31 @@ msgstr "" "villes de ce pays lors de la saisie d'une adresse dans ce pays." #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Villes" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "Ville" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "Code de la ville" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Ville" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Complétion par ville" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Objet de compléte de Ville / lieux" @@ -70,155 +73,159 @@ msgid "Contact" msgstr "Contacte" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_country_search msgid "Country" msgstr "Pays" #. module: base_location -#: model:ir.model,name:base_location.model_res_country_state -msgid "Country state" -msgstr "Etat" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Créé par" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Créé le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Intitulé" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Regrouper par" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "Identifiant" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Dernière modification le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Mis à jour le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "Latitude" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "Longitude" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Rechercher ville" #. 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: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. 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" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Utilisez le nom de la ville ou le zip lors des recherches" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "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.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "ZIP" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "Code postal" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Code de la ville" + +#~ msgid "Country state" +#~ msgstr "Etat" + +#~ msgid "Group By" +#~ msgstr "Regrouper par" + +#~ msgid "Latitude" +#~ msgstr "Latitude" + +#~ msgid "Longitude" +#~ msgstr "Longitude" + +#~ msgid "State" +#~ msgstr "Etat" + +#~ msgid "The official code for the city" +#~ msgstr "Code officiel de la ville" diff --git a/base_location/i18n/fr_CA.po b/base_location/i18n/fr_CA.po index 989fe1821..7734ecb55 100644 --- a/base_location/i18n/fr_CA.po +++ b/base_location/i18n/fr_CA.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Créé par" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Créé le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Afficher le nom" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "Identifiant" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Dernière mise à jour par" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Dernière mise à jour le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/fr_CH.po b/base_location/i18n/fr_CH.po index 92bc9f46c..ff7bfe861 100644 --- a/base_location/i18n/fr_CH.po +++ b/base_location/i18n/fr_CH.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Créé par" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Créé le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nom affiché" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Dernière modification le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Modifié par" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Modifié le" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/gl.po b/base_location/i18n/gl.po index f1283d6f1..c7caf2027 100644 --- a/base_location/i18n/gl.po +++ b/base_location/i18n/gl.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creado por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creado en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Modificado por última vez o" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Última actualización en" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/gl_ES.po b/base_location/i18n/gl_ES.po index 4bf60b310..ac225fb77 100644 --- a/base_location/i18n/gl_ES.po +++ b/base_location/i18n/gl_ES.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/he.po b/base_location/i18n/he.po index cc1bacf32..34750d023 100644 --- a/base_location/i18n/he.po +++ b/base_location/i18n/he.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "נוצר על ידי" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "נוצר ב-" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "השם המוצג" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "קבץ לפי" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "מזהה" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "עודכן לאחרונה על" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "קבץ לפי" diff --git a/base_location/i18n/hr.po b/base_location/i18n/hr.po index 0a8c43b18..7be5fc50b 100644 --- a/base_location/i18n/hr.po +++ b/base_location/i18n/hr.po @@ -20,40 +20,42 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Kreirano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Naziv za prikaz" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupiraj po" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Zadnje ažuriranje" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupiraj po" diff --git a/base_location/i18n/hr_HR.po b/base_location/i18n/hr_HR.po index cca5c3073..5ce666a71 100644 --- a/base_location/i18n/hr_HR.po +++ b/base_location/i18n/hr_HR.po @@ -21,40 +21,43 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Gradovi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id 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" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Grad" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Popunjavanje grada" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Objekt popunjavanja Grada/Lokacije" @@ -69,155 +72,153 @@ msgid "Contact" msgstr "Kontakt" #. 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Kreirano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Naziv" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Prupiraj po" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Zadnje ažurirano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" 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 -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. 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" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Koristite naziv ili šifru grada za pretraživanje" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "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.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "ZIP" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Šifra grada" + +#~ msgid "Country state" +#~ msgstr "Oblast/Županija" + +#~ msgid "Group By" +#~ msgstr "Prupiraj po" + +#~ msgid "State" +#~ msgstr "Oblast/Županija" + +#~ msgid "The official code for the city" +#~ msgstr "Službena šifra ovog grada" diff --git a/base_location/i18n/hu.po b/base_location/i18n/hu.po index f5e2f9336..37677b140 100644 --- a/base_location/i18n/hu.po +++ b/base_location/i18n/hu.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Készítette" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Létrehozás dátuma" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Név megjelenítése" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Csoportosítás..." +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Utolsó frissítés dátuma" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Utoljára frissítve, által" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Utoljára frissítve " #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Csoportosítás..." diff --git a/base_location/i18n/id.po b/base_location/i18n/id.po index 2995d677a..807226bf2 100644 --- a/base_location/i18n/id.po +++ b/base_location/i18n/id.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Dibuat oleh" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Dibuat pada" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nama Tampilan" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Dikelompokan berdasarkan .." +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Terakhir Dimodifikasi pada" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Diperbaharui oleh" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Diperbaharui pada" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Dikelompokan berdasarkan .." diff --git a/base_location/i18n/it.po b/base_location/i18n/it.po index 67e0b7ec4..b51245325 100644 --- a/base_location/i18n/it.po +++ b/base_location/i18n/it.po @@ -19,40 +19,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Città" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "Città" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "Codice Città" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Città" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Completamento città" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Città/luoghi di completamento oggetto" @@ -67,155 +70,153 @@ msgid "Contact" msgstr "Contatto" #. 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creato il" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nome da visualizzare" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Raggruppa per" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultimo caricamento di" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Ricerca città" #. 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: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. 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à" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Usare il nome della città o il codice CAP per ricercare la locazione" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "Usare il nome della città o il codice CAP per ricercare la locazione" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "CAP" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Codice Città" + +#~ msgid "Country state" +#~ msgstr "Provincia Paese" + +#~ msgid "Group By" +#~ msgstr "Raggruppa per" + +#~ msgid "State" +#~ msgstr "Provincia" + +#~ msgid "The official code for the city" +#~ msgstr "Il codice ufficiale per la città" diff --git a/base_location/i18n/ja.po b/base_location/i18n/ja.po index 1463f42e2..7fc6e699b 100644 --- a/base_location/i18n/ja.po +++ b/base_location/i18n/ja.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "作成者" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "作成日" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "表示名" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "グループ化" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "最終更新日" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "グループ化" diff --git a/base_location/i18n/ko.po b/base_location/i18n/ko.po index c7b12df10..4155d30fa 100644 --- a/base_location/i18n/ko.po +++ b/base_location/i18n/ko.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "작성자" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "작성일" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "표시 이름" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "그룹화" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "최근 갱신 날짜" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "그룹화" diff --git a/base_location/i18n/lt.po b/base_location/i18n/lt.po index d69d70332..b1a46b780 100644 --- a/base_location/i18n/lt.po +++ b/base_location/i18n/lt.po @@ -20,40 +20,42 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Sukūrė" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Sukurta" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Vaizduojamas pavadinimas" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupuoti pagal" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Paskutinį kartą keista" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Paskutinį kartą atnaujino" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Paskutinį kartą atnaujinta" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupuoti pagal" diff --git a/base_location/i18n/lt_LT.po b/base_location/i18n/lt_LT.po index 5f4dd1a95..d853adac4 100644 --- a/base_location/i18n/lt_LT.po +++ b/base_location/i18n/lt_LT.po @@ -21,40 +21,42 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -69,155 +71,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Sukūrė" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Sukurta" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Paskutinį kartą atnaujino" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Paskutinį kartą atnaujinta" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/lv.po b/base_location/i18n/lv.po index 97ddb9ca3..acdd520b7 100644 --- a/base_location/i18n/lv.po +++ b/base_location/i18n/lv.po @@ -20,40 +20,42 @@ msgstr "" "2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Izveidoja" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Izveidots" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupēt pēc" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Pēdējo reizi atjaunoja" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Pēdējās izmaiņas" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupēt pēc" diff --git a/base_location/i18n/mk.po b/base_location/i18n/mk.po index 184b9ca0f..a5881c063 100644 --- a/base_location/i18n/mk.po +++ b/base_location/i18n/mk.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Креирано од" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Креирано на" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Прикажи име" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Групирај по" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Последно ажурирање на" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Групирај по" diff --git a/base_location/i18n/mn.po b/base_location/i18n/mn.po index e96d72a73..4174bcd57 100644 --- a/base_location/i18n/mn.po +++ b/base_location/i18n/mn.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Үүсгэгч" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Үүсгэсэн" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Дэлгэцийн Нэр" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Бүлэглэх" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Сүүлийн засвар хийсэн огноо" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Бүлэглэх" diff --git a/base_location/i18n/nb.po b/base_location/i18n/nb.po index 795ca2de9..0679c855d 100644 --- a/base_location/i18n/nb.po +++ b/base_location/i18n/nb.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Opprettet av" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Opprettet den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Visnings navn" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupper etter" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Sist oppdatert " #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Sist oppdatert av" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Sist oppdatert" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupper etter" diff --git a/base_location/i18n/nb_NO.po b/base_location/i18n/nb_NO.po index e591a9dbc..30350279f 100644 --- a/base_location/i18n/nb_NO.po +++ b/base_location/i18n/nb_NO.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Laget av" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Laget den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Vis navn" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Gruppe laget av" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Sist endret den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Sist oppdatert av" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Sist oppdatert den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Gruppe laget av" diff --git a/base_location/i18n/nl.po b/base_location/i18n/nl.po index ec4497654..0d4ec5ec2 100644 --- a/base_location/i18n/nl.po +++ b/base_location/i18n/nl.po @@ -19,40 +19,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "Plaats" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Plaats" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +70,140 @@ msgid "Contact" msgstr "Contact" #. 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Aangemaakt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Te tonen naam" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Groepeer op" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Laatst bijgewerkt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Laatst bijgewerkt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Groepeer op" diff --git a/base_location/i18n/nl_BE.po b/base_location/i18n/nl_BE.po index 4528509ba..50f57afc2 100644 --- a/base_location/i18n/nl_BE.po +++ b/base_location/i18n/nl_BE.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Gemaakt door" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Gemaakt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Schermnaam" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Groeperen op" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Laatst Aangepast op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Laatst bijgewerkt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Groeperen op" diff --git a/base_location/i18n/nl_NL.po b/base_location/i18n/nl_NL.po index adf345e29..19616523d 100644 --- a/base_location/i18n/nl_NL.po +++ b/base_location/i18n/nl_NL.po @@ -21,40 +21,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Plaatsen" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "Plaats" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" -msgstr "Plaatscode" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Plaats" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -69,155 +72,156 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Aangemaakt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Weergavenaam" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" -msgstr "Plaatsen afdwingen" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." +msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Groepeer op" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "Plaatsen afdwingen" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Laatst gewijzigd op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Laatst bijgewerkt op" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "Breedtegraad" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "Locaties" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "Locatiebeheer" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "Lengtegraad" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Zoek plaats" #. 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 "Staat/Provincie" - -#. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the partner %s differs from that in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" -msgstr "" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Gebruik de plaatsnaam of de postcode om de locatie te bepalen" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" +msgstr "Postcode" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "Gebruik de plaatsnaam of de postcode om de locatie te bepalen" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" -msgstr "Postcode" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "City Code" +#~ msgstr "Plaatscode" + +#~ msgid "Group By" +#~ msgstr "Groepeer op" + +#~ msgid "Latitude" +#~ msgstr "Breedtegraad" + +#~ msgid "Locations Management" +#~ msgstr "Locatiebeheer" + +#~ msgid "Longitude" +#~ msgstr "Lengtegraad" + +#~ msgid "State" +#~ msgstr "Staat/Provincie" diff --git a/base_location/i18n/pl.po b/base_location/i18n/pl.po index 1627eeacf..60756ef5a 100644 --- a/base_location/i18n/pl.po +++ b/base_location/i18n/pl.po @@ -21,40 +21,42 @@ msgstr "" "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -69,155 +71,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Utworzone przez" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Utworzono" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Wyświetlana nazwa " #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Pogrupuj wg" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Ostatnio modyfikowano" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Ostatnio modyfikowane przez" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ostatnia zmiana" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Pogrupuj wg" diff --git a/base_location/i18n/pt.po b/base_location/i18n/pt.po index 638bf3a45..15b185794 100644 --- a/base_location/i18n/pt.po +++ b/base_location/i18n/pt.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Criado em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nome a Apresentar" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Modificado a última vez por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Atualizado pela última vez por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Atualizado pela última vez em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" diff --git a/base_location/i18n/pt_BR.po b/base_location/i18n/pt_BR.po index 0b7e6bf89..dedc2dfa7 100644 --- a/base_location/i18n/pt_BR.po +++ b/base_location/i18n/pt_BR.po @@ -20,40 +20,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Cidades" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id 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" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Autocompletar de cidades" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Objeto autocompletar de Cidades/Locais" @@ -68,155 +71,159 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Criado em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nome a mostrar" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Última atualização em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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_better_zip_latitude -msgid "Latitude" -msgstr "Latitude" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "Longitude" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" 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 -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. 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" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Use o nome da cidade ou o CEP para pesquisar a localização" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "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.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "CEP" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Código da cidade" + +#~ msgid "Country state" +#~ msgstr "Estado" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" + +#~ msgid "Latitude" +#~ msgstr "Latitude" + +#~ msgid "Longitude" +#~ msgstr "Longitude" + +#~ msgid "State" +#~ msgstr "Estado" + +#~ msgid "The official code for the city" +#~ msgstr "O código oficial da cidade" diff --git a/base_location/i18n/pt_PT.po b/base_location/i18n/pt_PT.po index 0434cf4c9..6457fd9d8 100644 --- a/base_location/i18n/pt_PT.po +++ b/base_location/i18n/pt_PT.po @@ -20,40 +20,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Cidades" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id 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" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +71,150 @@ msgid "Contact" 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 +#: model_terms: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 "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Criado em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nome" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Agrupar por" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Modificado em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Atualizado pela última vez por" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Atualizado pela última vez em" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" msgstr "Procurar 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 -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" -msgstr "Código oficial da cidade" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Utilize o nome da cidade ou o código postal para pesquisar o local" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "Utilize o nome da cidade ou o código postal para pesquisar o local" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "Código Postal" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Código da Cidade" + +#~ msgid "Group By" +#~ msgstr "Agrupar por" + +#~ msgid "State" +#~ msgstr "Estado" + +#~ msgid "The official code for the city" +#~ msgstr "Código oficial da cidade" diff --git a/base_location/i18n/ro.po b/base_location/i18n/ro.po index c6354cb0b..151f63f76 100644 --- a/base_location/i18n/ro.po +++ b/base_location/i18n/ro.po @@ -20,40 +20,42 @@ msgstr "" "2:1));\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Creat de" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Creat la" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Nume Afişat" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupează după" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Ultima actualizare în" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Ultima actualizare făcută de" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Ultima actualizare la" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupează după" diff --git a/base_location/i18n/ru.po b/base_location/i18n/ru.po index 6778bf5cb..a0ea4778d 100644 --- a/base_location/i18n/ru.po +++ b/base_location/i18n/ru.po @@ -21,40 +21,42 @@ msgstr "" "%100>=11 && n%100<=14)? 2 : 3);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -69,155 +71,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Создано" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Создан" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Последний раз обновлено" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/sk.po b/base_location/i18n/sk.po index f9627b0e8..6b3f6a717 100644 --- a/base_location/i18n/sk.po +++ b/base_location/i18n/sk.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Vytvoril" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Vytvorené" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Zobraziť meno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Zoskupiť podľa" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Posledná modifikácia" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Naposledy upravoval" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Naposledy upravované" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Zoskupiť podľa" diff --git a/base_location/i18n/sl.po b/base_location/i18n/sl.po index 75f906f3a..21fd68943 100644 --- a/base_location/i18n/sl.po +++ b/base_location/i18n/sl.po @@ -20,40 +20,43 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "Kraji" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id 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" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +#, fuzzy +msgid "City ID" +msgstr "Kraj" #. 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "Izpolnjevanje kraja" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "Objekt izpolnjevanja kraja/lokacije" @@ -68,155 +71,153 @@ msgid "Contact" msgstr "Stik" #. 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Ustvarjeno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Prikazni naziv" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Združi po" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Zadnjič posodobljeno" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Search city" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +#, fuzzy +msgid "Search zip" 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 -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:67 #, python-format msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 -#, python-format -msgid "The country of the city differs from the country in location %s" -msgstr "" - -#. module: base_location -#: code:addons/base_location/models/partner.py:61 +#: code:addons/base_location/models/res_partner.py:63 #, python-format msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the state differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. 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" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" +msgstr "Iskanje lokacije z uporabo imena kraja ali poštne številke" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" -msgstr "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.model.fields,field_description:base_location.field_res_city_zip__name msgid "ZIP" msgstr "Poštna številka" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id msgid "ZIP Location" msgstr "" + +#. module: base_location +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" +msgstr "" + +#. module: base_location +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" +msgstr "" + +#~ msgid "City Code" +#~ msgstr "Koda kraja" + +#~ msgid "Country state" +#~ msgstr "Zvezna država" + +#~ msgid "Group By" +#~ msgstr "Združi po" + +#~ msgid "State" +#~ msgstr "Zvezna država" + +#~ msgid "The official code for the city" +#~ msgstr "Uradna koda kraja" diff --git a/base_location/i18n/sr.po b/base_location/i18n/sr.po index 4c1a1e13a..351e584c6 100644 --- a/base_location/i18n/sr.po +++ b/base_location/i18n/sr.po @@ -20,40 +20,42 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Kreiran" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupiši po" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupiši po" diff --git a/base_location/i18n/sr@latin.po b/base_location/i18n/sr@latin.po index 110f4e975..3ad2c5939 100644 --- a/base_location/i18n/sr@latin.po +++ b/base_location/i18n/sr@latin.po @@ -21,40 +21,42 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -69,155 +71,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Kreiran" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Ime za prikaz" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupisano po" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Zadnja izmjena" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Zadnja izmjena" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Zadnja izmjena" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupisano po" diff --git a/base_location/i18n/sv.po b/base_location/i18n/sv.po index 719d37b87..ef64aba05 100644 --- a/base_location/i18n/sv.po +++ b/base_location/i18n/sv.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Skapad av" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Skapad den" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Visa namn" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Gruppera efter" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Senast redigerad" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Senast uppdaterad av" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Senast uppdaterad" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Gruppera efter" diff --git a/base_location/i18n/th.po b/base_location/i18n/th.po index 51e41b38e..69c67d282 100644 --- a/base_location/i18n/th.po +++ b/base_location/i18n/th.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "สร้างโดย" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "สร้างเมื่อ" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "ชื่อที่ใช้แสดง" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "จัดกลุ่มโดย" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "รหัส" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "อัพเดทครั้งสุดท้ายเมื่อ" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "จัดกลุ่มโดย" diff --git a/base_location/i18n/tr.po b/base_location/i18n/tr.po index a11438518..472f08fe4 100644 --- a/base_location/i18n/tr.po +++ b/base_location/i18n/tr.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Oluşturan" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Oluşturuldu" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Görünen İsim" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Grupla" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Son değişiklik" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Son güncelleyen" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Son güncelleme" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Grupla" diff --git a/base_location/i18n/tr_TR.po b/base_location/i18n/tr_TR.po index f30697c0a..fcb095a32 100644 --- a/base_location/i18n/tr_TR.po +++ b/base_location/i18n/tr_TR.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Oluşturan" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Oluşturulma tarihi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Görünen ad" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "Kimlik" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "En son güncelleme tarihi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "En son güncelleyen " #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "En son güncelleme tarihi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/uk.po b/base_location/i18n/uk.po index b852b5d52..e20665e7f 100644 --- a/base_location/i18n/uk.po +++ b/base_location/i18n/uk.po @@ -20,40 +20,42 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Створив" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Дата створення" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Назва для відображення" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Групувати за" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Останнє оновлення" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Групувати за" diff --git a/base_location/i18n/vi.po b/base_location/i18n/vi.po index 557a4ea7f..6d5eacd07 100644 --- a/base_location/i18n/vi.po +++ b/base_location/i18n/vi.po @@ -19,40 +19,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -67,155 +69,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Được tạo bởi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Được tạo vào" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "Tên hiển thị" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_zip____last_update msgid "Last Modified on" msgstr "Sửa lần cuối vào" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_uid +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Last Updated by" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Cập nhật lần cuối vào" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "Group By" diff --git a/base_location/i18n/vi_VN.po b/base_location/i18n/vi_VN.po index 8c12755ba..519c5f060 100644 --- a/base_location/i18n/vi_VN.po +++ b/base_location/i18n/vi_VN.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,137 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "Tạo bởi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "Tạo vào" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_uid msgid "Last Updated by" msgstr "Cập nhật lần cuối bởi" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_write_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "Cập nhật lần cuối vào" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" diff --git a/base_location/i18n/zh_CN.po b/base_location/i18n/zh_CN.po index ed4b50240..1bb4b0bb5 100644 --- a/base_location/i18n/zh_CN.po +++ b/base_location/i18n/zh_CN.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "创建者" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "创建时间" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "显示名称" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "分组" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "ID" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "上次更新日期" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "分组" diff --git a/base_location/i18n/zh_TW.po b/base_location/i18n/zh_TW.po index 9f688316d..d0deb62ed 100644 --- a/base_location/i18n/zh_TW.po +++ b/base_location/i18n/zh_TW.po @@ -20,40 +20,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,help:base_location.field_res_company_country_enforce_cities +#: model:res.city,name:base_location.demo_brussels_city +msgid "Brussels" +msgstr "" + +#. module: base_location +#: model:ir.model.fields,help:base_location.field_res_company__country_enforce_cities msgid "" "Check this box to ensure every address created in that country has a 'City' " "chosen in the list of the country's cities." msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_country_state_better_zip_ids -#: model:ir.ui.view,arch_db:base_location.better_zip_tree +#: model:ir.actions.act_window,name:base_location.action_res_city_full +#: model:ir.ui.menu,name:base_location.locations_menu_cities msgid "Cities" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_city_id -#: model:ir.model.fields,field_description:base_location.field_res_company_city_id -#: model:ir.ui.view,arch_db:base_location.better_zip_form +#: model:ir.model,name:base_location.model_res_city +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__city_id msgid "City" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_code -msgid "City Code" +#: model:ir.model.fields,field_description:base_location.field_res_company__city_id +msgid "City ID" 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 +#: model_terms:ir.ui.view,arch_db:base_location.view_company_form_city +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "City completion" msgstr "" #. module: base_location -#: model:ir.model,name:base_location.model_res_better_zip +#: model:ir.model,name:base_location.model_res_city_zip msgid "City/locations completion object" msgstr "" @@ -68,155 +70,140 @@ msgid "Contact" 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 +#: model_terms: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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_uid msgid "Created by" msgstr "建立者" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_create_date +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__create_date msgid "Created on" msgstr "建立於" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_display_name +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__display_name msgid "Display Name" msgstr "顯示名稱" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_enforce_cities -#: model:ir.model.fields,field_description:base_location.field_res_company_country_enforce_cities -msgid "Enforce Cities" +#: model_terms:ir.actions.act_window,help:base_location.action_res_city_full +msgid "" +"Display and manage the list of all cities that can be assigned to\n" +" your partner records. Note that an option can be set on each " +"country separately\n" +" to enforce any address of it to have a city in this list." msgstr "" #. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_better_zip_filter -msgid "Group By" -msgstr "分組方式" +#: model:ir.model.fields,field_description:base_location.field_res_company__country_enforce_cities +msgid "Enforce Cities" +msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_id +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__id msgid "ID" msgstr "編號" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip___last_update +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_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 +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__write_date msgid "Last Updated on" msgstr "最後更新於" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_latitude -msgid "Latitude" -msgstr "" - -#. module: base_location -#: model:ir.ui.view,arch_db:base_location.view_partner_form +#: model_terms:ir.ui.view,arch_db:base_location.view_partner_form msgid "Location completion" msgstr "" #. module: base_location #: model:ir.actions.act_window,name:base_location.action_zip_tree -#: model:ir.ui.menu,name:base_location.locations_menu -#: model:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form msgid "Locations" msgstr "" #. module: base_location -#: model:ir.ui.menu,name:base_location.locations_root_menu -msgid "Locations Management" -msgstr "" - -#. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_longitude -msgid "Longitude" +#: model_terms:ir.ui.view,arch_db:base_location.view_city_zip_filter +msgid "Search zip" 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" +#: code:addons/base_location/models/res_partner.py:67 +#, python-format +msgid "The city of partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:65 +#: code:addons/base_location/models/res_partner.py:63 #, python-format -msgid "The city of partner %s differs from that in location %s" +msgid "The country of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:101 +#: code:addons/base_location/models/res_partner.py:59 #, python-format -msgid "The country of the city differs from the country in location %s" +msgid "The state of the partner %s differs from that in location %s" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:61 -#, python-format -msgid "The country of the partner %s differs from that in location %s" +#: model:ir.model.fields,help:base_location.field_res_company__zip_id +msgid "Use the city name or the zip code to search the location" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:96 -#, python-format -msgid "The country of the state differs from the country in location %s" +#: sql_constraint:res.city:0 +msgid "" +"You already have a city with that name in the same state.The city must have " +"a unique name within it's state and it's country" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_better_zip_code -msgid "The official code for the city" +#: sql_constraint:res.city.zip:0 +msgid "" +"You already have a zip with that code in the same city. The zip code must be " +"unique within it's city" msgstr "" #. module: base_location -#: code:addons/base_location/models/better_zip.py:106 -#, python-format -msgid "The state of the city differs from the state in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_city_zip__name +msgid "ZIP" msgstr "" #. module: base_location -#: code:addons/base_location/models/partner.py:57 -#, python-format -msgid "The state of the partner %s differs from that in location %s" +#: model:ir.model.fields,field_description:base_location.field_res_company__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_partner__zip_id +#: model:ir.model.fields,field_description:base_location.field_res_users__zip_id +msgid "ZIP Location" msgstr "" #. module: base_location -#: model:ir.model.fields,help:base_location.field_res_company_zip_id -msgid "Use the city name or the zip code to search the location" +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_form +msgid "Zip" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_better_zip_name -msgid "ZIP" +#: model:ir.ui.menu,name:base_location.locations_menu_zips +#: model_terms:ir.ui.view,arch_db:base_location.city_zip_tree +#: model_terms:ir.ui.view,arch_db:base_location.view_city_form +#: model_terms:ir.ui.view,arch_db:base_location.view_res_country_city_better_zip_form +msgid "Zips" msgstr "" #. module: base_location -#: model:ir.model.fields,field_description:base_location.field_res_company_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_partner_zip_id -#: model:ir.model.fields,field_description:base_location.field_res_users_zip_id -msgid "ZIP Location" +#: model:ir.model.fields,field_description:base_location.field_res_city__zip_ids +msgid "Zips in this city" msgstr "" + +#~ msgid "Group By" +#~ msgstr "分組方式" diff --git a/base_location/models/__init__.py b/base_location/models/__init__.py index 3f7a893a5..1fb23520f 100644 --- a/base_location/models/__init__.py +++ b/base_location/models/__init__.py @@ -1,7 +1,6 @@ -# 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 -from . import state -from . import company +from . import res_city_zip +from . import res_partner +from . import res_company +from . import res_city diff --git a/base_location/models/better_zip.py b/base_location/models/better_zip.py deleted file mode 100644 index 991ffa6c8..000000000 --- a/base_location/models/better_zip.py +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 2016 Nicolas Bessi, Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import api, fields, models, _ -from odoo.exceptions import ValidationError - - -class BetterZip(models.Model): - '''City/locations completion object''' - - _name = "res.better.zip" - _description = __doc__ - _order = "name asc" - - name = fields.Char('ZIP') - code = fields.Char( - 'City Code', - size=64, - help="The official code for the city" - ) - city = fields.Char('City', required=True) - city_id = fields.Many2one( - 'res.city', - 'City', - ) - state_id = fields.Many2one( - 'res.country.state', - 'State', - ) - country_id = fields.Many2one('res.country', 'Country') - enforce_cities = fields.Boolean( - related='country_id.enforce_cities', - readonly=True, - ) - latitude = fields.Float() - longitude = fields.Float() - - @api.multi - @api.depends('name', 'city', 'state_id', 'country_id') - def name_get(self): - result = [] - for rec in self: - name = [] - if rec.name: - name.append('%(name)s' % {'name': rec.name}) - name.append('%(name)s' % {'name': rec.city}) - if rec.state_id: - name.append('%(name)s' % {'name': rec.state_id.name}) - if rec.country_id: - name.append('%(name)s' % {'name': rec.country_id.name}) - result.append((rec.id, ", ".join(name))) - return result - - @api.model - def name_search(self, name='', args=None, operator='ilike', limit=100): - args = list(args or []) - args += ['|', ('city', operator, name), - '|', ('name', operator, name), ('code', operator, name)] - recs = self.search(args, limit=limit) - return recs.name_get() - - @api.onchange('country_id') - def _onchange_country_id(self): - if self.state_id.country_id != self.country_id: - self.state_id = False - if self.city_id.country_id != self.country_id: - self.city_id = False - if self.country_id: - domain = [('country_id', '=', self.country_id.id)] - else: - domain = [] - return { - 'domain': { - 'state_id': domain, - 'city_id': domain, - } - } - - @api.onchange('city_id') - def _onchange_city_id(self): - if self.city_id: - self.city = self.city_id.name - self.country_id = self.city_id.country_id - self.state_id = self.city_id.state_id - - @api.onchange('state_id') - def _onchange_state_id(self): - if self.state_id: - self.country_id = self.state_id.country_id - - @api.constrains('state_id', 'country_id', 'city_id') - def constrains_country(self): - for rec in self: - if rec.state_id and rec.state_id.country_id != \ - rec.country_id: - raise ValidationError(_( - "The country of the state differs from the country in " - "location %s") % rec.name) - if rec.city_id and rec.city_id.country_id \ - != rec.country_id: - raise ValidationError(_( - "The country of the city differs from the country in " - "location %s") % rec.name) - if rec.city_id and rec.city_id.state_id \ - != rec.state_id: - raise ValidationError(_( - "The state of the city differs from the state in " - "location %s") % rec.name) diff --git a/base_location/models/res_city.py b/base_location/models/res_city.py new file mode 100644 index 000000000..629268b5d --- /dev/null +++ b/base_location/models/res_city.py @@ -0,0 +1,19 @@ +# Copyright 2018 Aitor Bouzas +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class City(models.Model): + _inherit = 'res.city' + + zip_ids = fields.One2many('res.city.zip', 'city_id', + string="Zips in this city") + + _sql_constraints = [ + ('name_state_country_uniq', + 'UNIQUE(name, state_id, country_id)', + 'You already have a city with that name in the same state.' + 'The city must have a unique name within ' + 'it\'s state and it\'s country'), + ] diff --git a/base_location/models/res_city_zip.py b/base_location/models/res_city_zip.py new file mode 100644 index 000000000..12c679a96 --- /dev/null +++ b/base_location/models/res_city_zip.py @@ -0,0 +1,40 @@ +# Copyright 2016 Nicolas Bessi, Camptocamp SA +# Copyright 2018 Aitor Bouzas +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class ResCityZip(models.Model): + """City/locations completion object""" + + _name = "res.city.zip" + _description = __doc__ + _order = "name asc" + _rec_name = "display_name" + + name = fields.Char('ZIP', required=True) + city_id = fields.Many2one( + 'res.city', + 'City', + required=True, + ) + display_name = fields.Char(compute='_compute_new_display_name', + store=True, index=True) + + _sql_constraints = [ + ('name_city_uniq', 'UNIQUE(name, city_id)', + 'You already have a zip with that code in the same city. ' + 'The zip code must be unique within it\'s city'), + ] + + @api.multi + @api.depends('name', 'city_id') + def _compute_new_display_name(self): + for rec in self: + name = [rec.name, rec.city_id.name] + if rec.city_id.state_id: + name.append(rec.city_id.state_id.name) + if rec.city_id.country_id: + name.append(rec.city_id.country_id.name) + rec.display_name = ", ".join(name) diff --git a/base_location/models/company.py b/base_location/models/res_company.py similarity index 62% rename from base_location/models/company.py rename to base_location/models/res_company.py index 1016a1d23..f78642aa9 100644 --- a/base_location/models/company.py +++ b/base_location/models/res_company.py @@ -8,38 +8,39 @@ from odoo import models, fields, api class ResCompany(models.Model): _inherit = 'res.company' + # In order to keep the same logic used in Odoo, fields must be computed + # and inversed, not related. This way we can ensure that it works + # correctly on changes and that inconsistencies cannot happen. + # When you make the fields related, the constrains added in res.partner + # will fail, because when you change the city_id in the company, you are + # effectively changing it in the partner. The constrains on the partner + # are evaluated before the inverse methods update the other fields (city, + # etc..) so we need them to ensure consistency. + # As a conclusion, address fields are very related to each other. + # Either you make them all related to the partner in company, or you + # don't for all of them. Mixing both approaches produces inconsistencies. + city_id = fields.Many2one( 'res.city', compute='_compute_address', inverse='_inverse_city_id', - string="City" + string="City ID" ) zip_id = fields.Many2one( - 'res.better.zip', + 'res.city.zip', string='ZIP Location', compute='_compute_address', inverse='_inverse_zip_id', oldname="better_zip_id", help='Use the city name or the zip code to search the location', ) - # In order to keep the same logic used in odoo, fields must be computed - # and inversed, not related. This way, we can ensure that it works - # correctly on changes and inconsistencies cannot happen. - # When you make the fields related, the constrains added in res.partner - # will fail. because when you change the city_id in the company, you are - # effectively changing it in the partner. The constrains on the partner - # are evaluated before the inverse methods update the other fields (city, - # etc..). And we need constrains in the partner to ensure consistency. - # So, as a conclusion, address fields are very related to each other. - # Either you make them all related to the partner in company, or you - # don't for all of them. But mixing methods produces inconsistencies. country_enforce_cities = fields.Boolean( related='country_id.enforce_cities' ) def _get_company_address_fields(self, partner): - res = super(ResCompany, self)._get_company_address_fields(partner) + res = super()._get_company_address_fields(partner) res['city_id'] = partner.city_id res['zip_id'] = partner.zip_id return res @@ -55,16 +56,15 @@ class ResCompany(models.Model): @api.onchange('zip_id') def _onchange_zip_id(self): if self.zip_id: - self.zip = self.zip_id.name - self.city_id = self.zip_id.city_id - self.city = self.zip_id.city - self.country_id = self.zip_id.country_id - if self.country_id.enforce_cities: - self.state_id = self.city_id.state_id - else: - self.state_id = self.zip_id.state_id + self.update({ + 'zip': self.zip_id.name, + 'city_id': self.zip_id.city_id, + 'city': self.zip_id.city_id.name, + 'country_id': self.zip_id.city_id.country_id, + 'state_id': self.zip_id.city_id.state_id, + }) @api.onchange('state_id') - def onchange_state_id(self): + def _onchange_state_id(self): if self.state_id.country_id: self.country_id = self.state_id.country_id.id diff --git a/base_location/models/partner.py b/base_location/models/res_partner.py similarity index 55% rename from base_location/models/partner.py rename to base_location/models/res_partner.py index befddd1ff..273dc3027 100644 --- a/base_location/models/partner.py +++ b/base_location/models/res_partner.py @@ -8,16 +8,19 @@ from odoo.exceptions import ValidationError class ResPartner(models.Model): _inherit = 'res.partner' - zip_id = fields.Many2one('res.better.zip', 'ZIP Location') + + zip_id = fields.Many2one('res.city.zip', 'ZIP Location') @api.onchange('city_id') def _onchange_city_id(self): if not self.zip_id: - super(ResPartner, self)._onchange_city_id() + super()._onchange_city_id() if self.zip_id and self.city_id != self.zip_id.city_id: - self.zip_id = False - self.zip = False - self.city = False + self.update({ + 'zip_id': False, + 'zip': False, + 'city': False, + }) if self.city_id: return { 'domain': { @@ -26,38 +29,37 @@ class ResPartner(models.Model): } return {'domain': {'zip_id': []}} - @api.onchange('state_id') - def _onchange_state_id(self): - if self.zip_id and self.state_id != self.zip_id.state_id: - self.zip_id = False - self.zip = False - self.city = False - @api.onchange('country_id') def _onchange_country_id(self): - res = super(ResPartner, self)._onchange_country_id() - if self.zip_id and self.zip_id.country_id != self.country_id: + res = super()._onchange_country_id() + if self.zip_id and self.zip_id.city_id.country_id != self.country_id: self.zip_id = False return res @api.onchange('zip_id') def _onchange_zip_id(self): if self.zip_id: - self.country_id = self.zip_id.country_id - if self.country_id.enforce_cities: - self.city_id = self.zip_id.city_id - self.zip = self.zip_id.name - self.state_id = self.zip_id.state_id - self.city = self.zip_id.city + vals = { + 'city_id': self.zip_id.city_id, + 'zip': self.zip_id.name, + 'city': self.zip_id.city_id.name, + } + if self.zip_id.city_id.country_id: + vals.update({'country_id': self.zip_id.city_id.country_id}) + if self.zip_id.city_id.state_id: + vals.update({'state_id': self.zip_id.city_id.state_id}) + self.update(vals) @api.constrains('zip_id', 'country_id', 'city_id', 'state_id') def _check_zip(self): - for rec in self.filtered('zip_id'): - if rec.zip_id.state_id != rec.state_id: + for rec in self: + if not rec.zip_id: + continue + if rec.zip_id.city_id.state_id != rec.state_id: raise ValidationError(_( "The state of the partner %s differs from that in " "location %s") % (rec.name, rec.zip_id.name)) - if rec.zip_id.country_id != rec.country_id: + if rec.zip_id.city_id.country_id != rec.country_id: raise ValidationError(_( "The country of the partner %s differs from that in " "location %s") % (rec.name, rec.zip_id.name)) @@ -67,6 +69,14 @@ class ResPartner(models.Model): "location %s") % (rec.name, rec.zip_id.name)) @api.onchange('state_id') - def onchange_state_id(self): + def _onchange_state_id(self): + vals = {} if self.state_id.country_id: - self.country_id = self.state_id.country_id.id + vals.update({'country_id': self.state_id.country_id}) + if self.zip_id and self.state_id != self.zip_id.city_id.state_id: + vals.update({ + 'zip_id': False, + 'zip': False, + 'city': False, + }) + self.update(vals) diff --git a/base_location/models/state.py b/base_location/models/state.py deleted file mode 100644 index 5161a34a6..000000000 --- a/base_location/models/state.py +++ /dev/null @@ -1,11 +0,0 @@ -# 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): - - _inherit = 'res.country.state' - - better_zip_ids = fields.One2many('res.better.zip', 'state_id', 'Cities') diff --git a/base_location/readme/CONFIGURE.rst b/base_location/readme/CONFIGURE.rst new file mode 100644 index 000000000..32d87344b --- /dev/null +++ b/base_location/readme/CONFIGURE.rst @@ -0,0 +1,10 @@ +#. Go to *Contacts / Configuration / Localization / Cities*. +#. Create a new City. + +#. Go to *Contacts / Configuration / Localization / Zips*. +#. Create a new Zip and relate it to the city (you can also create the Zip from the City). + +or, with module 'Contacts Directory' installed: +#. Go to *Contacts / Configuration / Localization / Countries*. +#. Locate the desired country. +#. Press on the button 'Cities' / 'Zips'. diff --git a/base_location/readme/CONTRIBUTORS.rst b/base_location/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..b90283688 --- /dev/null +++ b/base_location/readme/CONTRIBUTORS.rst @@ -0,0 +1,9 @@ +* Nicolas Bessi (Camptocamp) +* Ignacio Ibeas (Acysos S.L.) +* Pedro M. Baeza +* Alejandro Santana +* Sandy Carter +* Yannick Vaucher +* Francesco Apruzzese +* Dave Lasley +* Aitor Bouzas diff --git a/base_location/readme/CREDITS.rst b/base_location/readme/CREDITS.rst new file mode 100644 index 000000000..e84ac4aed --- /dev/null +++ b/base_location/readme/CREDITS.rst @@ -0,0 +1 @@ +* Icon park: `Icon http://icon-park.com/icon/location-map-pin-orange3/` diff --git a/base_location/readme/DESCRIPTION.rst b/base_location/readme/DESCRIPTION.rst new file mode 100644 index 000000000..c4afc713f --- /dev/null +++ b/base_location/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +This module introduces a zip model that allows you to manage locations in a better way. + +The zips will allow the users to complete automatically all address-related fields by just filling the zip. + +Also allows different search filters. diff --git a/base_location/readme/USAGE.rst b/base_location/readme/USAGE.rst new file mode 100644 index 000000000..bc8bfc983 --- /dev/null +++ b/base_location/readme/USAGE.rst @@ -0,0 +1,3 @@ +#. Access a partner record +#. Fill the field *Location completion* +#. Information about country, state, city and zip will be filled automatically diff --git a/base_location/security/ir.model.access.csv b/base_location/security/ir.model.access.csv index 5ef6c8b46..e0699ce7b 100644 --- a/base_location/security/ir.model.access.csv +++ b/base_location/security/ir.model.access.csv @@ -1,3 +1,2 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"ir_model_access_betterzip0","res_better_zip group_user_all","model_res_better_zip",base.group_user,1,0,0,0 -"ir_model_access_betterzip1","res_better_zip group_user","model_res_better_zip","base.group_partner_manager",1,1,1,1 +"ir_model_access_cityzip0","res_city_zip group_user","model_res_city_zip","base.group_partner_manager",1,1,1,1 diff --git a/base_location/static/description/index.html b/base_location/static/description/index.html new file mode 100644 index 000000000..2ed60fbde --- /dev/null +++ b/base_location/static/description/index.html @@ -0,0 +1,463 @@ + + + + + + +Location management (aka Better ZIP) + + + +
+

Location management (aka Better ZIP)

+ + +

Beta License: AGPL-3 OCA/partner-contact Translate me on Weblate Try me on Runbot

+

This module introduces a zip model that allows you to manage locations in a better way.

+

The zips will allow the users to complete automatically all address-related fields by just filling the zip.

+

Also allows different search filters.

+

Table of contents

+ +
+

Configuration

+
    +
  1. Go to Contacts / Configuration / Localization / Cities.
    2. +
  2. Create a new City.
    3. +
  3. Go to Contacts / Configuration / Localization / Zips.
    4. +
  4. Create a new Zip and relate it to the city (you can also create the Zip from the City).
    5. +
+

or, with module ‘Contacts Directory’ installed: +#. Go to Contacts / Configuration / Localization / Countries. +#. Locate the desired country. +#. Press on the button ‘Cities’ / ‘Zips’.

+
+
+

Usage

+
    +
  1. Access a partner record
    2. +
  2. Fill the field Location completion
    3. +
  3. Information about country, state, city and zip will be filled automatically
    4. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
  • ACYSOS S.L.
    • +
  • Alejandro Santana
    • +
  • Tecnativa
    • +
  • AdaptiveCity
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+
    +
  • Icon park: Icon http://icon-park.com/icon/location-map-pin-orange3/
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/partner-contact project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/base_location/tests/__init__.py b/base_location/tests/__init__.py index 372da9775..9816762b0 100644 --- a/base_location/tests/__init__.py +++ b/base_location/tests/__init__.py @@ -1,4 +1,3 @@ -# Copyright 2015 Yannick Vaucher, Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import test_base_location diff --git a/base_location/tests/test_base_location.py b/base_location/tests/test_base_location.py index b86817bcb..eef4aad61 100644 --- a/base_location/tests/test_base_location.py +++ b/base_location/tests/test_base_location.py @@ -1,94 +1,119 @@ # Copyright 2015 Yannick Vaucher, Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo.tests.common import TransactionCase from odoo.exceptions import ValidationError +from odoo.tests import tagged, common +from odoo.tools.misc import mute_logger +import psycopg2 + + +@tagged('post_install', '-at_install') +class TestBaseLocation(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super().setUpClass() + country_obj = cls.env['res.country.state'] + city_obj = cls.env['res.city'] + zip_obj = cls.env['res.city.zip'] + cls.partner_obj = cls.env['res.partner'] + cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True)) + cls.state_vd = country_obj.create({ + 'name': 'Vaud', + 'code': 'VD', + 'country_id': cls.env.ref('base.ch').id, + }) + cls.env.ref('base.es').write({ + 'enforce_cities': True + }) + cls.company = cls.env.ref('base.main_company') - -class TestBaseLocation(TransactionCase): - - def test_onchange_better_zip_state_id(self): - """ Test onchange on res.better.zip """ - usa_MA = self.env.ref('base.state_us_34') - better_zip1 = self.env['res.better.zip'].new(self.values_better_zip1()) - better_zip1.state_id = usa_MA - better_zip1._onchange_state_id() - self.assertEqual(better_zip1.country_id, usa_MA.country_id) - - def test_onchange_better_zip_city_id(self): - better_zip2 = self.env['res.better.zip'].new(self.values_better_zip2()) - better_zip2.city_id = self.city_madrid - better_zip2._onchange_city_id() - self.assertEqual(better_zip2.city, self.city_madrid.name) - - def test_onchange_better_zip_country_id(self): - better_zip1 = self.env['res.better.zip'].new(self.values_better_zip1()) - better_zip1.country_id = self.env.ref('base.es') - better_zip1._onchange_country_id() - self.assertFalse(better_zip1.state_id) - - def test_onchange_better_zip_none(self): - better_zip1 = self.env['res.better.zip'].new(self.values_better_zip1()) - better_zip1.country_id = False - better_zip1._onchange_country_id() - self.assertFalse(better_zip1.state_id) + cls.state_bcn = country_obj.create({ + 'name': 'Barcelona', + 'code': '08', + 'country_id': cls.env.ref('base.es').id, + }) + cls.state_madrid = country_obj.create({ + 'name': 'Madrid', + 'code': '28', + 'country_id': cls.env.ref('base.es').id, + }) + cls.city_bcn = city_obj.create({ + 'name': 'Barcelona', + 'state_id': cls.state_bcn.id, + 'country_id': cls.env.ref('base.es').id, + }) + cls.city_madrid = city_obj.create({ + 'name': 'Madrid', + 'state_id': cls.state_madrid.id, + 'country_id': cls.env.ref('base.es').id, + }) + cls.city_lausanne = city_obj.create({ + 'name': 'Lausanne', + 'state_id': cls.state_vd.id, + 'country_id': cls.env.ref('base.ch').id, + }) + cls.lausanne = zip_obj.create({ + 'name': '666', + 'city_id': cls.city_lausanne.id, + }) + cls.barcelona = zip_obj.create({ + 'name': '444', + 'city_id': cls.city_bcn.id, + }) def test_onchange_partner_city_completion(self): - partner1 = self.env['res.partner'].new({ + """Test that partner data is filled accodingly""" + partner1 = self.partner_obj.new({ 'name': 'Camptocamp', }) - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - better_zip2.country_id.enforce_cities = True - partner1.zip_id = better_zip2 + self.barcelona.city_id.country_id.enforce_cities = True + partner1.zip_id = self.barcelona partner1._onchange_zip_id() - self.assertEqual(partner1.zip, better_zip2.name) - self.assertEqual(partner1.city, better_zip2.city) - self.assertEqual(partner1.state_id, better_zip2.state_id) - self.assertEqual(partner1.country_id, better_zip2.country_id) + self.assertEqual(partner1.zip, self.barcelona.name) + self.assertEqual(partner1.city, self.barcelona.city_id.name) + self.assertEqual(partner1.state_id, self.barcelona.city_id.state_id) + self.assertEqual(partner1.country_id, + self.barcelona.city_id.country_id) def test_onchange_company_city_completion(self): + """Test that company data is filled accodingly""" company = self.env['res.company'].new({'name': 'Test'}) - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - company.zip_id = better_zip1 + company.zip_id = self.lausanne company._onchange_zip_id() - self.assertEqual(company.zip, better_zip1.name) - self.assertEqual(company.city, better_zip1.city) - self.assertEqual(company.state_id, better_zip1.state_id) - self.assertEqual(company.country_id, better_zip1.country_id) + self.assertEqual(company.zip, self.lausanne.name) + self.assertEqual(company.city, self.lausanne.city_id.name) + self.assertEqual(company.state_id, self.lausanne.city_id.state_id) + self.assertEqual(company.country_id, self.lausanne.city_id.country_id) def test_company_address_fields(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1() - ) + """Test if the partner address fields changes when + changing the ones from the company""" company = self.env['res.company'].create({ 'name': 'Test', }) self.assertTrue(company.partner_id) company.partner_id.write({ - 'zip_id': better_zip1.id, - 'state_id': better_zip1.state_id.id, - 'country_id': better_zip1.country_id.id, - 'city_id': better_zip1.city_id.id, - 'city': better_zip1.city, - 'zip': better_zip1.name, + 'zip_id': self.lausanne.id, + 'state_id': self.lausanne.city_id.state_id.id, + 'country_id': self.lausanne.city_id.country_id.id, + 'city_id': self.lausanne.city_id.id, + 'city': self.lausanne.city_id.name, + 'zip': self.lausanne.name, }) company._compute_address() self.assertEqual(company.zip_id, company.partner_id.zip_id) self.assertEqual(company.city_id, company.partner_id.city_id) def test_company_address_fields_inverse(self): - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2() - ) + """Test inverse fields from res.company""" company = self.env['res.company'].new({ 'name': 'Test', - 'partner_id': self.env['res.partner'].new({}).id + 'partner_id': self.partner_obj.new({}).id # Partner must be initiated in order to be filled }) company.update({ - 'zip_id': better_zip2.id, + 'zip_id': self.barcelona.id, }) company._inverse_city_id() company._inverse_zip_id() @@ -96,112 +121,76 @@ class TestBaseLocation(TransactionCase): self.assertEqual(company.city_id, company.partner_id.city_id) def test_onchange_company_city_id_completion(self): + """Test city auto-completion when changing zip in a company""" company = self.env['res.company'].new({'name': 'Test'}) - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - company.zip_id = better_zip2 + company.zip_id = self.barcelona company._onchange_zip_id() - self.assertEqual(company.city_id, better_zip2.city_id) - - def test_constrains_better_zip_01(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - - better_zip1.city_id = self.city_lausanne - with self.assertRaises(ValidationError): - better_zip2.city_id = better_zip1.city_id - - def test_constrains_better_zip_02(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - - with self.assertRaises(ValidationError): - better_zip2.country_id = better_zip1.country_id - - def test_constrains_better_zip_03(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - - with self.assertRaises(ValidationError): - better_zip2.state_id = better_zip1.state_id - - def test_constrains_better_zip_04(self): - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - - with self.assertRaises(ValidationError): - better_zip2.city_id = self.city_madrid + self.assertEqual(company.city_id, self.barcelona.city_id) def test_constrains_partner_01(self): - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) + """Test partner 1 constraints""" with self.assertRaises(ValidationError): - self.env['res.partner'].create({ + self.partner_obj.create({ 'name': 'P1', - 'zip_id': better_zip2.id, + 'zip_id': self.barcelona.id, }) - def test_constrains_partner_02(self): - better_zip2 = self.env['res.better.zip'].create( - self.values_better_zip2()) - partner = self.env['res.partner'].create({ + def test_constrains_partner_country(self): + """Test partner country constraints""" + partner = self.partner_obj.create({ 'name': 'P1', - 'zip_id': better_zip2.id, - 'country_id': better_zip2.country_id.id, - 'state_id': better_zip2.state_id.id, - 'city_id': better_zip2.city_id.id, + 'zip_id': self.barcelona.id, + 'country_id': self.barcelona.city_id.country_id.id, + 'state_id': self.barcelona.city_id.state_id.id, + 'city_id': self.barcelona.city_id.id, }) with self.assertRaises(ValidationError): partner.country_id = self.ref('base.ch') - with self.assertRaises(ValidationError): - partner.state_id = self.state_vd.id, + def test_constrains_partner_state(self): + """Test partner state constraints""" + partner = self.partner_obj.create({ + 'name': 'P1', + 'zip_id': self.barcelona.id, + 'country_id': self.barcelona.city_id.country_id.id, + 'state_id': self.barcelona.city_id.state_id.id, + 'city_id': self.barcelona.city_id.id, + }) with self.assertRaises(ValidationError): - partner.city_id = self.city_lausanne + partner.state_id = self.state_vd.id - def values_better_zip1(self): - return { - 'name': 1000, - 'city': 'Lausanne', - 'state_id': self.state_vd.id, - 'country_id': self.ref('base.ch'), - } + def test_constrains_partner_city(self): + """Test partner city constraints""" + partner = self.partner_obj.create({ + 'name': 'P1', + 'zip_id': self.barcelona.id, + 'country_id': self.barcelona.city_id.country_id.id, + 'state_id': self.barcelona.city_id.state_id.id, + 'city_id': self.barcelona.city_id.id, + }) - def values_better_zip2(self): - return { - 'city_id': self.city_bcn.id, - 'city': self.city_bcn.name, - 'state_id': self.state_bcn.id, - 'country_id': self.ref('base.es'), - } + with self.assertRaises(ValidationError): + partner.city_id = self.city_lausanne def test_partner_onchange_country(self): - country_es = self.browse_ref('base.es') + """Test partner onchange country_id""" + country_es = self.env.ref('base.es') country_es.enforce_cities = True - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - partner = self.env['res.partner'].new({ + partner = self.partner_obj.new({ 'name': 'TEST', - 'zip_id': better_zip1.id + 'zip_id': self.lausanne.id }) partner.country_id = country_es partner._onchange_country_id() self.assertFalse(partner.zip_id) def test_partner_onchange_city(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - partner = self.env['res.partner'].new({ + """Test partner onchange city_id""" + partner = self.partner_obj.new({ 'name': 'TEST', - 'zip_id': better_zip1.id + 'zip_id': self.lausanne.id }) self.city_bcn.country_id.enforce_cities = False partner.city_id = self.city_bcn @@ -212,119 +201,78 @@ class TestBaseLocation(TransactionCase): self.assertFalse(res['domain']['zip_id']) def test_partner_onchange_state(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) - partner = self.env['res.partner'].new({ + """Test partner onchange state_id""" + partner = self.partner_obj.new({ 'name': 'TEST', - 'zip_id': better_zip1.id + 'zip_id': self.lausanne.id }) partner.state_id = self.state_bcn partner._onchange_state_id() self.assertFalse(partner.zip_id) + self.assertEqual(partner.country_id, partner.state_id.country_id) + + def test_company_onchange_state(self): + """Test company onchange state_id""" + self.company.state_id = self.state_bcn + self.company._onchange_state_id() + self.assertEqual(self.company.country_id, + self.company.state_id.country_id) def test_display_name(self): - better_zip1 = self.env['res.better.zip'].create( - self.values_better_zip1()) + """Test if the display_name is stored and computed properly""" self.assertEqual( - better_zip1.display_name, '1000, Lausanne, Vaud, '+self.browse_ref( + self.lausanne.display_name, + '666, Lausanne, Vaud, ' + self.browse_ref( 'base.ch' ).name ) - def test_name_search___can_find_using_city_name_or_zip_or_code(self): - barcelona_data = { - 'city_id': self.city_bcn.id, - 'city': self.city_bcn.name, - 'name': '444', - 'code': 'BA', - 'state_id': self.state_bcn.id, - 'country_id': self.ref('base.es'), - } + def test_name_search(self): + """Test that zips can be searched through both the name of the + city or the zip code""" madrid_data = { 'city_id': self.city_madrid.id, - 'city': self.city_madrid.name, 'name': '555', - 'code': 'MD', - 'state_id': self.state_madrid.id, - 'country_id': self.ref('base.es'), - } - lausanne_data = { - 'city_id': self.city_lausanne.id, - 'city': self.city_lausanne.name, - 'name': '666', - 'code': 'LA', - 'state_id': self.state_vd.id, - 'country_id': self.ref('base.ch'), } - barcelona = self.env['res.better.zip'].create(barcelona_data) - madrid = self.env['res.better.zip'].create(madrid_data) - lausanne = self.env['res.better.zip'].create(lausanne_data) + madrid = self.env['res.city.zip'].create(madrid_data) - found_recs = self.env['res.better.zip'].name_search(name='444') + found_recs = self.env['res.city.zip'].name_search(name='444') self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], barcelona.id) - found_recs = self.env['res.better.zip'].name_search(name='Barcelona') + self.assertEqual(found_recs[0][0], self.barcelona.id) + found_recs = self.env['res.city.zip'].name_search(name='Barcelona') self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], barcelona.id) - found_recs = self.env['res.better.zip'].name_search(name='BA') - self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], barcelona.id) + self.assertEqual(found_recs[0][0], self.barcelona.id) - found_recs = self.env['res.better.zip'].name_search(name='555') - self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], madrid.id) - found_recs = self.env['res.better.zip'].name_search(name='Madrid') + found_recs = self.env['res.city.zip'].name_search(name='555') self.assertEqual(len(found_recs), 1) self.assertEqual(found_recs[0][0], madrid.id) - found_recs = self.env['res.better.zip'].name_search(name='MD') + found_recs = self.env['res.city.zip'].name_search(name='Madrid') self.assertEqual(len(found_recs), 1) self.assertEqual(found_recs[0][0], madrid.id) - found_recs = self.env['res.better.zip'].name_search(name='666') + found_recs = self.env['res.city.zip'].name_search(name='666') self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], lausanne.id) - found_recs = self.env['res.better.zip'].name_search(name='Lausanne') + self.assertEqual(found_recs[0][0], self.lausanne.id) + found_recs = self.env['res.city.zip'].name_search(name='Lausanne') self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], lausanne.id) - found_recs = self.env['res.better.zip'].name_search(name='LA') - self.assertEqual(len(found_recs), 1) - self.assertEqual(found_recs[0][0], lausanne.id) - - def setUp(self): - super(TestBaseLocation, self).setUp() - self.state_vd = self.env['res.country.state'].create({ - 'name': 'Vaud', - 'code': 'VD', - 'country_id': self.ref('base.ch'), - }) - self.env['res.country'].browse(self.ref('base.es')).write({ - 'enforce_cities': True - }) - self.company = self.env.ref('base.main_company') + self.assertEqual(found_recs[0][0], self.lausanne.id) + + def test_zip_ql_constraints(self): + """Test UNIQUE name within it's area for zips""" + with self.assertRaises( + psycopg2.IntegrityError), mute_logger('odoo.sql_db'): + self.env['res.city.zip'].create({ + 'name': '666', + 'city_id': self.city_lausanne.id, + }) - self.state_bcn = self.env['res.country.state'].create({ - 'name': 'Barcelona', - 'code': '08', - 'country_id': self.ref('base.es'), - }) - self.state_madrid = self.env['res.country.state'].create({ - 'name': 'Madrid', - 'code': '28', - 'country_id': self.ref('base.es'), - }) - self.city_bcn = self.env['res.city'].create({ - 'name': 'Barcelona', - 'state_id': self.state_bcn.id, - 'country_id': self.ref('base.es'), - }) - self.city_madrid = self.env['res.city'].create({ - 'name': 'Madrid', - 'state_id': self.state_madrid.id, - 'country_id': self.ref('base.es'), - }) - self.city_lausanne = self.env['res.city'].create({ - 'name': 'Lausanne', - 'state_id': self.state_vd.id, - 'country_id': self.ref('base.ch'), - }) + def test_city_sql_contraint(self): + """Test UNIQUE name within it's area for cities""" + with self.assertRaises( + psycopg2.IntegrityError), mute_logger('odoo.sql_db'): + self.env['res.city'].create({ + 'name': 'Barcelona', + 'state_id': self.state_bcn.id, + 'country_id': self.ref('base.es'), + }) diff --git a/base_location/views/better_zip_view.xml b/base_location/views/better_zip_view.xml deleted file mode 100644 index 207c88e92..000000000 --- a/base_location/views/better_zip_view.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - res.better.zip.form - res.better.zip - -
- - - - - - - - - - - - - -
- - - - - res.better.zip.tree - res.better.zip - - - - - - - - - - - - - res.better.zip.select - res.better.zip - - - - - - - - - - - - - - - - - Locations - res.better.zip - form - tree,form - - - - - - - - - diff --git a/base_location/views/res_city_view.xml b/base_location/views/res_city_view.xml new file mode 100644 index 000000000..5ad6fb9aa --- /dev/null +++ b/base_location/views/res_city_view.xml @@ -0,0 +1,63 @@ + + + + + res.city + + + + + + + 1 + + + + + + + + + res.city + +
+ + + + + + + + + + +
+ + + + + Cities + ir.actions.act_window + res.city + form + tree,form + + + Display and manage the list of all cities that can be assigned to + your partner records. Note that an option can be set on each country separately + to enforce any address of it to have a city in this list. + + + + + + diff --git a/base_location/views/res_city_zip_view.xml b/base_location/views/res_city_zip_view.xml new file mode 100644 index 000000000..3eeb5f744 --- /dev/null +++ b/base_location/views/res_city_zip_view.xml @@ -0,0 +1,56 @@ + + + + + res.city.zip.form + res.city.zip + +
+ + + + +
+ + + + + res.city.zip.tree + res.city.zip + + + + + + + + + + res.city.zip.select + res.city.zip + + + + + + + + + + Locations + res.city.zip + form + tree,form + + + + + + + diff --git a/base_location/views/company_view.xml b/base_location/views/res_company_view.xml similarity index 100% rename from base_location/views/company_view.xml rename to base_location/views/res_company_view.xml diff --git a/base_location/views/res_country_view.xml b/base_location/views/res_country_view.xml index cbf0f3ff3..0292f52ab 100644 --- a/base_location/views/res_country_view.xml +++ b/base_location/views/res_country_view.xml @@ -22,7 +22,7 @@ icon="fa-globe" type="action" context="{'default_country_id': active_id, 'search_default_country_id': active_id}" - string="Locations"> + string="Zips"> diff --git a/base_location/views/partner_view.xml b/base_location/views/res_partner_view.xml similarity index 99% rename from base_location/views/partner_view.xml rename to base_location/views/res_partner_view.xml index 1e8a016e5..e10fbd474 100644 --- a/base_location/views/partner_view.xml +++ b/base_location/views/res_partner_view.xml @@ -23,4 +23,3 @@ - diff --git a/base_location/views/state_view.xml b/base_location/views/state_view.xml deleted file mode 100644 index cbd4f72aa..000000000 --- a/base_location/views/state_view.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - view_country_state_form2 - res.country.state - - - - - - - - - - - - - - - -