nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-20 15:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27850 from pateljannat/auto-attendance-issue

Browse Source 
fix: exclude inactive  employees from auto attendance
This commit is contained in:
Jannat Patel
2021-10-14 12:48:22 +05:30
committed by GitHub
parent 904381295e 00f7f97dc9
commit 8de5f1f04d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/shift_type/shift_type.py
View File

@@ -97,7 +97,7 @@ class ShiftType(Document):
assigned_employees = [x[0] for x in assigned_employees]
if consider_default_shift:
filters = {'default_shift': self.name}
filters = {'default_shift': self.name, 'status': ['!=', 'Inactive']}
default_shift_employees = frappe.get_all('Employee', 'name', filters, as_list=True)
default_shift_employees = [x[0] for x in default_shift_employees]
return list(set(assigned_employees+default_shift_employees))