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 @@ 考勤提醒表单 card.remind.form tree - {'group_by': ['name', 'department']} + {'group_by': ['department', 'name']} \ 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"/> - - - - + sequence="7" + action="yuthon_hr_attendance.hr_attendance_month_action"/> + +