nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-01-31 20:18:22 +05:30
committed by GitHub
parent 2c74491eb6
commit 6cecae288c
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/doctype/quotation/quotation.py
View File

@@ -617,14 +617,6 @@ def handle_mandatory_error(e, customer, lead_name):
def get_ordered_items(quotation: str): def get_ordered_items(quotation: str):
return frappe._dict( return frappe._dict(
frappe.get_all( 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 "Quotation Item", {"docstatus": 1, "parent": quotation}, ["name", "ordered_qty"], as_list=True
>>>>>>> 4cc306d2d8 (fix: validate over ordering of quotation)
) )
) )