Skip to content
Extraits de code Groupes Projets
Valider ecf8fba5 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament Validation de Julien - Le Filament
Parcourir les fichiers

[FIX] search on priority group counter

parent e1516878
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!19[FIX] search on priority group counter
...@@ -361,20 +361,18 @@ class AccOperation(models.Model): ...@@ -361,20 +361,18 @@ class AccOperation(models.Model):
res = [ res = [
datetime.strptime(d, "%d-%m-%y") datetime.strptime(d, "%d-%m-%y")
for d in list( for d in list(
OrderedDict.fromkeys( OrderedDict.fromkeys([h.strftime("%d-%m-%y") for h in date_list])
[h.strftime("%d-%m-%y") for h in date_list]
)
) )
] ]
for date in res: for date_item in res:
counter_period[date] = ( counter_period[date_item] = (
self.env["acc.counter.period"] self.env["acc.counter.period"]
._get_periods_from_date( ._get_periods_from_date(
[ [
("acc_operation_id", "=", self.id), ("acc_operation_id", "=", self.id),
("prm_type", "=", "delivery"), ("prm_type", "=", "delivery"),
], ],
date, date_item,
) )
.mapped("acc_counter_id.name") .mapped("acc_counter_id.name")
) )
......
...@@ -49,7 +49,6 @@ class AccPriorityGroup(models.Model): ...@@ -49,7 +49,6 @@ class AccPriorityGroup(models.Model):
for prio_group in self: for prio_group in self:
prio_group.display_name = f"Priorité {str(prio_group.sequence)}" prio_group.display_name = f"Priorité {str(prio_group.sequence)}"
def _compute_counter_datas(self): def _compute_counter_datas(self):
for priority in self: for priority in self:
priority.counter_datas = ( priority.counter_datas = (
...@@ -77,7 +76,6 @@ class AccPriorityGroup(models.Model): ...@@ -77,7 +76,6 @@ class AccPriorityGroup(models.Model):
return res return res
@api.model @api.model
def unlink(self, _id): def unlink(self, _id):
self = self.env["acc.priority.group"].browse(_id) self = self.env["acc.priority.group"].browse(_id)
......
...@@ -98,4 +98,13 @@ class AccPriorityGroupCounter(models.Model): ...@@ -98,4 +98,13 @@ class AccPriorityGroupCounter(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
def _group_expand_acc_priority_group_id(self, groups, domain, order): def _group_expand_acc_priority_group_id(self, groups, domain, order):
return self.env["acc.priority.group"].search(domain=domain, order=order) operation_id = self.env.context.get("default_acc_operation_id")
if not operation_id:
group_ids = self.env["acc.priority.group"].search(
domain=[], order="sequence, id"
)
else:
group_ids = self.env["acc.priority.group"].search(
domain=[("acc_operation_id", "=", operation_id)], order="sequence, id"
)
return group_ids
...@@ -9,9 +9,7 @@ class AccRepartitionCounter(models.Model): ...@@ -9,9 +9,7 @@ class AccRepartitionCounter(models.Model):
acc_repartition_id = fields.Many2one("acc.repartition.keys", "Clé", required=True) acc_repartition_id = fields.Many2one("acc.repartition.keys", "Clé", required=True)
weight = fields.Float(string="Répartition en pourcentage", required=False) weight = fields.Float(string="Répartition en pourcentage", required=False)
time_slot = fields.Datetime("Horodatage de la clé", required=True) time_slot = fields.Datetime("Horodatage de la clé", required=True)
acc_counter_id = fields.Many2one( acc_counter_id = fields.Many2one("acc.counter", string="Compteur", required=True)
"acc.counter", string="Compteur", required=True
)
acc_operation_id = fields.Many2one( acc_operation_id = fields.Many2one(
comodel_name="acc.operation", compute="_compute_operation_id", store=True comodel_name="acc.operation", compute="_compute_operation_id", store=True
) )
...@@ -27,6 +25,7 @@ class AccRepartitionCounter(models.Model): ...@@ -27,6 +25,7 @@ class AccRepartitionCounter(models.Model):
""" """
) )
# ------------------------------------------------------ # ------------------------------------------------------
# SQL Constraints # SQL Constraints
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -9,7 +9,8 @@ export class PriorityGroupKanbanController extends KanbanController { ...@@ -9,7 +9,8 @@ export class PriorityGroupKanbanController extends KanbanController {
async CreatePriorityGroupClick() { async CreatePriorityGroupClick() {
self = this; self = this;
this.actionService.doAction({ this.actionService.doAction(
{
type: "ir.actions.act_window", type: "ir.actions.act_window",
res_model: "acc.priority.group", res_model: "acc.priority.group",
name: "Creer un groupe de priorité", name: "Creer un groupe de priorité",
...@@ -24,8 +25,9 @@ export class PriorityGroupKanbanController extends KanbanController { ...@@ -24,8 +25,9 @@ export class PriorityGroupKanbanController extends KanbanController {
onClose: async () => { onClose: async () => {
await self.model.root.load(); await self.model.root.load();
self.render(true); self.render(true);
},
} }
}); );
} }
} }
......
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