Merge pull request #30377 from marination/stock-entry-items-idx
fix: Dont set `idx` while adding WO items to Stock Entry
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index bf29474..9b6cf46 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -1025,7 +1025,7 @@
query = query.format(
table="BOM Scrap Item",
where_conditions="",
- select_columns=", bom_item.idx, item.description, is_process_loss",
+ select_columns=", item.description, is_process_loss",
is_stock_item=is_stock_item,
qty_field="stock_qty",
)
@@ -1038,7 +1038,7 @@
is_stock_item=is_stock_item,
qty_field="stock_qty" if fetch_qty_in_stock_uom else "qty",
select_columns=""", bom_item.uom, bom_item.conversion_factor, bom_item.source_warehouse,
- bom_item.idx, bom_item.operation, bom_item.include_item_in_manufacturing, bom_item.sourced_by_supplier,
+ bom_item.operation, bom_item.include_item_in_manufacturing, bom_item.sourced_by_supplier,
bom_item.description, bom_item.base_rate as rate """,
)
items = frappe.db.sql(query, {"qty": qty, "bom": bom, "company": company}, as_dict=True)
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index 3721704..8934f9c 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -1114,6 +1114,36 @@
except frappe.MandatoryError:
self.fail("Batch generation causing failing in Work Order")
+ @change_settings(
+ "Manufacturing Settings",
+ {"backflush_raw_materials_based_on": "Material Transferred for Manufacture"},
+ )
+ def test_manufacture_entry_mapped_idx_with_exploded_bom(self):
+ """Test if WO containing BOM with partial exploded items and scrap items, maps idx correctly."""
+ test_stock_entry.make_stock_entry(
+ item_code="_Test Item",
+ target="_Test Warehouse - _TC",
+ basic_rate=5000.0,
+ qty=2,
+ )
+ test_stock_entry.make_stock_entry(
+ item_code="_Test Item Home Desktop 100",
+ target="_Test Warehouse - _TC",
+ basic_rate=1000.0,
+ qty=2,
+ )
+
+ wo_order = make_wo_order_test_record(
+ qty=1,
+ use_multi_level_bom=1,
+ skip_transfer=1,
+ )
+
+ ste_manu = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 1))
+
+ for index, row in enumerate(ste_manu.get("items"), start=1):
+ self.assertEqual(index, row.idx)
+
def update_job_card(job_card, jc_qty=None):
employee = frappe.db.get_value("Employee", {"status": "Active"}, "name")
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index c0a8e14..1e62471 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -1386,7 +1386,6 @@
if self.purpose != "Send to Subcontractor" and self.purpose in ["Manufacture", "Repack"]:
scrap_item_dict = self.get_bom_scrap_material(self.fg_completed_qty)
for item in scrap_item_dict.values():
- item.idx = ""
if self.pro_doc and self.pro_doc.scrap_warehouse:
item["to_warehouse"] = self.pro_doc.scrap_warehouse
@@ -1902,7 +1901,6 @@
se_child.is_process_loss = item_row.get("is_process_loss", 0)
for field in [
- "idx",
"po_detail",
"original_item",
"expense_account",