nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5901 from bcornwellmott/fix_employee_lookup

Browse Source 
Fix Timesheet employee query to show names
This commit is contained in:
Nabin Hait
2016-07-29 16:28:18 +05:30
committed by GitHub
parent 1892520324 e326ae95ef
commit 95c2ba9736
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,7 @@ def get_activity_cost(employee=None, activity_type=None):
@frappe.whitelist() @frappe.whitelist()
def get_employee_list(doctype, txt, searchfield, start, page_len, filters): def get_employee_list(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""select distinct(employee) as employee return frappe.db.sql("""select distinct employee, employee_name
from `tabSalary Structure` where salary_slip_based_on_timesheet=1 from `tabSalary Structure` where salary_slip_based_on_timesheet=1
and employee like %(txt)s limit %(start)s, %(page_len)s""", and employee like %(txt)s or employee_name like %(txt)s limit %(start)s, %(page_len)s""",
{'txt': "%%%s%%"%(txt), 'start': start, 'page_len': page_len}) {'txt': "%%%s%%"% txt, 'start': start, 'page_len': page_len})