Merge pull request #30701 from ejaazkhan/shift-type-null-in-employee-checkin
diff --git a/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py b/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py
index 81b44f8..ced42bb 100644
--- a/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py
+++ b/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py
@@ -153,6 +153,31 @@
log = make_checkin(employee, timestamp)
self.assertIsNone(log.shift)
+ def test_fetch_shift_for_assignment_with_end_date(self):
+ employee = make_employee("test_employee_checkin@example.com", company="_Test Company")
+
+ # shift setup for 8-12
+ shift1 = setup_shift_type()
+ # 12:30 - 16:30
+ shift2 = setup_shift_type(shift_type="Shift 2", start_time="12:30:00", end_time="16:30:00")
+
+ date = getdate()
+ make_shift_assignment(shift1.name, employee, date, add_days(date, 15))
+ make_shift_assignment(shift2.name, employee, date, add_days(date, 15))
+
+ timestamp = datetime.combine(date, get_time("08:45:00"))
+ log = make_checkin(employee, timestamp)
+ self.assertEqual(log.shift, shift1.name)
+
+ timestamp = datetime.combine(date, get_time("12:45:00"))
+ log = make_checkin(employee, timestamp)
+ self.assertEqual(log.shift, shift2.name)
+
+ # log after end date
+ timestamp = datetime.combine(add_days(date, 16), get_time("12:45:00"))
+ log = make_checkin(employee, timestamp)
+ self.assertIsNone(log.shift)
+
def test_shift_start_and_end_timings(self):
employee = make_employee("test_employee_checkin@example.com", company="_Test Company")
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.py b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
index 0b21c00..cbf798e 100644
--- a/erpnext/hr/doctype/shift_assignment/shift_assignment.py
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
@@ -251,7 +251,7 @@
Criterion.any(
[
assignment.end_date.isnull(),
- (assignment.end_date.isnotnull() & (getdate(for_timestamp.date()) >= assignment.end_date)),
+ (assignment.end_date.isnotnull() & (getdate(for_timestamp.date()) <= assignment.end_date)),
]
)
)