From 6371b53b7ef3ff1d868cecba2033fbcae942105b Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 21 Jun 2017 11:58:09 +0530 Subject: [PATCH] [fix] get status in calendar view and show green background --- erpnext/selling/doctype/sales_order/sales_order.py | 2 +- erpnext/selling/doctype/sales_order/sales_order_calendar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 8295075226..ccaa07c194 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -608,7 +608,7 @@ def get_events(start, end, filters=None): from frappe.desk.calendar import get_event_conditions conditions = get_event_conditions("Sales Order", filters) - data = frappe.db.sql("""select name, customer_name, delivery_status, billing_status, delivery_date + data = frappe.db.sql("""select name, customer_name, status, delivery_status, billing_status, delivery_date from `tabSales Order` where (ifnull(delivery_date, '0000-00-00')!= '0000-00-00') \ and (delivery_date between %(start)s and %(end)s) diff --git a/erpnext/selling/doctype/sales_order/sales_order_calendar.js b/erpnext/selling/doctype/sales_order/sales_order_calendar.js index 7a38f90079..cb412cfb4a 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_calendar.js +++ b/erpnext/selling/doctype/sales_order/sales_order_calendar.js @@ -33,7 +33,7 @@ frappe.views.calendar["Sales Order"] = { get_events_method: "erpnext.selling.doctype.sales_order.sales_order.get_events", get_css_class: function(data) { if(data.status=="Closed") { - return ""; + return "success"; } if(data.delivery_status=="Not Delivered") { return "danger"; } else if(data.delivery_status=="Partly Delivered") {