diff --git a/models/acc_account.py b/models/acc_account.py
index 08ddd39a7f6fdefadab2247ce3d58b36372f59c6..673cd449d0aa529b6e1eb701d7d36a3926219159 100644
--- a/models/acc_account.py
+++ b/models/acc_account.py
@@ -117,8 +117,7 @@ class AccAccount(models.Model):
seq = str(rec.acc_injection_id.acc_account_surplus_count).zfill(3)
rec.name = (
"FS-"
- +
- rec.acc_operation_id.name
+ + rec.acc_operation_id.name
+ "-"
+ rec.acc_injection_id.name
+ "-"
@@ -128,8 +127,7 @@ class AccAccount(models.Model):
seq = str(rec.acc_injection_id.acc_account_injection_count).zfill(3)
rec.name = (
"F-"
- +
- rec.acc_operation_id.name
+ + rec.acc_operation_id.name
+ "-"
+ rec.acc_injection_id.name
+ "-"
diff --git a/report/account_template.xml b/report/account_template.xml
index fe2f7d8c60cd464433a48b4a87b415fa7cab460d..79f759de310da53b44b5ce4e3edb8e7d55c473d5 100644
--- a/report/account_template.xml
+++ b/report/account_template.xml
@@ -128,7 +128,7 @@
class="border-black o_subtotal"
style=""
>
- <td><strong>Sous-Total</strong></td>
+ <td>Total H.T.</td>
<td class="text-right">
<span
t-field="o.amount_untaxed"
@@ -140,7 +140,7 @@
<t>
<td><span
class="text-nowrap"
- />TVA</td>
+ />TVA applicable 20%</td>
<td
class="text-right o_price_total"
>
@@ -153,12 +153,12 @@
</tr>
</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"
- />
+ <strong><span
+ class="text-nowrap"
+ t-field="o.amount_total"
+ /></strong>
</td>
</tr>
</table>
@@ -249,19 +249,21 @@
<p>
<span
class="font-weight-bold"
- >Référence Point de livraison (PDL):</span><br />
+ >Référence Point de livraison (PDL):</span><br
+ />
<span t-field="o.acc_delivery_id.name" /><br />
<span
class="font-weight-bold"
>Lieu de consommation:</span><br />
- <span t-field="o.acc_delivery_id.street" /><br />
+ <span t-field="o.acc_delivery_id.street" /><br
+ />
<t t-if="o.acc_delivery_id.street2"><span
- t-field="o.acc_delivery_id.street2"
- /><br /></t>
+ t-field="o.acc_delivery_id.street2"
+ /><br /></t>
<t t-if="o.acc_delivery_id.zip">
<span t-field="o.acc_delivery_id.zip" /> - <span
- t-field="o.acc_delivery_id.city"
- /><br /></t>
+ t-field="o.acc_delivery_id.city"
+ /><br /></t>
</p>
</div>
<div>
@@ -304,12 +306,16 @@
>Référence Autoconsommation collective:</span><br
/>
<span t-field="o.acc_operation_id.name" /><br />
- <span class="font-weight-bold">Nom producteur</span><br />
+ <span
+ class="font-weight-bold"
+ >Nom producteur</span><br />
<span
class="font-weight-bold"
t-field="o.producer_id.name"
/><br />
- <span class="font-weight-bold">Référence point d'injection (PRM):</span><br />
+ <span
+ class="font-weight-bold"
+ >Référence point d'injection (PRM):</span><br />
<span
class="font-weight-bold"
t-field="o.acc_injection_id.name"
@@ -317,14 +323,17 @@
<span
class="text-center font-weight-bold"
>Lieu de production:</span><br />
- <span t-field="o.acc_injection_id.street" /><br />
+ <span t-field="o.acc_injection_id.street" /><br
+ />
<t t-if="o.acc_injection_id.street2"><span
- t-field="o.acc_injection_id.street2"
- /><br /></t>
+ t-field="o.acc_injection_id.street2"
+ /><br /></t>
<t t-if="o.acc_injection_id.zip">
- <span t-field="o.acc_injection_id.zip" /> - <span
- t-field="o.acc_injection_id.city"
- /><br /></t>
+ <span
+ t-field="o.acc_injection_id.zip"
+ /> - <span
+ t-field="o.acc_injection_id.city"
+ /><br /></t>
</p>
</div>
</div>
@@ -360,7 +369,7 @@
<hr />
<table
- class="table table-sm o_main_table"
+ class="table table-sm table-none o_main_table"
name="account_line_table"
>
<tr>
diff --git a/security/security.xml b/security/security.xml
index d81a8e8ec74385311b7b6f02c8b0a86bd3c6f31c..704c342cd22f69e78e982a9c9f11433fb5b6f0df 100644
--- a/security/security.xml
+++ b/security/security.xml
@@ -25,7 +25,9 @@
<record id="acc_account_rule_portal_pmo" model="ir.rule">
<field name="name">Portail : Factures pour les pmo</field>
<field name="model_id" ref="acc_account.model_acc_account" />
- <field name="domain_force">[('pmo_id','in',[user.partner_id.parent_id.id, user.partner_id.id])]</field>
+ <field
+ name="domain_force"
+ >[('pmo_id','in',[user.partner_id.parent_id.id, user.partner_id.id])]</field>
<field name="groups" eval="[(4, ref('base.group_portal'))]" />
</record>
diff --git a/static/src/scss/style.scss b/static/src/scss/style.scss
index b3ebaae62e89c304d3ec3734eb57dfad96f9aaba..98077540879e96407ec2435747da1a9485aef1b6 100644
--- a/static/src/scss/style.scss
+++ b/static/src/scss/style.scss
@@ -1,17 +1,39 @@
-.o_report_layout_boxed .row > div > table tr:last-child td {
+.o_report_layout_boxed .row > div > table tr:last-child td,
+.o_report_layout_boxed
+ .row:not(#total)
+ > div
+ > table
+ tbody
+ tr:not(:last-child)
+ td:last-child,
+.o_report_layout_boxed table tbody tr td.o_price_total {
background-color: #fff !important;
color: #495057 !important;
}
.o_report_layout_boxed .row > div > table tr.o_total strong,
.o_report_layout_boxed div#total table tr.o_total strong {
- color: #000 !important;
+ color: #495057 !important;
+}
+
+.o_report_layout_boxed table.table-none tbody tr td {
+ border-right: none !important;
+}
+
+.table th,
+.table td {
+ border-top: none !important;
+}
+
+.o_report_layout_boxed table thead tr th {
+ color: #495057;
+ text-transform: none !important;
}
-.o_report_layout_boxed table tbody tr td {
- border-right: 0px solid #495057 !important;
+.o_report_layout_boxed table thead {
+ border-bottom: 1px solid rgb(73, 80, 87) !important;
}
-.o_report_layout_boxed table {
- border: 0px solid #495057 !important;
+.o_report_layout_boxed .row > div > table tr:last-child td:first-child {
+ border-right: 1px solid #495057 !important;
}
diff --git a/views/assets.xml b/views/assets.xml
index d491fe7782d48cc634345790ebd95b621397cb34..781a42ac5ed5f99c9e9a3c49833744a1f0094659 100644
--- a/views/assets.xml
+++ b/views/assets.xml
@@ -2,7 +2,7 @@
<odoo>
<!-- Assets for reports -->
<template id="report_assets_common" inherit_id="web.report_assets_common">
- <xpath expr="." position="inside">-->
+ <xpath expr="." position="inside">
<link
rel="stylesheet"
type="text/scss"