Merge pull request #478 from frePPLe/17.0

Syncing from upstream frePPLe/odoo (17.0)
brain-tec · Sep 7, 2024 · 21f5796 · 21f5796
2 parents 9ff3f31 + c5e7f80
commit 21f5796
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py
@@ -639,9 +639,8 @@ def export_calendar(self):
                     "resource_id",
                 ],
             ):
-                calendar_name = "%s %s" % (i["calendar_id"][1], i["calendar_id"][0])
-
                 if i["calendar_id"] and i["calendar_id"][0] in cal_ids:
+                    calendar_name = "%s %s" % (i["calendar_id"][1], i["calendar_id"][0])
                     if not i["resource_id"]:
                         if calendar_name not in calendars:
                             calendars[calendar_name] = []
@@ -671,6 +670,8 @@ def export_calendar(self):
                                     "calendar for %s"
                                     % (self.resources_with_specific_calendars[res],)
                                 ].append(i)
+                # else:
+                #    TODO   Handle company-wide leaves that apply to all calendars
 
             # Iterate over the results:
             for i in calendars: