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

[minor] fixes #6074;

Browse Source
This commit is contained in:
Rushabh Mehta 2016-08-12 10:36:59 +05:30
parent 730f3e7aba
commit d643f2b249
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/projects/doctype/project/project.py
View File

@ -18,8 +18,10 @@ class Project(Document):
if not self.get('__unsaved') and not self.get("tasks"): if not self.get('__unsaved') and not self.get("tasks"):
self.load_tasks() self.load_tasks()
self.set_onload('activity_summary', frappe.db.sql('''select activity_type, sum(hours) as total_hours self.set_onload('activity_summary', frappe.db.sql('''select activity_type,
from `tabTimesheet Detail` where project=%s group by activity_type order by total_hours desc''', self.name, as_dict=True)) 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): def __setup__(self):
self.onload() self.onload()
@ -187,12 +189,12 @@ def get_list_context(context=None):
"row_template": "templates/includes/projects/project_row.html" "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) return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name)
from `tabUser` from `tabUser`
where enabled=1 where enabled=1
and name not in ("Guest", "Administrator") and name not in ("Guest", "Administrator")
order by order by
name asc""") name asc""")
@frappe.whitelist() @frappe.whitelist()