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

chore: resolve conflicts

Browse Source
This commit is contained in:
Smit Vora
2025-10-13 19:45:04 +05:30
parent 467fcea728
commit 75d14985e0
1 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1573,12 +1573,11 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
frappe.throw(_("For row {0}: Enter Planned Qty").format(data.get("idx"))) frappe.throw(_("For row {0}: Enter Planned Qty").format(data.get("idx")))
if bom_no: if bom_no:
<<<<<<< HEAD
if data.get("include_exploded_items") and doc.get("skip_available_sub_assembly_item"): if data.get("include_exploded_items") and doc.get("skip_available_sub_assembly_item"):
item_details = {} item_details = {}
if doc.get("sub_assembly_items"): if doc.get("sub_assembly_items"):
item_details = get_raw_materials_of_sub_assembly_items( item_details = get_raw_materials_of_sub_assembly_items(
so_item_details[doc.get("sales_order")].keys() if so_item_details else [], existing_sub_assembly_items,
item_details, item_details,
company, company,
bom_no, bom_no,
@@ -1586,22 +1585,6 @@ def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_d
sub_assembly_items, sub_assembly_items,
planned_qty=planned_qty, planned_qty=planned_qty,
) )
=======
if (
data.get("include_exploded_items")
and doc.get("skip_available_sub_assembly_item")
and doc.get("sub_assembly_items")
):
item_details = get_raw_materials_of_sub_assembly_items(
existing_sub_assembly_items,
item_details,
company,
bom_no,
include_non_stock_items,
sub_assembly_items,
planned_qty=planned_qty,
)
>>>>>>> f912c8419a (fix: enhance sub-assembly item handling in raw material request calculations)
elif data.get("include_exploded_items") and include_subcontracted_items: elif data.get("include_exploded_items") and include_subcontracted_items:
# fetch exploded items from BOM # fetch exploded items from BOM