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

[fix] [minor] don't show cancelled sales orders

Browse Source
This commit is contained in:
Rushabh Mehta 2016-01-06 16:46:28 +05:30
parent 0aadb9e213
commit 1ee5ae1e25
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -518,7 +518,9 @@ def get_events(start, end, filters=None):
data = frappe.db.sql("""select name, customer_name, delivery_status, billing_status, delivery_date data = frappe.db.sql("""select name, customer_name, delivery_status, billing_status, delivery_date
from `tabSales Order` from `tabSales Order`
where (ifnull(delivery_date, '0000-00-00')!= '0000-00-00') \ where (ifnull(delivery_date, '0000-00-00')!= '0000-00-00') \
and (delivery_date between %(start)s and %(end)s) {conditions} and (delivery_date between %(start)s and %(end)s)
and docstatus < 2
{conditions}
""".format(conditions=conditions), { """.format(conditions=conditions), {
"start": start, "start": start,
"end": end "end": end