diff --git a/addons/l10n_ch/report/swissqr_report.xml b/addons/l10n_ch/report/swissqr_report.xml
index edcd0d5dea7..ed18b919b5a 100644
--- a/addons/l10n_ch/report/swissqr_report.xml
+++ b/addons/l10n_ch/report/swissqr_report.xml
@@ -16,9 +16,8 @@
         <template id="l10n_ch_swissqr_template">
             <t t-set="o" t-value="o.with_context(lang=lang)"/>
             <t t-call="web.external_layout">
-
-                <!-- add class to body tag -->
-                <script>document.body.className += " l10n_ch_qr";</script>
+                <!-- TODO master: remove this -->
+                <script t-if="0">document.body.className += " l10n_ch_qr";</script>
                 <!-- add default margin for header (matching A4 European margin) -->
                 <t t-set="report_header_style">padding-top:6.2mm; padding-left:8.2mm; padding-right:8.2mm;</t>
 
@@ -208,5 +207,10 @@
                 </t>
             </t>
         </template>
+        <template id="minimal_layout_with_report_attribute" inherit_id="web.minimal_layout">
+            <body position="attributes">
+                <attribute name="t-att-data-report-id">report_xml_id</attribute>
+            </body>
+        </template> 
     </data>
 </odoo>
diff --git a/addons/l10n_ch/static/src/scss/report_swissqr.scss b/addons/l10n_ch/static/src/scss/report_swissqr.scss
index 5af11bb9edf..23b89381267 100644
--- a/addons/l10n_ch/static/src/scss/report_swissqr.scss
+++ b/addons/l10n_ch/static/src/scss/report_swissqr.scss
@@ -10,7 +10,7 @@
 
 $l10n-ch-qr-ratio: 1.25;
 
-body.l10n_ch_qr {
+body.l10n_ch_qr, body[data-oe-report="l10n_ch.l10n_ch_qr_report"] {
     padding: 0;
 
     /* Disable custom bakground */
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index cd01fed3b8f..695ca362760 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -282,7 +282,7 @@
                     }
                 </script>
             </head>
-            <body class="container" t-att-onload="subst and 'subst()'" style="overflow:hidden">
+            <body class="container" t-att-data-report-id="report_xml_id" t-att-onload="subst and 'subst()'" style="overflow:hidden">
                 <t t-out="body"/>
             </body>
         </html>
diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py
index 1ebf943b0b4..d3be54967db 100644
--- a/odoo/addons/base/models/ir_actions_report.py
+++ b/odoo/addons/base/models/ir_actions_report.py
@@ -397,7 +397,8 @@ class IrActionsReport(models.Model):
             body = IrQweb._render(layout.id, {
                     'subst': False,
                     'body': Markup(lxml.html.tostring(node, encoding='unicode')),
-                    'base_url': base_url
+                    'base_url': base_url,
+                    'report_xml_id' : self.xml_id
                 }, raise_if_not_found=False)
             bodies.append(body)
             if node.get('data-oe-model') == report_model: