From 4fcca3ee8eb1bdbd842f45a44ed5451d58e99f22 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 29 May 2025 14:55:23 +0800
Subject: [PATCH] =?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

---
 .../models/planning_template_inherit.py       |  2 +-
 .../views/card_remind_form.xml                |  2 +-
 yuthon_work_brand/views/hr_menus.xml          | 23 +++++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/yuthon_hr_attendance/models/planning_template_inherit.py b/yuthon_hr_attendance/models/planning_template_inherit.py
index 9ce984e62..e81d6ba0d 100644
--- a/yuthon_hr_attendance/models/planning_template_inherit.py
+++ b/yuthon_hr_attendance/models/planning_template_inherit.py
@@ -65,7 +65,6 @@ class PlanningSlotTemplate(models.Model):
         department_ids = self.get_child_departments(self.department_id.id)
         departments = self.env['hr.department'].browse(department_ids)
         department_names = [dept.name for dept in departments]
-
         domain = [('shift', '=', self.planning_name), ('department', '=', department_names)]
         action = {
             'name': '班次打卡详情',
@@ -73,6 +72,7 @@ class PlanningSlotTemplate(models.Model):
             'res_model': 'card.remind.form',
             'view_mode': 'tree',
             'domain': domain,
+            'context': {'group_by': ['department', 'name']}
         }
         return action
 
diff --git a/yuthon_hr_attendance/views/card_remind_form.xml b/yuthon_hr_attendance/views/card_remind_form.xml
index 56324bca4..4251884ce 100644
--- a/yuthon_hr_attendance/views/card_remind_form.xml
+++ b/yuthon_hr_attendance/views/card_remind_form.xml
@@ -24,6 +24,6 @@
         <field name="name">考勤提醒表单</field>
         <field name="res_model">card.remind.form</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'group_by': ['name', 'department']}</field>
+        <field name="context">{'group_by': ['department', 'name']}</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 792971883..aa33cd91f 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -134,16 +134,16 @@
               parent="hr_attendance_root_board_menu"
               action="yuthon_hr_attendance.action_attendance_company_form"
               sequence="5"/>
-    <menuitem id="menu_hr_attendance_month_board"
-              name="月度考勤"
+    <menuitem id="menu_hr_attendance_month_view_attendances"
+              name="报表"
               parent="hr_attendance_root_board_menu"
-              sequence="10"/>
-    <menuitem id="menu_hr_attendance_month_view_attendances" name="报表" parent="menu_hr_attendance_month_board"
-              sequence="30" action="yuthon_hr_attendance.hr_attendance_month_action"/>
-    <menuitem id="menu_hr_attendance_year_view_attendances" name="出勤年份维护" parent="menu_hr_attendance_month_board"
-              sequence="40" action="yuthon_hr_attendance.hr_attendance_year_action"/>
-    <menuitem id="menu_hr_attendance_month_detail_view_attendances" name="考勤详情"
-              parent="menu_hr_attendance_month_board" sequence="50" action="yuthon_hr_attendance.hr_attendance_month_detail_action"/>
+              sequence="7"
+              action="yuthon_hr_attendance.hr_attendance_month_action"/>
+    <menuitem id="menu_hr_attendance_month_detail_view_attendances"
+              name="考勤详情"
+              parent="hr_attendance_root_board_menu"
+              sequence="10"
+              action="yuthon_hr_attendance.hr_attendance_month_detail_action"/>
      <menuitem id="holiday_overview_menu_board"
               name="假期管理"
               parent="hr_attendance_root_board_menu"
@@ -168,6 +168,11 @@
               name="配置"
               parent="hr_attendance_root_board_menu"
               sequence="99"/>
+    <menuitem id="menu_hr_attendance_year_view_attendances"
+              name="出勤年份维护"
+              parent="attendance_resources_setting_root_board"
+              sequence="1"
+              action="yuthon_hr_attendance.hr_attendance_year_action"/>
     <menuitem id="menu_hr_attendance_work_board"
               name="考勤时间表"
               parent="attendance_resources_setting_root_board"