From 6ba9a2011f222227d338af72988b4fa4380b7cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Rahir?= <rar@odoo.com>
Date: Sat, 15 Sep 2018 17:38:13 +0200
Subject: [PATCH] [FIX] account, base, web: fixing report layouts

Reverting some changes introduced in
f29df7fb2eed9bee7fa1f3452e1efa26f2dd4fb1.
By changing the html tag from 'article' to 'page' we were losing the
style on the body of the document. The problem it was supposed to tackle
will be addresed in the future.
---
 addons/account/views/report_invoice.xml      |  2 +-
 addons/web/views/report_templates.xml        | 12 ++++++------
 odoo/addons/base/models/ir_actions_report.py |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 3a21d717719..feffb6646df 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -8,7 +8,7 @@
                     <address t-field="o.partner_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
                     <div t-if="o.partner_id.vat" class="mt16"><t t-esc="o.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="o.partner_id.vat"/></div>
                 </t>
-                <div class="page" t-att-data-model="o._name" t-att-data-id="o.id">
+                <div class="page">
                     <h2>
                         <span t-if="o.type == 'out_invoice' and o.state in ('open', 'in_payment', 'paid')">Invoice</span>
                         <span t-if="o.type == 'out_invoice' and o.state == 'draft'">Draft Invoice</span>
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index e022209a7a8..ad3c2498d3e 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -194,7 +194,7 @@
             <div class="clearfix mb8"/>
         </div>
 
-        <div class="article o_report_layout_background">
+        <div class="article o_report_layout_background" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
             <t t-call="web.address_layout"/>
             <t t-raw="0"/>
         </div>
@@ -234,7 +234,7 @@
             </div>
         </div>
 
-        <div class="article o_report_layout_boxed">
+        <div class="article o_report_layout_boxed" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
             <t t-call="web.address_layout"/>
             <t t-raw="0"/>
         </div>
@@ -273,7 +273,7 @@
             </div>
         </div>
 
-        <div class="article o_report_layout_clean">
+        <div class="article o_report_layout_clean"  t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
             <t t-call="web.address_layout"/>
             <t t-raw="0"/>
         </div>
@@ -321,7 +321,7 @@
             </div>
         </div>
 
-        <div class="article o_report_layout_standard">
+        <div class="article o_report_layout_standard"  t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
             <t t-call="web.address_layout"/>
             <t t-raw="0"/>
         </div>
@@ -402,14 +402,14 @@
                 </div>
             </div>
         </div>
-        <div class="article">
+        <div class="article" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
           <t t-raw="0"/>
         </div>
     </template>
 
     <template id="basic_layout">
         <t t-call="web.html_container">
-            <div class="article">
+            <div class="article" t-att-data-oe-model="o and o._name" t-att-data-oe-id="o and o.id">
                 <t t-raw="0"/>
             </div>
         </t>
diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py
index eedcb4e8e2d..dfed8cedd0a 100644
--- a/odoo/addons/base/models/ir_actions_report.py
+++ b/odoo/addons/base/models/ir_actions_report.py
@@ -314,11 +314,11 @@ class IrActionsReport(models.Model):
             footer_node.append(node)
 
         # Retrieve bodies
-        for node in root.xpath(match_klass.format('page')):
+        for node in root.xpath(match_klass.format('article')):
             body = layout.render(dict(subst=False, body=lxml.html.tostring(node), base_url=base_url))
             bodies.append(body)
-            if node.get('data-model') == self.model:
-                res_ids.append(int(node.get('data-id', 0)))
+            if node.get('data-oe-model') == self.model:
+                res_ids.append(int(node.get('data-oe-id', 0)))
             else:
                 res_ids.append(None)