diff --git a/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py b/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py index 03c392746c..30f469989a 100644 --- a/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py +++ b/erpnext/hr/doctype/employee_checkin/test_employee_checkin.py @@ -6,7 +6,15 @@ from datetime import datetime, timedelta import frappe from frappe.tests.utils import FrappeTestCase -from frappe.utils import add_days, get_time, getdate, now_datetime, nowdate +from frappe.utils import ( + add_days, + get_time, + get_year_ending, + get_year_start, + getdate, + now_datetime, + nowdate, +) from erpnext.hr.doctype.employee.test_employee import make_employee from erpnext.hr.doctype.employee_checkin.employee_checkin import ( @@ -15,6 +23,7 @@ from erpnext.hr.doctype.employee_checkin.employee_checkin import ( mark_attendance_and_link_log, ) from erpnext.hr.doctype.leave_application.test_leave_application import get_first_sunday +from erpnext.payroll.doctype.salary_slip.test_salary_slip import make_holiday_list class TestEmployeeCheckin(FrappeTestCase): @@ -200,13 +209,15 @@ class TestEmployeeCheckin(FrappeTestCase): self.assertEqual(log.shift_actual_end, datetime.combine(date, get_time("02:00:00"))) def test_no_shift_fetched_on_a_holiday(self): - employee = make_employee("test_shift_with_holiday@example.com", company="_Test Company") - setup_shift_type( - shift_type="Test Holiday Shift", holiday_list="Salary Slip Test Holiday List" - ) date = getdate() + from_date = get_year_start(date) + to_date = get_year_ending(date) + holiday_list = make_holiday_list() - first_sunday = get_first_sunday("Salary Slip Test Holiday List", for_date=date) + employee = make_employee("test_shift_with_holiday@example.com", company="_Test Company") + setup_shift_type(shift_type="Test Holiday Shift", holiday_list=holiday_list) + + first_sunday = get_first_sunday(holiday_list, for_date=date) timestamp = datetime.combine(first_sunday, get_time("08:00:00")) log = make_checkin(employee, timestamp) diff --git a/erpnext/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py b/erpnext/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py index 2f3cb53adb..fe4f01a909 100644 --- a/erpnext/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py +++ b/erpnext/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py @@ -8,7 +8,10 @@ from erpnext.hr.doctype.employee.test_employee import make_employee from erpnext.hr.doctype.holiday_list.test_holiday_list import set_holiday_list from erpnext.hr.doctype.leave_application.test_leave_application import make_allocation_record from erpnext.hr.report.monthly_attendance_sheet.monthly_attendance_sheet import execute -from erpnext.payroll.doctype.salary_slip.test_salary_slip import make_leave_application +from erpnext.payroll.doctype.salary_slip.test_salary_slip import ( + make_holiday_list, + make_leave_application, +) test_dependencies = ["Shift Type"] @@ -18,6 +21,11 @@ class TestMonthlyAttendanceSheet(FrappeTestCase): self.employee = make_employee("test_employee@example.com", company="_Test Company") frappe.db.delete("Attendance") + date = getdate() + from_date = get_year_start(date) + to_date = get_year_ending(date) + make_holiday_list(start_date=from_date, to_date=to_date) + @set_holiday_list("Salary Slip Test Holiday List", "_Test Company") def test_monthly_attendance_sheet_report(self): now = now_datetime()