summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Pablo Arias <jpa@devco.co>2016-01-25 10:05:26 -0500
committerMartin Trigaux <mat@odoo.com>2016-12-06 15:55:43 +0100
commit799f12c326e4f4a36e072ed0ccb8451e1b78fcda (patch)
treeba461a950a073ebf6214312bce75c2d287cec318
parent9dc9a058cd8cb0934863006dd5eaa1264b6f3ae1 (diff)
[ADD] base: Colombian data
- adds position before to COP currency in res_currency_data - adds address_format to Colombia in res_country_data - CLA signature for kurkop Closes #10618
-rw-r--r--doc/cla/individual/kurkop.md11
-rw-r--r--openerp/addons/base/res/res_country_data.xml1
-rw-r--r--openerp/addons/base/res/res_currency_data.xml1
3 files changed, 13 insertions, 0 deletions
diff --git a/doc/cla/individual/kurkop.md b/doc/cla/individual/kurkop.md
new file mode 100644
index 00000000000..ead18fbc4cb
--- /dev/null
+++ b/doc/cla/individual/kurkop.md
@@ -0,0 +1,11 @@
+Colombia, 2015-12-23
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Juan Pablo Arias jpa@devco.co https://github.com/kurkop
diff --git a/openerp/addons/base/res/res_country_data.xml b/openerp/addons/base/res/res_country_data.xml
index dd1351b855d..4e007c26175 100644
--- a/openerp/addons/base/res/res_country_data.xml
+++ b/openerp/addons/base/res/res_country_data.xml
@@ -354,6 +354,7 @@
<field file="base/static/img/country_flags/co.png" name="image" type="base64" />
<field name="currency_id" ref="COP" />
<field eval="57" name="phone_code" />
+ <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_name)s %(zip)s\n%(country_name)s'" />
</record>
<record id="cr" model="res.country">
<field name="name">Costa Rica</field>
diff --git a/openerp/addons/base/res/res_currency_data.xml b/openerp/addons/base/res/res_currency_data.xml
index 7868e4dc378..2885df1708f 100644
--- a/openerp/addons/base/res/res_currency_data.xml
+++ b/openerp/addons/base/res/res_currency_data.xml
@@ -50,6 +50,7 @@
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="active" eval="False"/>
+ <field name="position">before</field>
</record>
<record id="CZK" model="res.currency">