From 4de5a32a65f6c697b7d379f8661be5f0f8c8c2da Mon Sep 17 00:00:00 2001 From: Hicham Lahlou Date: Wed, 17 Jan 2024 22:17:51 +0100 Subject: [PATCH] fix calendar-work center association if work center and resource have a different id --- frepple/controllers/outbound.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py index 813bf572..684e51a0 100644 --- a/frepple/controllers/outbound.py +++ b/frepple/controllers/outbound.py @@ -499,13 +499,13 @@ def export_calendar(self): "mrp.workcenter", search=[("resource_calendar_id", "!=", False)], fields=[ - "id", + "resource_id", "resource_calendar_id", ], ): if i["resource_calendar_id"][0] not in calendar_resource: calendar_resource[i["resource_calendar_id"][0]] = set() - calendar_resource[i["resource_calendar_id"][0]].add(i["id"]) + calendar_resource[i["resource_calendar_id"][0]].add(i["resource_id"][0]) # Read from the attendance/leaves which resource has specific entries self.resources_with_specific_calendars = {} @@ -884,6 +884,7 @@ def export_workcenters(self): "mrp.workcenter", fields=[ "name", + "resource_id", "owner", "resource_calendar_id", "time_efficiency", @@ -899,10 +900,10 @@ def export_workcenters(self): owner = i["owner"] available = ( i["resource_calendar_id"] - if not self.resources_with_specific_calendars.get(i["id"]) + if not self.resources_with_specific_calendars.get(i["resource_id"][0]) else ( 0, - "calendar for %s" % (name,), + "calendar for %s" % (i["resource_id"][1],), ) ) self.map_workcenters[i["id"]] = name