From ef710de9f5d55a87654baa62e0ae39ba2e135b8d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 6 Jan 2026 21:02:44 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/selling/doctype/sales_order/sales_order.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 6e202b2c68d..f9f5fa6f6e6 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -831,18 +831,8 @@ def get_requested_item_qty(sales_order): for d in frappe.db.get_all( "Material Request Item", filters={"docstatus": 1, "sales_order": sales_order}, -<<<<<<< HEAD - fields=["sales_order_item", "sum(qty) as qty", "sum(received_qty) as received_qty"], - group_by="sales_order_item", -======= - fields=[ - "sales_order_item", - "packed_item", - {"SUM": "qty", "as": "qty"}, - {"SUM": "received_qty", "as": "received_qty"}, - ], + fields=["sales_order_item", "packed_item", "sum(qty) as qty", "sum(received_qty) as received_qty"], group_by="sales_order_item, packed_item", ->>>>>>> 6ade609dd6 (fix(material-request): get remaining qty on partial transaction with product bundle) ): result[d.sales_order_item or d.packed_item] = frappe._dict( {"qty": d.qty, "received_qty": d.received_qty}