mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 16:34:46 +00:00
fix: cascade projected quantity across multiple items in material requests
This commit is contained in:
@@ -1408,14 +1408,21 @@ def get_material_request_items(
|
|||||||
include_safety_stock,
|
include_safety_stock,
|
||||||
warehouse,
|
warehouse,
|
||||||
bin_dict,
|
bin_dict,
|
||||||
total_qty,
|
consumed_qty,
|
||||||
):
|
):
|
||||||
required_qty = 0
|
required_qty = 0
|
||||||
|
item_code = row.get("item_code")
|
||||||
|
|
||||||
if not ignore_existing_ordered_qty or bin_dict.get("projected_qty", 0) < 0:
|
if not ignore_existing_ordered_qty or bin_dict.get("projected_qty", 0) < 0:
|
||||||
required_qty = total_qty[row.get("item_code")]
|
required_qty = flt(row.get("qty"))
|
||||||
elif total_qty[row.get("item_code")] > bin_dict.get("projected_qty", 0):
|
else:
|
||||||
required_qty = total_qty[row.get("item_code")] - bin_dict.get("projected_qty", 0)
|
key = (item_code, warehouse)
|
||||||
total_qty[row.get("item_code")] -= required_qty
|
available_qty = flt(bin_dict.get("projected_qty", 0)) - consumed_qty[key]
|
||||||
|
if available_qty > 0:
|
||||||
|
required_qty = max(0, flt(row.get("qty")) - available_qty)
|
||||||
|
consumed_qty[key] += min(flt(row.get("qty")), available_qty)
|
||||||
|
else:
|
||||||
|
required_qty = flt(row.get("qty"))
|
||||||
|
|
||||||
if doc.get("consider_minimum_order_qty") and required_qty > 0 and required_qty < row["min_order_qty"]:
|
if doc.get("consider_minimum_order_qty") and required_qty > 0 and required_qty < row["min_order_qty"]:
|
||||||
required_qty = row["min_order_qty"]
|
required_qty = row["min_order_qty"]
|
||||||
@@ -1757,11 +1764,12 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
|
|||||||
so_item_details[sales_order][key] = details
|
so_item_details[sales_order][key] = details
|
||||||
|
|
||||||
mr_items = []
|
mr_items = []
|
||||||
|
consumed_qty = defaultdict(float)
|
||||||
|
|
||||||
for sales_order in so_item_details:
|
for sales_order in so_item_details:
|
||||||
item_dict = so_item_details[sales_order]
|
item_dict = so_item_details[sales_order]
|
||||||
total_qty = defaultdict(float)
|
|
||||||
for details in item_dict.values():
|
for details in item_dict.values():
|
||||||
total_qty[details.item_code] += flt(details.qty)
|
warehouse = warehouse or details.get("source_warehouse") or details.get("default_warehouse")
|
||||||
bin_dict = get_bin_details(details, doc.company, warehouse)
|
bin_dict = get_bin_details(details, doc.company, warehouse)
|
||||||
bin_dict = bin_dict[0] if bin_dict else {}
|
bin_dict = bin_dict[0] if bin_dict else {}
|
||||||
|
|
||||||
@@ -1775,7 +1783,7 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
|
|||||||
include_safety_stock,
|
include_safety_stock,
|
||||||
warehouse,
|
warehouse,
|
||||||
bin_dict,
|
bin_dict,
|
||||||
total_qty,
|
consumed_qty,
|
||||||
)
|
)
|
||||||
if items:
|
if items:
|
||||||
mr_items.append(items)
|
mr_items.append(items)
|
||||||
|
|||||||
Reference in New Issue
Block a user