diff --git a/wizards/acc_operation_wizard.py b/wizards/acc_operation_wizard.py index 31b7de23121acbb59c632047d583b884f5ddd36b..533bde7fcd648a85570e0421bbc9ea4d7493fcad 100644 --- a/wizards/acc_operation_wizard.py +++ b/wizards/acc_operation_wizard.py @@ -81,11 +81,14 @@ class AccOperationWizard(models.TransientModel): domain_all = [ ("date_slot", ">=", self.date_start), ("date_slot", "<=", self.date_end), - ("acc_operation_id", "=", self.operation_id.id) + ("acc_operation_id", "=", self.operation_id.id), ] if self.prm_cons_ids and self.prm_prod_ids: - domain_all += ["|", ("acc_counter_id", "in", self.prm_cons_ids.ids), - ("acc_counter_id", "in", self.prm_prod_ids.ids)] + domain_all += [ + "|", + ("acc_counter_id", "in", self.prm_cons_ids.ids), + ("acc_counter_id", "in", self.prm_prod_ids.ids), + ] elif self.prm_cons_ids: domain_all += [("acc_counter_id", "in", self.prm_cons_ids.ids)] elif self.prm_prod_ids: @@ -101,8 +104,10 @@ class AccOperationWizard(models.TransientModel): "prm_cons_ids": self.prm_cons_ids, "prm_prod_ids": self.prm_prod_ids, "rec_ids": rec_ids, - "mess": _("Des données existent déjà pour cette période. Etes-vous" - " sûr de vouloir écraser les données existantes?") + "mess": _( + "Des données existent déjà pour cette période. Etes-vous" + " sûr de vouloir écraser les données existantes?" + ), } ) return { diff --git a/wizards/acc_operation_wizard_confirm.py b/wizards/acc_operation_wizard_confirm.py index 2b9c813d0f6c58c4fb5fec172a26725271411961..bf4d3cb8fb048c96fb49229681e50919ab98d2a4 100644 --- a/wizards/acc_operation_wizard_confirm.py +++ b/wizards/acc_operation_wizard_confirm.py @@ -1,8 +1,7 @@ # Copyright 2023 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import _, fields, models -from odoo.exceptions import UserError +from odoo import fields, models class AccOperationWizardConfirm(models.TransientModel): @@ -12,8 +11,7 @@ class AccOperationWizardConfirm(models.TransientModel): # ------------------------------------------------------ # Fields declaration # ------------------------------------------------------ - operation_id = fields.Many2one( - "acc.operation") + operation_id = fields.Many2one("acc.operation") date_start = fields.Date("Date de début") date_end = fields.Date("Date de fin") prm_cons_ids = fields.Many2many( @@ -68,6 +66,7 @@ class AccOperationWizardConfirm(models.TransientModel): self.date_start, self.date_end, self.prm_cons_ids, self.prm_prod_ids ) return {"type": "ir.actions.act_window_close"} + # ------------------------------------------------------ # Business methods # ------------------------------------------------------ diff --git a/wizards/acc_operation_wizard_confirm_views.xml b/wizards/acc_operation_wizard_confirm_views.xml index dc84e095a2ff2326176423559930bafebee495ca..a39029af22344d8f2300e7eb36e0b9907aa7dc58 100644 --- a/wizards/acc_operation_wizard_confirm_views.xml +++ b/wizards/acc_operation_wizard_confirm_views.xml @@ -7,19 +7,15 @@ <field name="arch" type="xml"> <form> <div> - <field - class="o_field_header" - name="mess" - readonly="1" - /> + <field class="o_field_header" name="mess" readonly="1" /> </div> <group> <field name="operation_id" invisible="1" /> - <field name="prm_cons_ids" invisible="1"/> - <field name="prm_prod_ids" invisible="1"/> - <field name="date_start" invisible="1"/> - <field name="date_end" invisible="1"/> - <field name="rec_ids" invisible="1"/> + <field name="prm_cons_ids" invisible="1" /> + <field name="prm_prod_ids" invisible="1" /> + <field name="date_start" invisible="1" /> + <field name="date_end" invisible="1" /> + <field name="rec_ids" invisible="1" /> </group> <footer> <button