nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-03 09:12:14 +05:30
committed by GitHub
parent 1d7ba16caf
commit c6127575f5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/subcontracting_controller.py
View File

@@ -254,11 +254,7 @@ class SubcontractingController(StockController):
): ):
for row in frappe.get_all( for row in frappe.get_all(
f"{self.subcontract_data.order_doctype} Item", f"{self.subcontract_data.order_doctype} Item",
<<<<<<< HEAD fields=["item_code", "(qty - received_qty) as qty", "parent", "bom"],
fields=["item_code", "(qty - received_qty) as qty", "parent", "name"],
=======
fields=["item_code", {"SUB": ["qty", "received_qty"], "as": "qty"}, "parent", "bom"],
>>>>>>> 0d372a62a1 (fix(subcontracting): include item bom in supplied items grouping key)
filters={"docstatus": 1, "parent": ("in", self.subcontract_orders)}, filters={"docstatus": 1, "parent": ("in", self.subcontract_orders)},
): ):
self.qty_to_be_received[(row.item_code, row.parent, row.bom)] += row.qty self.qty_to_be_received[(row.item_code, row.parent, row.bom)] += row.qty