diff --git a/models/acc_counter.py b/models/acc_counter.py index 514cf607f2d4908ed45e135ce8ca32b61625c223..810395bd2639207dece4e173dc6168a4d10c2252 100644 --- a/models/acc_counter.py +++ b/models/acc_counter.py @@ -41,6 +41,8 @@ class AccCounter(models.Model): is_account_surplus_activate = fields.Boolean( "Facturation du surplus automatisée", default=True ) + sale_price = fields.Float("Prix de vente par défaut", digits="Sale Price") + price_accise = fields.Float("Tarif ACCISE par défaut", digits="Sale Price") # ------------------------------------------------------ # SQL Constraints @@ -73,6 +75,13 @@ class AccCounter(models.Model): # ------------------------------------------------------ # CRUD methods (ORM overrides) # ------------------------------------------------------ + @api.model_create_multi + def create(self, vals_list): + res = super(AccCounter, self).create(vals_list) + if res.acc_operation_id and res.is_delivery: + res.sale_price = res.acc_operation_id.sale_price + res.price_accise = res.acc_operation_id.price_accise + return res # ------------------------------------------------------ # Actions diff --git a/models/acc_operation.py b/models/acc_operation.py index d0a8c0730c8bc9aabaa5a78aee72e0efde5caa79..9bd1e6ae710075d007000bfbe92ba6daf4592443 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -60,7 +60,8 @@ class AccOperation(models.Model): string="Nombre de factures Surplus", compute="_compute_acc_account_surplus_count", ) - + sale_price = fields.Float("Prix de vente par défaut", digits="Sale Price") + price_accise = fields.Float("Tarif ACCISE par défaut", digits="Sale Price") # ------------------------------------------------------ # SQL Constraints # ------------------------------------------------------ diff --git a/views/acc_counter_views.xml b/views/acc_counter_views.xml index 93c2959f3350d947f70a1157258a3d5381945401..a93ac903232bb5cf13f1a1776899652da32afa1f 100644 --- a/views/acc_counter_views.xml +++ b/views/acc_counter_views.xml @@ -69,6 +69,8 @@ name="is_account_auto_activate" widget="boolean_toggle" /> + <field name="sale_price"/> + <field name="price_accise"/> </group> <group> <field diff --git a/views/acc_operation_views.xml b/views/acc_operation_views.xml index 725eba6aa5bec6b6241cc39d0dee0febbe56fa10..e120dc7dad81253bd24ced7e0475d8beb368ee9a 100644 --- a/views/acc_operation_views.xml +++ b/views/acc_operation_views.xml @@ -61,6 +61,8 @@ <group> <group> <field name="is_account_active" widget="boolean_toggle" /> + <field name="sale_price"/> + <field name="price_accise"/> </group> <group> <field name="is_surplus_active" widget="boolean_toggle" /> diff --git a/wizard/acc_price_conf_wizard.py b/wizard/acc_price_conf_wizard.py index 020e0819330924abef6870266a1afc6ab974ef7e..1bb1c35ecc06411c7a0877ffeff920899eb86bc3 100644 --- a/wizard/acc_price_conf_wizard.py +++ b/wizard/acc_price_conf_wizard.py @@ -59,7 +59,8 @@ class AccPriceConfWizard(models.TransientModel): "acc_delivery_id": rec.id, "acc_injection_id": inj.id, "acc_operation_id": self.env.context.get("active_id"), - "type": type + "type": type, + "price": rec.sale_price if type == "sale" else rec.price_accise }, ) for rec in recs diff --git a/wizard/acc_price_conf_wizard_views.xml b/wizard/acc_price_conf_wizard_views.xml index 127b0141c72eaa9dbfc4775d749c10b6ecbbc0c1..9f7ee28d751e1d2cca46c0079e6f8717ad3c3e22 100644 --- a/wizard/acc_price_conf_wizard_views.xml +++ b/wizard/acc_price_conf_wizard_views.xml @@ -10,7 +10,7 @@ <group> <group> <field name="start_date" /> - <field name="type" /> + <field name="type" invisible="1"/> </group> </group> <field