nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Smit Vora
2025-12-15 14:59:06 +05:30
parent e403dfe73a
commit edcf24afa9
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@@ -1303,20 +1303,9 @@ def get_material_request_items(
include_safety_stock, include_safety_stock,
warehouse, warehouse,
bin_dict, bin_dict,
<<<<<<< HEAD
=======
consumed_qty, consumed_qty,
>>>>>>> d344be32a0 (fix: cascade projected quantity across multiple items in material requests)
): ):
total_qty = row["qty"]
required_qty = 0 required_qty = 0
<<<<<<< HEAD
if ignore_existing_ordered_qty or bin_dict.get("projected_qty", 0) < 0:
required_qty = total_qty
elif total_qty > bin_dict.get("projected_qty", 0):
required_qty = total_qty - bin_dict.get("projected_qty", 0)
=======
item_code = row.get("item_code") 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:
@@ -1329,7 +1318,6 @@ def get_material_request_items(
consumed_qty[key] += min(flt(row.get("qty")), available_qty) consumed_qty[key] += min(flt(row.get("qty")), available_qty)
else: else:
required_qty = flt(row.get("qty")) required_qty = flt(row.get("qty"))
>>>>>>> d344be32a0 (fix: cascade projected quantity across multiple items in material requests)
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"]
@@ -1373,7 +1361,7 @@ def get_material_request_items(
"item_name": row.item_name, "item_name": row.item_name,
"quantity": required_qty / conversion_factor, "quantity": required_qty / conversion_factor,
"conversion_factor": conversion_factor, "conversion_factor": conversion_factor,
"required_bom_qty": total_qty, "required_bom_qty": row.get("qty"),
"stock_uom": row.get("stock_uom"), "stock_uom": row.get("stock_uom"),
"warehouse": warehouse "warehouse": warehouse
or row.get("source_warehouse") or row.get("source_warehouse")
@@ -1672,10 +1660,7 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
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]
for details in item_dict.values(): for details in item_dict.values():
<<<<<<< HEAD
=======
warehouse = warehouse or details.get("source_warehouse") or details.get("default_warehouse") warehouse = warehouse or details.get("source_warehouse") or details.get("default_warehouse")
>>>>>>> d344be32a0 (fix: cascade projected quantity across multiple items in material requests)
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 {}
@@ -1689,10 +1674,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,
<<<<<<< HEAD
=======
consumed_qty, consumed_qty,
>>>>>>> d344be32a0 (fix: cascade projected quantity across multiple items in material requests)
) )
if items: if items:
mr_items.append(items) mr_items.append(items)