diff --git a/models/acc_account.py b/models/acc_account.py index 4b4f908ef92877940bfbfdb38ca21283009505c5..68788c9c4a6cf9b689af1978ffe9e96190af1be6 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 c83de3ca84d16c67fbca8cb05fbfe389cc38eeeb..bae2fdf6237724029bb376c121602d63900e1445 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 13e4e1b2e0e246adc016b9705ed63e3d9ad9d2d0..4c4e96aa417bf0f465d77d2eea9ff48d9acfbc12 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 9235f26eeb97c98c0a74688cdd281a17c79c50e1..430795c2e5e306a98e6319ac92a7c3353588a389 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" />