From 222ef11adbc048e9540e32b3276846f681258a3d Mon Sep 17 00:00:00 2001
From: Abdur-Rahmaan Janhangeer <cryptolabour@gmail.com>
Date: Wed, 1 May 2019 08:43:13 +0000
Subject: [ADD] base: add address format for Mauritius

Mauritius now uses zipcodes
Source: http://www.mauritiuspost.mu/products-and-services/post-code-finder

closes odoo/odoo#33074

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
 odoo/addons/base/data/res_country_data.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'odoo/addons/base/data')

diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index 872b14c0775..c5abb5d0e08 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -1105,6 +1105,7 @@
             <field name="code">mu</field>
             <field file="base/static/img/country_flags/mu.png" name="image" type="base64" />
             <field name="currency_id" ref="MUR" />
+            <field eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" name="address_format" />
             <field eval="230" name="phone_code" />
         </record>
         <record id="mv" model="res.country">
-- 
cgit v1.2.3


From a515ee60647d6815459125540cf582150838c722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Davor=20Bojki=C4=87?= <davor.bojkic@decod.io>
Date: Tue, 7 May 2019 07:43:21 +0000
Subject: [IMP] base{_address_extended}: update Croatia related data

- specify the correct separators on the language
- add the address format
- add street addres format for croatia

closes odoo/odoo#33205

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
 odoo/addons/base/data/res.lang.csv         | 2 +-
 odoo/addons/base/data/res_country_data.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'odoo/addons/base/data')

diff --git a/odoo/addons/base/data/res.lang.csv b/odoo/addons/base/data/res.lang.csv
index 3438c4d3f67..0d7060cdc41 100644
--- a/odoo/addons/base/data/res.lang.csv
+++ b/odoo/addons/base/data/res.lang.csv
@@ -11,7 +11,7 @@
 "base.lang_zh_CN","Chinese (Simplified) / 简体中文","zh_CN","zh_CN","Left-to-Right","[3,0]",".",",","%Y年%m月%d日","%H时%M分%S秒","True","7"
 "base.lang_zh_HK","Chinese (HK)","zh_HK","zh_HK","Left-to-Right","[3,0]",".",",","%Y年%m月%d日 %A","%I時%M分%S秒","True","7"
 "base.lang_zh_TW","Chinese (Traditional) / 正體字","zh_TW","zh_TW","Left-to-Right","[3,0]",".",",","%Y年%m月%d日","%H時%M分%S秒","True","7"
-"base.lang_hr","Croatian / hrvatski jezik","hr_HR","hr","Left-to-Right","[]",",",,"%d.%m.%Y","%H:%M:%S","True","1"
+"base.lang_hr","Croatian / hrvatski jezik","hr_HR","hr","Left-to-Right","[3,0]",",",".","%d.%m.%Y","%H:%M:%S","True","1"
 "base.lang_cs_CZ","Czech / Čeština","cs_CZ","cs_CZ","Left-to-Right","[3,0]",","," ","%d.%m.%Y","%H:%M:%S","True","1"
 "base.lang_da_DK","Danish / Dansk","da_DK","da_DK","Left-to-Right","[3,0]",",",".","%d-%m-%Y","%H:%M:%S","True","1"
 "base.lang_nl_BE","Dutch (BE) / Nederlands (BE)","nl_BE","nl_BE","Left-to-Right","[3,0]",",",".","%d-%m-%Y","%H:%M:%S","True","1"
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index c5abb5d0e08..518840115b7 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -701,6 +701,7 @@
             <field name="code">hr</field>
             <field file="base/static/img/country_flags/hr.png" name="image" type="base64" />
             <field name="currency_id" ref="HRK" />
+            <field eval="'%(street)s \n%(street2)s \n%(zip)s %(city)s \n%(country_name)s'" name="address_format" />
             <field eval="385" name="phone_code" />
             <field name="vat_label">VAT</field>
         </record>
-- 
cgit v1.2.3