Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order

Browse Source
This commit is contained in:
Abhishek Balam 2020-08-11 15:22:54 +05:30
parent 372abaa420
commit c992616d35
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,11 +119,19 @@ class Opportunity(TransactionBase):
and q.status not in ('Lost', 'Closed')""", self.name) and q.status not in ('Lost', 'Closed')""", self.name)
def has_ordered_quotation(self): def has_ordered_quotation(self):
return frappe.db.sql(""" if not self.with_items:
select q.name return frappe.get_all('Quotation',
from `tabQuotation` q, `tabQuotation Item` qi {
where q.name = qi.parent and q.docstatus=1 and qi.prevdoc_docname =%s 'opportunity': self.name,
and q.status = 'Ordered'""", self.name) 'status': 'Ordered',
'docstatus': 1
}, 'name')
else:
return frappe.db.sql("""
select q.name
from `tabQuotation` q, `tabQuotation Item` qi
where q.name = qi.parent and q.docstatus=1 and qi.prevdoc_docname =%s
and q.status = 'Ordered'""", self.name)
def has_lost_quotation(self): def has_lost_quotation(self):
lost_quotation = frappe.db.sql(""" lost_quotation = frappe.db.sql("""