summaryrefslogtreecommitdiff
path: root/odoo/addons/base/data
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-10-29 11:56:32 +0100
committerChristophe Simonis <chs@odoo.com>2018-10-29 11:56:32 +0100
commita299517f8327e9cd6036dbd0920ed5d3e9dac75a (patch)
treefbca208c214184e94bfa6868982c9078736ff71d /odoo/addons/base/data
parent62b6889fe14d6781b4ffddc8f5b0f8f6db16672c (diff)
parent6136f0c02e5c15d245c2b19d990900314be8b8f4 (diff)
[MERGE] forward port branch saas-11.3 up to 6136f0c02e5
Diffstat (limited to 'odoo/addons/base/data')
-rw-r--r--odoo/addons/base/data/res.lang.csv2
-rw-r--r--odoo/addons/base/data/res_currency_data.xml3
2 files changed, 3 insertions, 2 deletions
diff --git a/odoo/addons/base/data/res.lang.csv b/odoo/addons/base/data/res.lang.csv
index cf11d7bb4c9..207b153c5c6 100644
--- a/odoo/addons/base/data/res.lang.csv
+++ b/odoo/addons/base/data/res.lang.csv
@@ -61,7 +61,7 @@ base.lang_my,"Burmese / ဗမာစာ",my_MM,my,"Left-to-Right","[3,3]",".",",
"base.lang_es_CL","Spanish (CL) / Español (CL)","es_CL","es_CL","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","True","1"
"base.lang_es_CO","Spanish (CO) / Español (CO)","es_CO","es_CO","Left-to-Right","[3,0]",",",".","%d-%m-%Y","%H:%M:%S","True","7"
"base.lang_es_CR","Spanish (CR) / Español (CR)","es_CR","es_CR","Left-to-Right","[3,0]",","," ","%d/%m/%Y","%H:%M:%S","True","1"
-"base.lang_es_DO","Spanish (DO) / Español (DO)","es_DO","es_DO","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","True","7"
+"base.lang_es_DO","Spanish (DO) / Español (DO)","es_DO","es_DO","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%I:%M:%S %p","True","7"
"base.lang_es_EC","Spanish (EC) / Español (EC)","es_EC","es_EC","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","True","1"
"base.lang_es_GT","Spanish (GT) / Español (GT)","es_GT","es_GT","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","True","7"
"base.lang_es_MX","Spanish (MX) / Español (MX)","es_MX","es_MX","Left-to-Right","[3,0]",".",",","%d/%m/%Y","%H:%M:%S","True","7"
diff --git a/odoo/addons/base/data/res_currency_data.xml b/odoo/addons/base/data/res_currency_data.xml
index 9966ae87ae6..f4028c0b698 100644
--- a/odoo/addons/base/data/res_currency_data.xml
+++ b/odoo/addons/base/data/res_currency_data.xml
@@ -670,8 +670,9 @@
<field name="symbol">RD$</field>
<field name="rounding">0.01</field>
<field name="active" eval="False"/>
- <field name="currency_unit_label">Peso</field>
+ <field name="currency_unit_label">Pesos</field>
<field name="currency_subunit_label">Centavos</field>
+ <field name="position">before</field>
</record>
<record id="ECS" model="res.currency">