From 2fcff8dee1e5082a07f8ba8bf3da91c9d3c6242a Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Mon, 2 Mar 2020 15:36:26 +0000
Subject: [PATCH] [FIX] base: China Layout in Reports

Format taken from: https://en.wikipedia.org/wiki/Address#China

opw:2206707

closes odoo/odoo#46847

X-original-commit: 89d29ac8c1201bb4d4213d054f43ad563ea9367e
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
---
 odoo/addons/base/data/res_country_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index 7b936371f9d..e942433744e 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -343,7 +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 eval="'%(country_name)s, %(zip)s\n%(state_name)s %(city)s %(street)s %(street2)s'" name="address_format" />
             <field name="currency_id" ref="CNY" />
             <field eval="86" name="phone_code" />
         </record>