From 087bebf87a64dee91bbd20658c270c920f242521 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Tue, 10 Oct 2017 17:14:00 +0200
Subject: [PATCH] [FIX] base: japanese address pattern

original commit forgot an "s" (in %(street2)s), leading to `\n`
becoming the format character, except that's not a *valid* format'
character, yielding a ValueError "unsupported format character
'?' (0xa)" any time an address is displayed if the current country is
Japan (and the system thus uses the japanese address pattern rather
than a generic one).

Closes #20008
---
 odoo/addons/base/res/res_country_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml
index ff2a5c71242..92c77080c9f 100644
--- a/odoo/addons/base/res/res_country_data.xml
+++ b/odoo/addons/base/res/res_country_data.xml
@@ -814,7 +814,7 @@
             <field name="code">jp</field>
             <field file="base/static/img/country_flags/jp.png" name="image" type="base64" />
             <field name="currency_id" ref="JPY" />
-            <field name="address_format" eval="'%(zip)s\n%(state_name)s %(city)s\n%(street)s\n%(street2)\n%(country_name)s'"/>
+            <field name="address_format" eval="'%(zip)s\n%(state_name)s %(city)s\n%(street)s\n%(street2)s\n%(country_name)s'"/>
             <field name="name_position">after</field>
             <field eval="81" name="phone_code" />
         </record>