From 6cecae288cf27321ea51479542df96750ef413cc Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sat, 31 Jan 2026 20:18:22 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/selling/doctype/quotation/quotation.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 7d67807aee1..3f30664e39b 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -617,14 +617,6 @@ def handle_mandatory_error(e, customer, lead_name): def get_ordered_items(quotation: str): return frappe._dict( frappe.get_all( -<<<<<<< HEAD - "Sales Order Item", - filters={"prevdoc_docname": quotation, "docstatus": 1}, - fields=["quotation_item", "sum(qty)"], - group_by="quotation_item", - as_list=1, -======= "Quotation Item", {"docstatus": 1, "parent": quotation}, ["name", "ordered_qty"], as_list=True ->>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation) ) )