diff --git a/static/src/scss/layout_generic.scss b/static/src/scss/layout_generic.scss index 38dbe064f99a33acefd247a17e7e589c531d974c..6a18ca178461a2409a5adf68df8668ffc8093e46 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 7375fe1abe85b5815325077e45fcbcea00261b39..0dde50f499c57ca749e1035d611d41e2e7e5b526 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 7c4d476608e06d70279308cdb5431f7745f12e38..68e85600e826f6212dc8c9230e484fac0122c6c5 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" />