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

fix: review chnages

Browse Source
This commit is contained in:
Anupam 2021-06-10 19:32:00 +05:30
parent bf0528413d
commit 32ebb1001e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/payroll/doctype/payroll_entry/payroll_entry.py
View File

@ -665,6 +665,8 @@ def get_employee_list(filters):
emp_list = remove_payrolled_employees(emp_list, filters.start_date, filters.end_date) emp_list = remove_payrolled_employees(emp_list, filters.start_date, filters.end_date)
return emp_list return emp_list
return []
@frappe.whitelist() @frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs
def employee_query(doctype, txt, searchfield, start, page_len, filters): def employee_query(doctype, txt, searchfield, start, page_len, filters):
@ -673,7 +675,7 @@ def employee_query(doctype, txt, searchfield, start, page_len, filters):
include_employees = [] include_employees = []
emp_cond = '' emp_cond = ''
if filters.start_date and filters.end_date: if filters.start_date and filters.end_date:
employee_list = get_employee_list(filters) or [] employee_list = get_employee_list(filters)
emp = filters.get('employees') emp = filters.get('employees')
include_employees = [employee.employee for employee in employee_list if employee.employee not in emp] include_employees = [employee.employee for employee in employee_list if employee.employee not in emp]
filters.pop('start_date') filters.pop('start_date')