From da17c98833890bb86cbc532437198fa496cf26de Mon Sep 17 00:00:00 2001
From: jeffery chen fan <jeffery9@gmail.com>
Date: Mon, 28 Dec 2015 00:05:04 +0800
Subject: [PATCH] [FIX] base: China address format

Should be in one line
Closes #10217
---
 openerp/addons/base/res/res_country_data.xml | 1 +
 1 file changed, 1 insertion(+)

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>