From 84daaa165863c1a4033bbd7a218945f4d0cbefce Mon Sep 17 00:00:00 2001
From: Philipp Hug <philipp@hug.cx>
Date: Fri, 12 Feb 2016 19:00:32 +0100
Subject: [PATCH] [FIX] base: use correct address format for CH/LI

Closes #10911
---
 openerp/addons/base/res/res_country_data.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_country_data.xml b/openerp/addons/base/res/res_country_data.xml
index 4a86755f83a..dd1351b855d 100644
--- a/openerp/addons/base/res/res_country_data.xml
+++ b/openerp/addons/base/res/res_country_data.xml
@@ -308,6 +308,7 @@
             <field name="name">Switzerland</field>
             <field name="code">ch</field>
             <field file="base/static/img/country_flags/ch.png" name="image" type="base64" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="CHF" />
             <field eval="41" name="phone_code" />
         </record>
@@ -905,6 +906,7 @@
             <field name="name">Liechtenstein</field>
             <field name="code">li</field>
             <field file="base/static/img/country_flags/li.png" name="image" type="base64" />
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="CHF" />
             <field eval="423" name="phone_code" />
         </record>