Merge pull request #27984 from frappe/mergify/bp/version-13-hotfix/pr…

…-27850
frappe · Oct 18, 2021 · 07a9f16 · 07a9f16
2 parents 268893d + acc5cff
commit 07a9f16
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/erpnext/hr/doctype/shift_type/shift_type.py b/erpnext/hr/doctype/shift_type/shift_type.py
@@ -97,7 +97,7 @@ def get_assigned_employee(self, from_date=None, consider_default_shift=False):
 		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))