From d643f2b2493c183ac8d01c4853aa86856e6199e9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 12 Aug 2016 10:36:59 +0530 Subject: [PATCH] [minor] fixes #6074; --- erpnext/projects/doctype/project/project.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index f5ff2de3f9..bdf3c3bd1f 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -18,8 +18,10 @@ class Project(Document): if not self.get('__unsaved') and not self.get("tasks"): self.load_tasks() - self.set_onload('activity_summary', frappe.db.sql('''select activity_type, sum(hours) as total_hours - from `tabTimesheet Detail` where project=%s group by activity_type order by total_hours desc''', self.name, as_dict=True)) + self.set_onload('activity_summary', frappe.db.sql('''select activity_type, + sum(hours) as total_hours + from `tabTimesheet Detail` where project=%s and docstatus < 2 group by activity_type + order by total_hours desc''', self.name, as_dict=True)) def __setup__(self): self.onload() @@ -187,12 +189,12 @@ def get_list_context(context=None): "row_template": "templates/includes/projects/project_row.html" } -def get_users_for_project(doctype, txt, searchfield, start, page_len, filters): +def get_users_for_project(doctype, txt, searchfield, start, page_len, filters): return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name) - from `tabUser` - where enabled=1 + from `tabUser` + where enabled=1 and name not in ("Guest", "Administrator") - order by + order by name asc""") @frappe.whitelist()