From 61d430dc686590ff2c9c64ea9e1f808853503823 Mon Sep 17 00:00:00 2001 From: Benjamin <benjamin@le-filament.com> Date: Tue, 24 Dec 2019 15:15:04 +0100 Subject: [PATCH] Fix report model --- report/report_agreement.xml | 2 +- report/report_attendance_sheet.xml | 2 +- report/report_attestation.xml | 2 +- report/report_program.xml | 2 +- views/assets.xml | 20 ++++++++++++++++---- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/report/report_agreement.xml b/report/report_agreement.xml index 2a754c9..52c1394 100644 --- a/report/report_agreement.xml +++ b/report/report_agreement.xml @@ -3,7 +3,7 @@ <data> <template id="qweb_agreement_pdf"> - <t t-call="report.html_container"> + <t t-call="web.html_container"> <t t-foreach="docs" t-as="doc"> <t t-call="lefilament_training.training_layout"> <div class="page"> diff --git a/report/report_attendance_sheet.xml b/report/report_attendance_sheet.xml index ce4b38e..ebc07b4 100644 --- a/report/report_attendance_sheet.xml +++ b/report/report_attendance_sheet.xml @@ -3,7 +3,7 @@ <data> <template id="qweb_attendance_sheet_pdf"> - <t t-call="report.html_container"> + <t t-call="web.html_container"> <t t-foreach="docs" t-as="doc"> <t t-call="lefilament_training.training_layout"> diff --git a/report/report_attestation.xml b/report/report_attestation.xml index 14f2cb6..f6a34bc 100644 --- a/report/report_attestation.xml +++ b/report/report_attestation.xml @@ -3,7 +3,7 @@ <data> <template id="qweb_attestation_pdf"> - <t t-call="report.html_container"> + <t t-call="web.html_container"> <t t-foreach="docs" t-as="doc"> <t t-foreach="doc.student_ids" t-as="student"> <t t-call="lefilament_training.training_layout"> diff --git a/report/report_program.xml b/report/report_program.xml index dc1359a..d23f81b 100644 --- a/report/report_program.xml +++ b/report/report_program.xml @@ -3,7 +3,7 @@ <data> <template id="qweb_program_pdf"> - <t t-call="report.html_container"> + <t t-call="web.html_container"> <t t-foreach="docs" t-as="doc"> <t t-call="lefilament_training.training_layout"> <div class="page"> diff --git a/views/assets.xml b/views/assets.xml index a89252c..34d5e12 100644 --- a/views/assets.xml +++ b/views/assets.xml @@ -3,11 +3,23 @@ <odoo> <data> + <template id="training_assets" inherit_id="web.report_assets_editor"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/> + </xpath> + </template> + <template id="training_assets_common" name="training_assets" inherit_id="web.report_assets_common"> - <xpath expr="." position="inside"> - <link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/> - </xpath> - </template> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/> + </xpath> + </template> + + <template id="report_assets_common_custom_fonts" name="Custom QWeb fonts" inherit_id="web.report_assets_common"> + <xpath expr="." position="inside"> + <link rel="stylesheet" href="/lefilament_training/static/src/less/style.less"/> + </xpath> + </template> </data> </odoo> -- GitLab