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

Merge pull request #26348 from Anurag810/salary-slip-fix--develop

Browse Source 
fix: payroll-entry minor fix
This commit is contained in:
Jannat Patel 2021-07-08 15:44:04 +05:30 committed by GitHub
commit 1823f31f79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,6 @@ class PayrollEntry(Document):
Creates salary slip for selected employees if already not created Creates salary slip for selected employees if already not created
""" """
self.check_permission('write') self.check_permission('write')
self.created = 1
employees = [emp.employee for emp in self.employees] employees = [emp.employee for emp in self.employees]
if employees: if employees:
args = frappe._dict({ args = frappe._dict({
@ -686,7 +685,7 @@ def employee_query(doctype, txt, searchfield, start, page_len, filters):
if filters.start_date and filters.end_date: if filters.start_date and filters.end_date:
employee_list = get_employee_list(filters) employee_list = get_employee_list(filters)
emp = filters.get('employees') emp = filters.get('employees') or []
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')
filters.pop('end_date') filters.pop('end_date')