Merge pull request #434 from frePPLe/17.0

Syncing from upstream frePPLe/odoo (17.0)
brain-tec · Apr 23, 2024 · fe725f9 · fe725f9
2 parents f7fd505 + 08c3ba3
commit fe725f9
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/frepple/controllers/outbound.py b/frepple/controllers/outbound.py
@@ -1916,8 +1916,8 @@ def getReservedQuantity(stock_move_id):
 
                             yield (
                                 '<demand name=%s batch=%s quantity="%s" due="%s" priority="%s" minshipment="%s" status="%s"><item name=%s/><customer name=%s/><location name=%s/>'
-                                # Enable only in frepple >= 6.25
-                                # '<owner name=%s policy="%s" xsi:type="demand_group"/>'
+                                # Disable the next line in frepple < 6.25
+                                '<owner name=%s policy="%s" xsi:type="demand_group"/>'
                                 "</demand>\n"
                             ) % (
                                 quoteattr(sol_name),
@@ -1934,9 +1934,13 @@ def getReservedQuantity(stock_move_id):
                                 quoteattr(product["name"]),
                                 quoteattr(customer),
                                 quoteattr(location),
-                                # Enable only in frepple >= 6.25
-                                # quoteattr(i["order_id"][1]),
-                                # "alltogether" if j["picking_policy"] == "one" else "independent",
+                                # Disable the next 2 lines in frepple < 6.25
+                                quoteattr(i["order_id"][1]),
+                                (
+                                    "alltogether"
+                                    if j["picking_policy"] == "one"
+                                    else "independent"
+                                ),
                             )
                     # We are done with this line, move to the next one
                     continue