From 301a73d6828c77f8b1894e01fd7f2720d9113950 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Thu, 2 Dec 2021 10:35:59 +0100
Subject: [PATCH] Change template compo one page
---
data/paperformat_data.xml | 6 +-
static/src/scss/layout_generic.scss | 4 ++
views/report_composition_templates.xml | 81 ++++++++++++--------------
views/report_templates.xml | 24 +-------
4 files changed, 44 insertions(+), 71 deletions(-)
diff --git a/data/paperformat_data.xml b/data/paperformat_data.xml
index 5d6807d..26f6063 100644
--- a/data/paperformat_data.xml
+++ b/data/paperformat_data.xml
@@ -8,12 +8,12 @@
<field name="page_height">0</field>
<field name="page_width">0</field>
<field name="orientation">Landscape</field>
- <field name="margin_top">40</field>
- <field name="margin_bottom">32</field>
+ <field name="margin_top">15</field>
+ <field name="margin_bottom">10</field>
<field name="margin_left">7</field>
<field name="margin_right">7</field>
<field name="header_line" eval="False" />
- <field name="header_spacing">25</field>
+ <field name="header_spacing">15</field>
<field name="dpi">90</field>
</record>
diff --git a/static/src/scss/layout_generic.scss b/static/src/scss/layout_generic.scss
index 0897cc6..3e50c00 100644
--- a/static/src/scss/layout_generic.scss
+++ b/static/src/scss/layout_generic.scss
@@ -43,3 +43,7 @@ address .align-items-baseline {
.o_report_layout_boxed .table-prepa tbody td {
font-size: 17px;
}
+
+.o_report_compo{
+ font-size: 13px !important;
+}
diff --git a/views/report_composition_templates.xml b/views/report_composition_templates.xml
index 95608d3..b58c0eb 100644
--- a/views/report_composition_templates.xml
+++ b/views/report_composition_templates.xml
@@ -6,65 +6,57 @@
<t t-call="ap_report.external_layout_spe">
<t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
<div class="page">
- <div class="row">
- <div class="col-8" name="div_outgoing_address">
- <h4>
- <t
- t-if="not (env.context.get('proforma', False) or is_pro_forma)"
- >
- <span
- t-if="doc.state not in ['draft','sent']"
- >Commande n° </span>
- <span
- t-if="doc.state in ['draft','sent']"
- >Devis N° </span>
- </t>
- <t
- t-if="env.context.get('proforma', False) or is_pro_forma"
- >
- <span>Facture pro-forma n° </span>
- </t>
- <span t-field="doc.name" />
- </h4>
- <div class="mw-100 mb-3">
- <p class="m-0">Du <span
- t-field="doc.date_order"
- t-options='{"widget": "date"}'
- /></p>
- <p class="m-0">Référent projet: <span
- t-field="doc.user_id"
- /></p>
- </div>
+ <div class="row mt-2 mb-2">
+ <div class="col-5" name="div_outgoing_address">
+ <span>
+ <strong>
+ <span t-if="doc.state not in ['draft','sent']">Commande n° </span>
+ <span t-if="doc.state in ['draft','sent']">Devis N° </span>
+ <span t-field="doc.name" /><br/>
+ </strong>
+ Du <span t-field="doc.date_order" t-options='{"widget": "date"}'/><br/>
+ Référent projet: <span t-field="doc.user_id"/>
+ </span>
</div>
- <div class="col-4" name="div_outgoing_address">
+ <div class="col-3 text-center">
+ <h2 class="text-center">Compositions</h2>
+ </div>
+ <div class="col-3" name="div_outgoing_address">
<div>
- <div
- t-field="doc.partner_id"
- t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
- />
+ <span t-field="doc.partner_id.name"/><br/>
+ <t t-if="doc.partner_id.street"><span t-field="doc.partner_id.street"/><br/></t>
+ <t t-if="doc.partner_id.street2"><span t-field="doc.partner_id.street2"/><br/></t>
+ <t t-if="doc.partner_id.zip"><span t-field="doc.partner_id.zip"/></t> -
+ <t t-if="doc.partner_id.city"><span t-field="doc.partner_id.city"/></t>
</div>
</div>
+ <div class="col-1 text-right">
+ <img
+ t-if="doc.company_id.logo"
+ t-att-src="image_data_uri(doc.company_id.logo)"
+ style="max-height: 50px;"
+ alt="Logo"
+ />
</div>
- <br />
-
- <t t-foreach="doc.sale_project_ids" t-as="project">
+ </div>
+ <t t-foreach="doc.sale_project_ids" t-as="project">
<div style="page-break-after: always;">
- <div class="row mt32 mb32" name="projets">
+ <div class="row" name="projets">
<div class="col-12">
- <h6>Projet N° <span
+ <span><strong>PROJET N° <span
t-field="project.name"
- /></h6>
+ /></strong></span>
</div>
</div>
- <div class="row mt32 mb32" name="projets">
+ <div class="row" name="projets">
<t
t-foreach="project.intervention_ids"
t-as="intervention"
>
<div class="col-4">
- <h7 class="text-center">Intervention n° <span
+ <span class="text-center">INTERVENTION N° <span
t-field="intervention.name"
- /></h7>
+ /></span>
<t
t-if="intervention.sequence_type == 'sequence'"
>
@@ -168,8 +160,7 @@
</div>
</div>
</t>
- </div>
-
+ </div>
</t>
</template>
diff --git a/views/report_templates.xml b/views/report_templates.xml
index 9a8d4b9..5033223 100644
--- a/views/report_templates.xml
+++ b/views/report_templates.xml
@@ -100,29 +100,7 @@
<template id="ap_external_layout_generic_compo">
<div
- t-attf-class="header o_company_#{company.id}_layout"
- t-att-style="report_header_style"
- >
- <div class="row">
- <div class="col-4">
- </div>
- <div class="col-4 text-center">
- <h2 class="mt0 text-center">Compositions</h2>
- </div>
- <div class="col-4 mb4 text-right">
- <img
- t-if="company.logo"
- t-att-src="image_data_uri(company.logo)"
- style="max-height: 50px;"
- alt="Logo"
- />
- </div>
-<!-- <div class="col-9 text-right" style="margin-top:22px;" t-field="company.report_header" name="moto"/>-->
- </div>
-
- </div>
- <div
- t-attf-class="article o_report_layout_boxed o_company_#{company.id}_layout"
+ t-attf-class="article o_report_layout_boxed o_report_compo o_company_#{company.id}_layout"
t-att-data-oe-model="o and o._name"
t-att-data-oe-id="o and o.id"
t-att-data-oe-lang="o and o.env.context.get('lang')"
--
GitLab