summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authormdi-odoo <mdi@tinyerp.com>2017-01-18 16:57:19 +0530
committerChristophe Simonis <chs@odoo.com>2017-01-23 13:00:00 +0100
commit255de893300d73670a15a102e85162ae48084d7c (patch)
tree52e5de14ca1d62315e625921708a86e0ac91cec4 /addons
parente83a40f38bcef997868330841b82b14c2610fe48 (diff)
[FIX] report,*: correct reports without header/footer
Since 3d04e44880fb77812e65342ef25bb8ad06094ddc [0], the class `article` is used instead of `page`. As reports not using `external_layout` does still manually used `page` class as wrapper, there were not rendered properly. Force these reports to correctly wrap their content into an `article` div by using a dedicated template. Closes #15118 [0] more precisely https://git.io/vM58c
Diffstat (limited to 'addons')
-rw-r--r--addons/event/report/event_event_templates.xml4
-rw-r--r--addons/hr_attendance/report/hr_employee_badge.xml2
-rw-r--r--addons/point_of_sale/views/report_userlabel.xml2
-rw-r--r--addons/product/report/product_product_templates.xml2
-rw-r--r--addons/product/report/product_template_templates.xml2
-rw-r--r--addons/report/views/templates.xml8
-rw-r--r--addons/stock/report/report_location_barcode.xml2
-rw-r--r--addons/stock/report/report_lot_barcode.xml2
-rw-r--r--addons/stock/report/report_package_barcode.xml4
9 files changed, 18 insertions, 10 deletions
diff --git a/addons/event/report/event_event_templates.xml b/addons/event/report/event_event_templates.xml
index 3720744ce48..e9a3fd26257 100644
--- a/addons/event/report/event_event_templates.xml
+++ b/addons/event/report/event_event_templates.xml
@@ -3,7 +3,7 @@
<!-- template use to render a Registration Badge -->
<template id="event_registration_report_template_badge">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<t t-foreach="docs" t-as="o">
<div class="page">
<div class="row">
@@ -55,7 +55,7 @@
<!-- template use to edit Event Badget (allow to set the HTML badge fields) -->
<template id="event_event_report_template_badge">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<div class="page">
<t t-foreach="docs" t-as="event">
<div class="row">
diff --git a/addons/hr_attendance/report/hr_employee_badge.xml b/addons/hr_attendance/report/hr_employee_badge.xml
index d1a6c78645a..8da14a63e85 100644
--- a/addons/hr_attendance/report/hr_employee_badge.xml
+++ b/addons/hr_attendance/report/hr_employee_badge.xml
@@ -12,7 +12,7 @@
</record>
<template id="print_employee_badge">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<div class="page">
<t t-foreach="docs" t-as="employee">
<div class="col-sm-6">
diff --git a/addons/point_of_sale/views/report_userlabel.xml b/addons/point_of_sale/views/report_userlabel.xml
index bc02fc98db7..5bd054b53d7 100644
--- a/addons/point_of_sale/views/report_userlabel.xml
+++ b/addons/point_of_sale/views/report_userlabel.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="report_userlabel">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<div class="page">
<t t-foreach="docs" t-as="user">
<div class="col-xs-6 mb92">
diff --git a/addons/product/report/product_product_templates.xml b/addons/product/report/product_product_templates.xml
index 60e11d8d38c..8fb2bf122d7 100644
--- a/addons/product/report/product_product_templates.xml
+++ b/addons/product/report/product_product_templates.xml
@@ -33,7 +33,7 @@
</template>
<template id="report_productlabel">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<div class="page">
<t t-foreach="docs" t-as="product">
<t t-call="product.report_simple_label">
diff --git a/addons/product/report/product_template_templates.xml b/addons/product/report/product_template_templates.xml
index b2390ca5140..8d9d1299e77 100644
--- a/addons/product/report/product_template_templates.xml
+++ b/addons/product/report/product_template_templates.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="report_producttemplatelabel">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<div class="page">
<t t-foreach="docs" t-as="template">
<t t-foreach="template.product_variant_ids" t-as="product">
diff --git a/addons/report/views/templates.xml b/addons/report/views/templates.xml
index 2ca0e586f9c..c9f6f6157b4 100644
--- a/addons/report/views/templates.xml
+++ b/addons/report/views/templates.xml
@@ -362,4 +362,12 @@
</div>
</template>
+<template id="basic_layout">
+ <t t-call="report.html_container">
+ <div class="article">
+ <t t-raw="0" />
+ </div>
+ </t>
+</template>
+
</odoo>
diff --git a/addons/stock/report/report_location_barcode.xml b/addons/stock/report/report_location_barcode.xml
index 6f5e6ba7ad6..d67481ddbb9 100644
--- a/addons/stock/report/report_location_barcode.xml
+++ b/addons/stock/report/report_location_barcode.xml
@@ -9,7 +9,7 @@
</template>
<template id="report_location_barcode">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<div t-foreach="[docs[x:x+4] for x in xrange(0, len(docs), 4)]" t-as="page_docs" class="page page_stock_location_barcodes">
<t t-foreach="page_docs" t-as="o">
<t t-if="o.barcode"><t t-set="content" t-value="o.barcode"/></t>
diff --git a/addons/stock/report/report_lot_barcode.xml b/addons/stock/report/report_lot_barcode.xml
index 81afda2cd26..93dda031d71 100644
--- a/addons/stock/report/report_lot_barcode.xml
+++ b/addons/stock/report/report_lot_barcode.xml
@@ -2,7 +2,7 @@
<odoo>
<data>
<template id="report_lot_barcode">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<t t-foreach="docs" t-as="o">
<t>
<div class="page">
diff --git a/addons/stock/report/report_package_barcode.xml b/addons/stock/report/report_package_barcode.xml
index 786e51db603..f9e6a18833a 100644
--- a/addons/stock/report/report_package_barcode.xml
+++ b/addons/stock/report/report_package_barcode.xml
@@ -2,7 +2,7 @@
<odoo>
<data>
<template id="report_package_barcode">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<t t-foreach="docs" t-as="o">
<t>
<div class="page">
@@ -51,7 +51,7 @@
</template>
<template id="report_package_barcode_small">
- <t t-call="report.html_container">
+ <t t-call="report.basic_layout">
<t t-foreach="docs" t-as="o">
<t>
<div class="page">