Skip to content

Commit

Permalink
Merge pull request #500 from frePPLe/17.0
Browse files Browse the repository at this point in the history
Syncing from upstream frePPLe/odoo (17.0)
  • Loading branch information
bt-admin authored Jan 18, 2025
2 parents 57ebe8e + eb23784 commit b6d6959
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions frepple/controllers/outbound.py
Original file line number Diff line number Diff line change
Expand Up @@ -2825,13 +2825,20 @@ def export_orderpoints(self):
)
if not item:
continue
warehouse = (
self.warehouses.get(i["warehouse_id"][0])
if i["warehouse_id"]
else None
)
if not warehouse:
continue
uom_factor = self.convert_qty_uom(
1.0,
i["product_uom"][0],
self.product_product[i["product_id"][0]]["template"],
)
yield '<buffer name=%s minimum="%f" maximum="%f"><item name=%s/><location name=%s/></buffer>\n' % (
quoteattr("%s @ %s" % (item["name"], i["warehouse_id"][1])),
quoteattr("%s @ %s" % (item["name"], warehouse)),
((i["product_min_qty"] or 0) * uom_factor),
((i["product_max_qty"] or 0) * uom_factor),
quoteattr(item["name"]),
Expand Down Expand Up @@ -2860,12 +2867,19 @@ def export_orderpoints(self):
)
if not item:
continue
warehouse = (
self.warehouses.get(i["warehouse_id"][0])
if i["warehouse_id"]
else None
)
if not warehouse:
continue
uom_factor = self.convert_qty_uom(
1.0,
i["product_uom"][0],
self.product_product[i["product_id"][0]]["template"],
)
name = "%s @ %s" % (item["name"], i["warehouse_id"][1])
name = "%s @ %s" % (item["name"], warehouse)
if i["product_min_qty"]:
yield """
<calendar name=%s default="0"><buckets>
Expand Down

0 comments on commit b6d6959

Please sign in to comment.