diff --git a/static/src/scss/layout_generic.scss b/static/src/scss/layout_generic.scss index 7c8e8faf0177f1c363a4f52c67711084f01ab02c..db3ea481dc603110d529a9990ec7cb122784ef92 100644 --- a/static/src/scss/layout_generic.scss +++ b/static/src/scss/layout_generic.scss @@ -46,14 +46,20 @@ address .align-items-baseline { border: 1px solid #495057; } -.o_report_layout_boxed .row:not(#total) > div > table.table-compo tbody tr:not(:last-child) td:last-child{ +.o_report_layout_boxed + .row:not(#total) + > div + > table.table-compo + tbody + tr:not(:last-child) + td:last-child { background-color: #fff !important; } -.o_boxed_footer_compo{ +.o_boxed_footer_compo { font-size: 12px !important; } -.o_report_compo{ +.o_report_compo { font-size: 14px !important; } diff --git a/views/report_account.xml b/views/report_account.xml index 6ea4aaf2cf43c0e08bfb22b7f8e2eb8d18ed472d..6c09e355f4d14285ac32ac8a2e6f4804dd13166b 100644 --- a/views/report_account.xml +++ b/views/report_account.xml @@ -65,6 +65,14 @@ <strong>Origine:</strong> <p class="m-0" t-field="o.invoice_origin" /> </div> + <div + class="col-auto col-3 mw-100 mb-2" + t-if="o.invoice_date" + name="invoice_date" + > + <strong>Date de facturation:</strong> + <p class="m-0" t-field="o.invoice_date" /> + </div> <div class="col-auto col-3 mw-100 mb-2" t-if="o.invoice_date_due and o.move_type == 'out_invoice' and o.state == 'posted'" @@ -338,6 +346,11 @@ </div> </div> </div> + <p + t-if="o.move_type in ('out_invoice', 'in_refund') and o.payment_reference" + position="replace" + > + </p> </template> </odoo> diff --git a/views/report_composition_templates.xml b/views/report_composition_templates.xml index b7d0389fa55af9039b3353d6f413a2472978e510..57e311ef02f091dc50143f9984bfb4ff264dfa4c 100644 --- a/views/report_composition_templates.xml +++ b/views/report_composition_templates.xml @@ -101,8 +101,8 @@ <p class="m-0">Du <span t-field="doc.date_order" t-options='{"widget": "date"}' - /><br/> - Référent projet: <span t-field="doc.user_id"/> + /><br /> + Référent projet: <span t-field="doc.user_id" /> </p> </div> </div> @@ -111,20 +111,28 @@ </div> <div class="col-3" name="div_outgoing_address"> <div> - <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> + <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" - /> + t-if="doc.company_id.logo" + t-att-src="image_data_uri(doc.company_id.logo)" + style="max-height: 50px;" + alt="Logo" + /> </div> </div> <t t-foreach="doc.sale_project_ids" t-as="project"> @@ -203,9 +211,12 @@ t-if="compo.product_alternance_id" >ou</t></td> <td class="text-center"> - <t t-if="compo.product_alternance_id.categ_id.symbol"> - <i t-attf-class="fa {{compo.product_alternance_id.categ_id.symbol}}" - /> + <t + t-if="compo.product_alternance_id.categ_id.symbol" + > + <i + t-attf-class="fa {{compo.product_alternance_id.categ_id.symbol}}" + /> </t> </td> <td><t diff --git a/views/report_templates.xml b/views/report_templates.xml index 68e85600e826f6212dc8c9230e484fac0122c6c5..03bf427f897cbd83f9f735f4dba7d48fd7cee83c 100644 --- a/views/report_templates.xml +++ b/views/report_templates.xml @@ -18,7 +18,7 @@ > <div class="o_boxed_header"> <div class="row"> - <div class="col-2 mb4"> + <div class="col-3 mb4"> <img t-if="company.logo" t-att-src="image_data_uri(company.logo)" @@ -32,7 +32,7 @@ t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": true}' /> </div> - <div class="col-7"> + <div class="col-6"> </div> </div> </div> @@ -112,7 +112,9 @@ <t t-raw="0" /> </div> - <div t-attf-class="footer o_boxed_footer o_boxed_footer_compo 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">