diff options
| author | jeffery chen fan <jeffery9@gmail.com> | 2015-12-28 00:05:04 +0800 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2016-01-05 14:35:56 +0100 |
| commit | da17c98833890bb86cbc532437198fa496cf26de (patch) | |
| tree | e35c50cd8e71d9b270a6d6a298d31263179275fd | |
| parent | edf565881c77840dce8b26f25c1a2648d2b13a9b (diff) | |
[FIX] base: China address format
Should be in one line
Closes #10217
| -rw-r--r-- | openerp/addons/base/res/res_country_data.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openerp/addons/base/res/res_country_data.xml b/openerp/addons/base/res/res_country_data.xml index 807c9f2b3f1..3611e1d1625 100644 --- a/openerp/addons/base/res/res_country_data.xml +++ b/openerp/addons/base/res/res_country_data.xml @@ -343,6 +343,7 @@ <field name="name">China</field> <field name="code">cn</field> <field file="base/static/img/country_flags/cn.png" name="image" type="base64" /> + <field eval="'%(country_name)s%(state_name)s%(city)s%(street)s%(street2)s %(zip)s'" name="address_format" /> <field name="currency_id" ref="CNY" /> <field eval="86" name="phone_code" /> </record> |