Skip to content
Extraits de code Groupes Projets
Valider f91c8243 rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[UPD]Pre commit

parent eb5aeb43
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -81,11 +81,14 @@ class AccOperationWizard(models.TransientModel): ...@@ -81,11 +81,14 @@ class AccOperationWizard(models.TransientModel):
domain_all = [ domain_all = [
("date_slot", ">=", self.date_start), ("date_slot", ">=", self.date_start),
("date_slot", "<=", self.date_end), ("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: if self.prm_cons_ids and self.prm_prod_ids:
domain_all += ["|", ("acc_counter_id", "in", self.prm_cons_ids.ids), domain_all += [
("acc_counter_id", "in", self.prm_prod_ids.ids)] "|",
("acc_counter_id", "in", self.prm_cons_ids.ids),
("acc_counter_id", "in", self.prm_prod_ids.ids),
]
elif self.prm_cons_ids: elif self.prm_cons_ids:
domain_all += [("acc_counter_id", "in", self.prm_cons_ids.ids)] domain_all += [("acc_counter_id", "in", self.prm_cons_ids.ids)]
elif self.prm_prod_ids: elif self.prm_prod_ids:
...@@ -101,8 +104,10 @@ class AccOperationWizard(models.TransientModel): ...@@ -101,8 +104,10 @@ class AccOperationWizard(models.TransientModel):
"prm_cons_ids": self.prm_cons_ids, "prm_cons_ids": self.prm_cons_ids,
"prm_prod_ids": self.prm_prod_ids, "prm_prod_ids": self.prm_prod_ids,
"rec_ids": rec_ids, "rec_ids": rec_ids,
"mess": _("Des données existent déjà pour cette période. Etes-vous" "mess": _(
" sûr de vouloir écraser les données existantes?") "Des données existent déjà pour cette période. Etes-vous"
" sûr de vouloir écraser les données existantes?"
),
} }
) )
return { return {
......
# Copyright 2023 Le Filament (<http://www.le-filament.com>) # Copyright 2023 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import _, fields, models from odoo import fields, models
from odoo.exceptions import UserError
class AccOperationWizardConfirm(models.TransientModel): class AccOperationWizardConfirm(models.TransientModel):
...@@ -12,8 +11,7 @@ class AccOperationWizardConfirm(models.TransientModel): ...@@ -12,8 +11,7 @@ class AccOperationWizardConfirm(models.TransientModel):
# ------------------------------------------------------ # ------------------------------------------------------
# Fields declaration # Fields declaration
# ------------------------------------------------------ # ------------------------------------------------------
operation_id = fields.Many2one( operation_id = fields.Many2one("acc.operation")
"acc.operation")
date_start = fields.Date("Date de début") date_start = fields.Date("Date de début")
date_end = fields.Date("Date de fin") date_end = fields.Date("Date de fin")
prm_cons_ids = fields.Many2many( prm_cons_ids = fields.Many2many(
...@@ -68,6 +66,7 @@ class AccOperationWizardConfirm(models.TransientModel): ...@@ -68,6 +66,7 @@ class AccOperationWizardConfirm(models.TransientModel):
self.date_start, self.date_end, self.prm_cons_ids, self.prm_prod_ids self.date_start, self.date_end, self.prm_cons_ids, self.prm_prod_ids
) )
return {"type": "ir.actions.act_window_close"} return {"type": "ir.actions.act_window_close"}
# ------------------------------------------------------ # ------------------------------------------------------
# Business methods # Business methods
# ------------------------------------------------------ # ------------------------------------------------------
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<div> <div>
<field <field class="o_field_header" name="mess" readonly="1" />
class="o_field_header"
name="mess"
readonly="1"
/>
</div> </div>
<group> <group>
<field name="operation_id" invisible="1" /> <field name="operation_id" invisible="1" />
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter