diff --git a/static/src/scss/layout_generic.scss b/static/src/scss/layout_generic.scss
index f28a406a9ea57f6d4fbd54affa27d0394242569b..f1787e521fef1c87cfcab90a1b3d70479c4bf342 100644
--- a/static/src/scss/layout_generic.scss
+++ b/static/src/scss/layout_generic.scss
@@ -18,40 +18,6 @@ address .align-items-baseline{
font-size: 15px !important;
}
-.o_report_layout_boxed {
- #total strong {
- color: #1D4A23;
- }
- #informations strong {
- color: #489FAE;
- }
- table {
- thead {
- tr th {
- color: #489FAE;
- }
- }
- tbody tr td {
- &.o_line_section td {
- background-color: rgba(29,74,35, 0.7);
- }
- &.is-subtotal,
- td.o_price_total {
- background-color: rgba(72,159,174, 0.1);
- }
- }
- }
-
- .row > div > table,
- div#total table {
- tr {
- &.o_total td {
- background-color: rgba(29,74,35,0.9);
- }
- }
- }
-}
-
.o_report_layout_boxed .row > div > table.table-compo tr:last-child td,
{
background-color: inherit !important;
diff --git a/views/report_account.xml b/views/report_account.xml
index 9cce5e35c679f009398de77a08b2b2e057ca5c35..ef5c2ee588dd79dc403efd121f3490d0cfc8a87e 100644
--- a/views/report_account.xml
+++ b/views/report_account.xml
@@ -18,10 +18,6 @@
<span t-if="o.move_type == 'in_invoice'">Facture fournisseur</span>
<span t-if="o.name != '/'" t-field="o.name"/>
</h2>
- <div class="mw-100 mb-2">
- <p class="m-0">Du <span t-field="o.invoice_date" t-options='{"widget": "date"}'/></p>
- <p class="m-0">Référent projet: <span t-field="o.invoice_user_id"/></p>
- </div>
<address t-field="o.partner_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
<div t-if="o.partner_id.vat" class="mt16">
<t t-if="o.company_id.country_id.vat_label" t-esc="o.company_id.country_id.vat_label" id="inv_tax_id_label"/>
@@ -51,7 +47,7 @@
<div class="col-auto col-3 mw-100 mb-2" t-if="o.invoice_user_id" name="referent">
<strong>Référent:</strong>
- <p class="m-0" t-field="o.invoice_user_id"/>
+ <p class="m-0"><span t-field="doc.invoice_user_id"/><t t-if="doc.invoice_user_id.phone"> , <t t-esc="doc.invoice_user_id.phone"/></t></p>
</div>
</div>
</div>
@@ -68,7 +64,7 @@
</th>
<th t-if="o.company_id.vat" name="th_taxes" t-attf-class="text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"><span>Taxes</span></th>
<th name="th_subtotal" class="text-right">
- <span groups="account.group_show_line_subtotals_tax_excluded">Montant</span>
+ <span groups="account.group_show_line_subtotals_tax_excluded">Montant HT</span>
<span groups="account.group_show_line_subtotals_tax_included">Prix total</span>
</th>
</tr>
@@ -119,7 +115,7 @@
<t t-if="current_section and (line_last or lines[line_index+1].display_type == 'line_section')">
<tr class="is-subtotal text-right">
<td colspan="99">
- <strong class="mr16">Sous-total</strong>
+ <strong class="mr16">Sous-total HT</strong>
<span
t-esc="current_subtotal"
t-options='{"widget": "monetary", "display_currency": o.currency_id}'
@@ -137,7 +133,7 @@
<div t-attf-class="#{'col-6' if report_type != 'html' else 'col-sm-7 col-md-6'} ml-auto">
<table class="table table-sm" style="page-break-inside: avoid;">
<tr t-if="o.company_id.vat" class="border-black o_subtotal" style="">
- <td><strong>Sous-total</strong></td>
+ <td><strong>Sous-total HT</strong></td>
<td class="text-right">
<span t-field="o.amount_untaxed"/>
</td>
@@ -166,7 +162,7 @@
</t>
</t>
<tr class="border-black o_total">
- <td><strong>Total</strong></td>
+ <td><strong>Total TTC</strong></td>
<td class="text-right">
<span class="text-nowrap" t-field="o.amount_total"/>
</td>
diff --git a/views/report_sale.xml b/views/report_sale.xml
index 2987c32a95c56bb48cba82d5ed8c03eb2907bc56..e0c65b5e38c351c8e7c90952d14d41d24537d5ea 100644
--- a/views/report_sale.xml
+++ b/views/report_sale.xml
@@ -35,16 +35,12 @@
</t>
<span t-field="doc.name"/>
</h2>
- <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>
</xpath>
<div t-if="doc.user_id.name" position="replace">
<div t-if="doc.user_id.name" class="col-auto col-3 mw-100 mb-2">
<strong>Référent:</strong>
- <p class="m-0" t-field="doc.user_id"/>
+ <p class="m-0"><span t-field="doc.user_id"/><t t-if="doc.user_id.phone"> , <t t-esc="doc.user_id.phone"/></t></p>
</div>
</div>
<xpath expr="//div[@class='page']" position="inside">
@@ -70,7 +66,7 @@
</th>
<th t-if="doc.company_id.vat" name="th_taxes" class="text-right">Taxes</th>
<th name="th_subtotal" class="text-right">
- <span groups="account.group_show_line_subtotals_tax_excluded">Montant</span>
+ <span groups="account.group_show_line_subtotals_tax_excluded">Montant HT</span>
<span groups="account.group_show_line_subtotals_tax_included">Prix total</span>
</th>
</tr>
@@ -122,7 +118,7 @@
<t t-if="current_section and (line_last or doc.order_line[line_index+1].display_type == 'line_section')">
<tr class="is-subtotal text-right">
<td name="td_section_subtotal" colspan="99">
- <strong class="mr16">Sous-total</strong>
+ <strong class="mr16">Sous-total HT</strong>
<span
t-esc="current_subtotal"
t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'
@@ -140,7 +136,7 @@
<div t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto">
<table class="table table-sm">
<tr t-if="doc.company_id.vat" class="border-black o_subtotal" style="">
- <td name="td_amount_untaxed_label"><strong>Sous-total</strong></td>
+ <td name="td_amount_untaxed_label"><strong>Sous-total HT</strong></td>
<td name="td_amount_untaxed" class="text-right">
<span t-field="doc.amount_untaxed"/>
</td>
@@ -171,7 +167,7 @@
</t>
</t>
<tr class="border-black o_total">
- <td name="td_amount_total_label"><strong>Total</strong></td>
+ <td name="td_amount_total_label"><strong>Total TTC</strong></td>
<td name="td_amount_total" class="text-right">
<span t-field="doc.amount_total"/>
</td>