Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

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,136 @@ 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
+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 ""

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,139 @@ 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
+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 "تجميع حسب"

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,139 @@ 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
+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 "Групиране по"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,152 @@ 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
 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"

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,174 @@ 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
 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"

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,139 @@ 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
+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 "Ομαδοποίηση Ανά"

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,139 @@ 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
+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"

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,159 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,142 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,136 @@ 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
+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 ""

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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 "گروه‌بندی برمبنای"

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,139 @@ 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
+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"

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,158 @@ 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
 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"

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,136 @@ 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
+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 ""

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,136 @@ 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
+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 ""

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,139 @@ 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
+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"

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,136 @@ 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
+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 ""

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,139 @@ 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
+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 "קבץ לפי"

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,139 @@ 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
+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"

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,152 @@ 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
 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"

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,139 @@ 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
+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..."

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,139 @@ 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
+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 .."

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,152 @@ 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
 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à"

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,139 @@ 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
+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 "グループ化"

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,139 @@ 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
+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 "그룹화"

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,139 @@ 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
+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"

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,136 @@ 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
+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 ""

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,139 @@ 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
+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"

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,139 @@ 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
+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 "Групирај по"

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,139 @@ 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
+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 "Бүлэглэх"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,155 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,158 @@ 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
 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"

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,149 @@ 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
 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"

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,139 @@ 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
+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ă"

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,136 @@ 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
+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 ""

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,139 @@ 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
+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"

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,152 @@ 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
 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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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"

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,139 @@ 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
+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 "จัดกลุ่มโดย"

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,139 @@ 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
+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"

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,136 @@ 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
+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 ""

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,139 @@ 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
+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 "Групувати за"

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,139 @@ 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
+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"

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,136 @@ 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
+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 ""

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,139 @@ 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
+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 "分组"

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,139 @@ 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
+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 "分組方式"