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

Corrected SQL query

Browse Source
This commit is contained in:
bcornwellmott 2016-07-28 06:56:20 -07:00 committed by GitHub
parent 19cb34ce40
commit 5f59a0a00f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,5 +295,5 @@ def get_activity_cost(employee=None, activity_type=None):
def get_employee_list(doctype, txt, searchfield, start, page_len, filters):
return 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, '_txt': txt.replace("%", ""), 'start': start, 'page_len': page_len})
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})