From c8367dd53c1482b9e81606e8cfe39f3109aa2a28 Mon Sep 17 00:00:00 2001
From: Damien Bouvy <dbo@odoo.com>
Date: Thu, 20 Jul 2023 10:05:18 +0000
Subject: [PATCH] [FIX] account,l10n_ch: report inheritance

make the qr code section easier to modify in the base report for the
swiss localization

X-original-commit: 105557cc817fc9d21837ee50ba4fbc502926d059
Part-of: odoo/odoo#129492
---
 addons/account/views/report_invoice.xml  | 3 ++-
 addons/l10n_ch/views/account_invoice.xml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 349e31506d2..8ce731dd8bf 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -263,7 +263,8 @@
                                         Payment Communication: <span class="fw-bold" t-field="o.payment_reference">INV/2023/00001</span>
                                     </p>
                                 </div>
-                                <div t-if="not (o.display_qr_code and o.amount_residual > 0)" class="oe_structure"></div>
+                                <t t-set="show_qr" t-value="o.display_qr_code and o.amount_residual > 0"/>
+                                <div t-if="not show_qr" name="qr_code_placeholder" class="oe_structure"></div>
                                 <div id="qrcode" class="d-flex mb-3 avoid-page-break-inside" t-else="">
                                     <div class="qrcode me-3" id="qrcode_image">
                                         <t t-set="qr_code_url" t-value="o._generate_qr_code(silent_errors=True)"/>
diff --git a/addons/l10n_ch/views/account_invoice.xml b/addons/l10n_ch/views/account_invoice.xml
index 9bbd33c772c..e658ae78d12 100644
--- a/addons/l10n_ch/views/account_invoice.xml
+++ b/addons/l10n_ch/views/account_invoice.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <odoo>
     <template id="l10n_ch_report_invoice_document" inherit_id="account.report_invoice_document">
-        <xpath expr="//div[@id='qrcode']" position="attributes">
-            <attribute name="t-if" add="and o.qr_code_method != 'ch_qr'" separator=" "/>
+        <xpath expr="//t[@t-set='show_qr']" position="attributes">
+            <attribute name="t-value" add="and o.qr_code_method != 'ch_qr'" separator=" "/>
         </xpath>
     </template>
 </odoo>