Merge pull request #418 from frePPLe/16.0

Syncing from upstream frePPLe/odoo (16.0)
brain-tec · Feb 20, 2024 · 7b5d16c · 7b5d16c
2 parents ae4476f + f595138
commit 7b5d16c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frepple/controllers/inbound.py b/frepple/controllers/inbound.py
@@ -588,7 +588,7 @@ def run(self):
                         if wo_data:
                             for wo in mo.workorder_ids:
                                 for rec in wo_data:
-                                    if rec["id"] == wo.operation_id.id:
+                                    if rec["id"] == wo.id:
                                         # By default odoo populates the scheduled start date field only when you confirm and plan
                                         # the manufacturing order.
                                         # Here we are already updating it earlier

diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py
@@ -2422,7 +2422,7 @@ def export_manufacturingorders(self):
                                 )
 
                     yield '<suboperation><operation name=%s priority="%s" type="operation_fixed_time" duration="%s"><location name=%s/><flows>' % (
-                        quoteattr(suboperation),
+                        quoteattr("%s - %s" % (suboperation, wo["id"])),
                         idx,
                         self.convert_float_time(
                             max(time_left, 1),  # Miniminum 1 minute remaining :-)
@@ -2579,7 +2579,7 @@ def export_manufacturingorders(self):
                         wo_date,
                         qty,
                         state,
-                        quoteattr(suboperation),
+                        quoteattr("%s - %s" % (suboperation, wo["id"])),
                         quoteattr(i["name"]),
                     )
                     if (