From 87671e931bde2bfac76dac4a5417f5e51179778f Mon Sep 17 00:00:00 2001 From: Juliana <juliana@le-filament.com> Date: Mon, 27 Jun 2022 11:08:44 +0200 Subject: [PATCH] [UPD]Change term TCFE to ACCISE --- models/acc_account.py | 9 ++++++--- report/account_template.xml | 8 +++----- views/acc_account_views.xml | 4 ++-- views/menu_views.xml | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/models/acc_account.py b/models/acc_account.py index 4b4f908..68788c9 100644 --- a/models/acc_account.py +++ b/models/acc_account.py @@ -98,10 +98,13 @@ class AccAccount(models.Model): string="Total", store=True, readonly=True, compute="_compute_amount" ) amount_tcfe = fields.Monetary( - string="Montant TCFE", store=True, readonly=True, compute="_compute_amount" + string="Montant ACCISE", store=True, readonly=True, compute="_compute_amount" ) amount_without_tcfe = fields.Monetary( - string="Montant hors TCFE", store=True, readonly=True, compute="_compute_amount" + string="Montant hors ACCISE", + store=True, + readonly=True, + compute="_compute_amount", ) # inverse='_inverse_amount_total') power_cons = fields.Float( @@ -254,7 +257,7 @@ class AccAccountTax(models.Model): class AccAccountTaxTcfe(models.Model): _name = "acc.account.tax.tcfe" - _description = "Taxe TCFE" + _description = "Taxe ACCISE" def _get_default_currency_id(self): return self.env.company.currency_id.id diff --git a/report/account_template.xml b/report/account_template.xml index c83de3c..bae2fdf 100644 --- a/report/account_template.xml +++ b/report/account_template.xml @@ -230,9 +230,7 @@ <span class="font-weight-bold" >Titulaire du contrat:</span><br /> - <span - t-field="o.consumer_id.name" - /><br /> + <span t-field="o.consumer_id.name" /><br /> <span t-field="o.consumer_id.street" /><br /> <t t-if="o.consumer_id.street2"><span t-field="o.consumer_id.street2" @@ -399,7 +397,7 @@ </td> </tr> <tr> - <td>Total TCFE</td> + <td>Total ACCISE</td> <td class="text-right"> <span t-field="o.amount_tcfe" /> <span >HT</span> @@ -550,7 +548,7 @@ <thead> <tr> <th colspan="4"> - Taxe sur la consommation finale d’électricité (TCFE) + Taxe sur la consommation finale d’électricité (ACCISE) </th> </tr> <tr> diff --git a/views/acc_account_views.xml b/views/acc_account_views.xml index 13e4e1b..4c4e96a 100644 --- a/views/acc_account_views.xml +++ b/views/acc_account_views.xml @@ -402,7 +402,7 @@ <field name="name">acc.account.tax.tcfe.tree</field> <field name="model">acc.account.tax.tcfe</field> <field name="arch" type="xml"> - <tree string="Taxes TCFE"> + <tree string="Taxes ACCISE"> <field name="start_date" /> <field name="end_date" /> <field name="currency_id" /> @@ -415,7 +415,7 @@ <field name="name">acc.account.tax.tcfe.form</field> <field name="model">acc.account.tax.tcfe</field> <field name="arch" type="xml"> - <form string="Taxes TCFE"> + <form string="Taxes ACCISE"> <sheet> <group> <field name="start_date" /> diff --git a/views/menu_views.xml b/views/menu_views.xml index 9235f26..430795c 100644 --- a/views/menu_views.xml +++ b/views/menu_views.xml @@ -44,7 +44,7 @@ <menuitem id="acc_account_tcfe_menu" parent="menu_account" - name="Taxes TCFE" + name="Taxes ACCISE" sequence="50" action="acc_action_tcfe_form" /> -- GitLab