Merge branch 'master' into develop

2017-03-15 11:28:07 +05:30
parent ee7b4f2882 c1a5b348b5
commit 56f650f342
18 changed files with 193 additions and 44 deletions
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -8,7 +8,7 @@ def get_notification_config():
 		{
 			"Issue": {"status": "Open"},
 			"Warranty Claim": {"status": "Open"},
-			"Task": {"status": "Overdue"},
+			"Task": {"status": ("in", ("Open", "Overdue"))},
 			"Project": {"status": "Open"},
 			"Item": {"total_projected_qty": ("<", 0)},
 			"Lead": {"status": "Open"},