diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml index fad0f1794..359cff74b 100644 --- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml +++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml @@ -26,8 +26,10 @@ - - + + + + diff --git a/yuthon_hr_attendance/controllers/attendance_banner_route.py b/yuthon_hr_attendance/controllers/attendance_banner_route.py index 1da185e0b..20c6b3f22 100644 --- a/yuthon_hr_attendance/controllers/attendance_banner_route.py +++ b/yuthon_hr_attendance/controllers/attendance_banner_route.py @@ -16,8 +16,8 @@ class AttendanceBannerRoute(Controller): last_day_of_month = next_month_first_day - timedelta(days=1) domain = [ ('employee_id.user_id', '=', request.env.user.id), - ('check_in', '>=', first_day_of_month), - ('check_in', '<=', last_day_of_month), + ('current_data', '>=', first_day_of_month.date()), + ('current_data', '<=', last_day_of_month.date()), ('week', 'not in', ['seven', 'six']) ] attendance = request.env['hr.attendance'].sudo().search(domain)