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

[Fix] Calendar view for sales order

Browse Source
This commit is contained in:
Rohit Waghchaure 2017-07-25 15:34:20 +05:30
parent 3b128cabb2
commit d62fa84ed9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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