From 99e0ce728a73eeb22781eb901a2bee6b9713b826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Fri, 3 Jan 2025 20:18:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ljm=20=E4=BF=AE=E6=94=B9=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/controllers/attendance_banner_route.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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)

From 458ee4bbe2e911af375a10c82c48d435d63c6c55 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 3 Jan 2025 20:18:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/views/yuthon_fixes_approval_views.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 @@
                             <field name="related_issues_id" invisible="not is_issues"/>
                         </group>
                         <group>
-                            <field name="original_days"/>
-                            <field name="now_days"/>
+                            <field name="original_days" invisible="now_type != 'days'"/>
+                            <field name="now_days" invisible="now_type != 'days'"/>
+                            <field name="original_hours" invisible="now_type != 'hours'"/>
+                            <field name="now_hours" invisible="now_type != 'hours'"/>
                             <field name="remarks" invisible="1"/>
                             <field name="yuthon_company" invisible="1"/>
                             <field name="department_id" invisible="1"/>