From 78abc4d2cdb9ab23fd60a35bec77898cbce31a8b Mon Sep 17 00:00:00 2001
From: Sven Fuehr <svfu@odoo.com>
Date: Mon, 31 Jul 2023 08:47:59 +0000
Subject: [PATCH] [FIX] web: fix address position in DIN 5008 document layout
 preview
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently there is the following problem in the document layout preview:
("Settings" app > "General Settings" > "Companies" section > "Configure Document Layout")
The address is displayed in the wrong place for the DIN5008 layout
(from the l10n_din5008 module).

This is fixed in this commit.

closes odoo/odoo#131935

X-original-commit: 663334157cc4867c63aedea8d8d893eb765cfe25
Related: odoo/enterprise#45754
Signed-off-by: de Wouters de Bouchout Jean-Benoît (jbw) <jbw@odoo.com>
Signed-off-by: Sven Führ (svfu) <svfu@odoo.com>
---
 addons/web/views/report_templates.xml | 34 ++++++++++++---------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index e9380c38118..cfad4fce3f4 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -120,25 +120,21 @@
     <template id="report_invoice_wizard_preview">
         <t t-call="web.html_preview_container">
            <t t-call="web.external_layout">
-                   <div class="address row">
-                       <div name="address" class="col-5" style="margin-left: auto">
-                           <address>
-                               <address class="mb-0" itemscope="itemscope"
-                                        itemtype="http://schema.org/Organization">
-                                   <div>
-                                       <span itemprop="name">Deco Addict</span>
-                                   </div>
-                                   <div itemprop="address" itemscope="itemscope"
-                                        itemtype="http://schema.org/PostalAddress">
-                                       <div class="d-flex align-items-baseline">
-                                           <span class="w-100 o_force_ltr" itemprop="streetAddress">77 Santa Barbara
-                                               Rd<br/>Pleasant Hill CA 94523<br/>United States</span>
-                                       </div>
-                                   </div>
-                               </address>
-                           </address>
-                       </div>
-                   </div>
+                   <t t-set="address">
+                       <address class="mb-0" itemscope="itemscope"
+                                itemtype="http://schema.org/Organization">
+                           <div>
+                               <span itemprop="name">Deco Addict</span>
+                           </div>
+                           <div itemprop="address" itemscope="itemscope"
+                                itemtype="http://schema.org/PostalAddress">
+                               <div class="d-flex align-items-baseline">
+                                   <span class="w-100 o_force_ltr" itemprop="streetAddress">77 Santa Barbara
+                                       Rd<br/>Pleasant Hill CA 94523<br/>United States</span>
+                               </div>
+                           </div>
+                       </address>
+                   </t>
                    <div class="page mt-5">
                        <h2>
                            <span>Invoice</span>