From c6127575f5814c8b2a116c557824aaae8b401209 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 3 Feb 2026 09:12:14 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/controllers/subcontracting_controller.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index 6d7d5d5d579..246693d2d01 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -254,11 +254,7 @@ class SubcontractingController(StockController): ): for row in frappe.get_all( f"{self.subcontract_data.order_doctype} Item", -<<<<<<< HEAD - 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) + fields=["item_code", "(qty - received_qty) as qty", "parent", "bom"], filters={"docstatus": 1, "parent": ("in", self.subcontract_orders)}, ): self.qty_to_be_received[(row.item_code, row.parent, row.bom)] += row.qty