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

Added employee name to get_employee_list query

Browse Source
This commit is contained in:
Ben Cornwell-Mott 2016-07-26 13:47:55 -07:00
parent e26a42dc7a
commit 5342ec5055
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/projects/doctype/timesheet/timesheet.py
View File

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