From 5342ec5055be50e43e657d2b9a5d2860a56f4ce9 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Tue, 26 Jul 2016 13:47:55 -0700 Subject: [PATCH] Added employee name to get_employee_list query --- erpnext/projects/doctype/timesheet/timesheet.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 895ace379e..fcea9858b3 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -293,7 +293,8 @@ def get_activity_cost(employee=None, activity_type=None): @frappe.whitelist() def get_employee_list(doctype, txt, searchfield, start, page_len, filters): - return frappe.db.sql("""select distinct(employee) as employee + test = frappe.db.sql("""select distinct employee, employee_name from `tabSalary Structure` where salary_slip_based_on_timesheet=1 and employee like %(txt)s limit %(start)s, %(page_len)s""", - {'txt': "%%%s%%"%(txt), 'start': start, 'page_len': page_len}) + {'txt': "%%%s%%"% txt, '_txt': txt.replace("%", ""), 'start': start, 'page_len': page_len}) + return test \ No newline at end of file