Merge pull request #383 from frePPLe/16.0

Syncing from upstream frePPLe/odoo (16.0)
brain-tec · Nov 24, 2023 · 9c11353 · 9c11353
2 parents 62ce9a8 + a8208d2
commit 9c11353
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py
@@ -375,7 +375,7 @@ def load_operation_types(self):
                 )
                 if i["default_location_dest_id"]
                 else None,
-                "warehouse_id": self.warehouses[i["warehouse_id"][0]]
+                "warehouse_id": self.warehouses.get(i["warehouse_id"][0], None)
                 if i["warehouse_id"]
                 else None,
             }
@@ -2152,7 +2152,7 @@ def export_manufacturingorders(self):
 
             if not wo_list:
                 # There are no workorders on the manufacturing order
-                yield '<operation name=%s xsi:type="operation_fixed_time"><location name=%s/><item name=%s/><flows>' % (
+                yield '<operation name=%s xsi:type="operation_fixed_time" priority="0"><location name=%s/><item name=%s/><flows>' % (
                     quoteattr(operation),
                     quoteattr(location),
                     quoteattr(item["name"]),