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

Merge pull request #9401 from sagarvora/so-calendar

Browse Source 
[fix] get status in calendar view and show green background
This commit is contained in:
Makarand Bauskar 2017-06-21 12:41:27 +05:30 committed by GitHub
commit 9b5d1fc458
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

2
erpnext/selling/doctype/sales_order/sales_order_calendar.js
View File

@ -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") {