From 9543f8c2b98c1a2d86489da7abfb5b30ca1ee495 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Thu, 2 Dec 2021 12:12:27 +0100
Subject: [PATCH] Add footer2
---
static/src/scss/layout_generic.scss | 4 ++++
views/report_composition_templates.xml | 6 ++++--
views/report_templates.xml | 7 +------
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/static/src/scss/layout_generic.scss b/static/src/scss/layout_generic.scss
index 38dbe06..6a18ca1 100644
--- a/static/src/scss/layout_generic.scss
+++ b/static/src/scss/layout_generic.scss
@@ -48,6 +48,10 @@ address .align-items-baseline {
background-color: #fff !important;
}
+.o_boxed_footer_compo{
+ font-size: 12px !important;
+}
+
.o_report_compo{
font-size: 13px !important;
}
diff --git a/views/report_composition_templates.xml b/views/report_composition_templates.xml
index 7375fe1..0dde50f 100644
--- a/views/report_composition_templates.xml
+++ b/views/report_composition_templates.xml
@@ -118,7 +118,7 @@
<td><span
t-field="compo.product_id.name"
/></td>
- <td><t
+ <t t-if="compo.product_alternance_id"> <td><t
t-if="compo.product_alternance_id"
>ou</t></td>
<td class="text-center">
@@ -131,7 +131,9 @@
t-if="compo.product_alternance_id"
><span
t-field="compo.product_alternance_id.name"
- /></t></td>
+ /></t>
+ </td>
+ </t>
</tr>
</t>
</t>
diff --git a/views/report_templates.xml b/views/report_templates.xml
index 7c4d476..68e8560 100644
--- a/views/report_templates.xml
+++ b/views/report_templates.xml
@@ -112,7 +112,7 @@
<t t-raw="0" />
</div>
- <div t-attf-class="footer o_boxed_footer o_company_#{company.id}_layout">
+ <div t-attf-class="footer o_boxed_footer o_boxed_footer_compo o_company_#{company.id}_layout">
<div class="text-center">
<ul class="list-inline">
<li class="list-inline-item">
@@ -137,11 +137,6 @@
t-field="company.ape"
/></t>
</li>
- <li>
- <t t-if="report_type == 'pdf'">
- Page: <span class="page" /> / <span class="topage" />
- </t>
- </li>
</ul>
<div t-if="report_type == 'pdf'" class="text-muted">
Page: <span class="page" /> / <span class="topage" />
--
GitLab