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

fix(crm): align Opportunity status checks with Quotation statuses (#57489)

Browse Source
This commit is contained in:
Raffael Meyer
2026-07-27 11:20:22 +02:00
committed by GitHub
parent 70fa8c0c2a
commit 8b37c52187
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/crm/doctype/opportunity/opportunity.py
View File

@@ -286,7 +286,11 @@ class Opportunity(TransactionBase, CRMNote):
if not self.get("items", []):
return frappe.get_all(
"Quotation",
{"opportunity": self.name, "status": ("not in", ["Lost", "Closed"]), "docstatus": 1},
{
"opportunity": self.name,
"status": ("not in", ["Lost", "Cancelled", "Expired"]),
"docstatus": 1,
},
"name",
)
else:
@@ -300,7 +304,7 @@ class Opportunity(TransactionBase, CRMNote):
.where(
(q.docstatus == 1)
& (qi.prevdoc_docname == self.name)
& q.status.notin(["Lost", "Closed"])
& q.status.notin(["Lost", "Cancelled", "Expired"])
)
.run()
)
@@ -308,7 +312,13 @@ class Opportunity(TransactionBase, CRMNote):
def has_ordered_quotation(self):
if not self.get("items", []):
return frappe.get_all(
"Quotation", {"opportunity": self.name, "status": "Ordered", "docstatus": 1}, "name"
"Quotation",
{
"opportunity": self.name,
"status": ("in", ["Ordered", "Partially Ordered"]),
"docstatus": 1,
},
"name",
)
else:
q = frappe.qb.DocType("Quotation")
@@ -318,7 +328,11 @@ class Opportunity(TransactionBase, CRMNote):
.inner_join(qi)
.on(q.name == qi.parent)
.select(q.name)
.where((q.docstatus == 1) & (qi.prevdoc_docname == self.name) & (q.status == "Ordered"))
.where(
(q.docstatus == 1)
& (qi.prevdoc_docname == self.name)
& (q.status.isin(["Ordered", "Partially Ordered"]))
)
.run()
)