commit 128709155b74ad5f331943ba8e88a426f6c3eb42
author Jannat Patel <31363128+pateljannat@users.noreply.github.com> Fri Oct 08 20:15:40 2021 +0530
committer GitHub <noreply@github.com> Fri Oct 08 20:15:40 2021 +0530
tree ad8fb9c5b43f74868131af3fc919dff765094730
parent c07dfbc08bf6a8c7c866606b6280e29acb13b739
parent 6019f60d0aa5e35ce8a218c328476cb0c9b3f6bf

Merge branch 'develop' into auto-attendance-issue

erpnext/hr/doctype/shift_type/shift_type.py

diff --git a/erpnext/hr/doctype/shift_type/shift_type.py b/erpnext/hr/doctype/shift_type/shift_type.py
index e53373d..7a35b28 100644
--- a/erpnext/hr/doctype/shift_type/shift_type.py
+++ b/erpnext/hr/doctype/shift_type/shift_type.py
@@ -97,7 +97,7 @@
 		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))