diff --git a/yuthon_hr_attendance/__manifest__.py b/yuthon_hr_attendance/__manifest__.py index 3bbe2ff2a..246ac63e6 100644 --- a/yuthon_hr_attendance/__manifest__.py +++ b/yuthon_hr_attendance/__manifest__.py @@ -17,6 +17,7 @@ 'data': [ 'security/ir.model.access.csv', 'security/attendance_group.xml', + 'security/planning_group.xml', 'data/hr_attendance_time.xml', 'data/attendance_code_data.xml', 'data/attendance_time_data.xml', diff --git a/yuthon_hr_attendance/data/attendance_time_data.xml b/yuthon_hr_attendance/data/attendance_time_data.xml index 56dec9a51..11418679d 100644 --- a/yuthon_hr_attendance/data/attendance_time_data.xml +++ b/yuthon_hr_attendance/data/attendance_time_data.xml @@ -1,205 +1,205 @@ - - - 定时任务:检查考勤是否异 - - code - model.card_remind() - - - 1 - days - - -1 - - - - 定时任务:粮库上班打卡提醒 - - code - model.card_lc_remind_in() - - - 1 - days - - -1 - - - - 定时任务:粮储下班打卡提醒 - - code - model.card_lc_remind_out() - - - 1 - days - - -1 - - - - 定时任务:粮库值班上班打卡提醒 - - code - model.card_lc_shift_remind_in() - - - 1 - days - - -1 - - - - 定时任务:粮库值班打卡提醒 - - code - model.card_lc_shift_remind() - - - 1 - days - - -1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 定时任务:工程部白班上班打卡提醒 - - code - model.gc_white_in_remind() - - - 1 - days - - -1 - - - - 定时任务:工程部白班值班打卡提醒 - - code - model.gc_white_shift_remind() - - - 1 - days - - -1 - - - - 定时任务:工程部白班下班打卡提醒 - - code - model.gc_white_out_remind() - - - 1 - days - - -1 - - - - 定时任务:工程部中值夜班上班打卡提醒 - - code - model.gc_night_remind_in() - - - 1 - days - - -1 - - - - 定时任务:工程部中值夜班值班打卡提醒 - - code - model.gc_night_remind_shift() - - - 1 - days - - -1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 定时任务:保安部白班下班打卡提醒 - - code - model.ba_card_white_down() - - - 1 - days - - -1 - - - - 定时任务:保安部中班上班打卡提醒 - - code - model.ba_card_mid_up() - - - 1 - days - - -1 - - - - 定时任务:保安部中班下班打卡提醒 - - code - model.ba_card_mid_down() - - - 1 - days - - -1 - - - - 定时任务:保安部夜班上班打卡提醒 - - code - model.ba_card_night_up() - - - 1 - days - - -1 - - - - 定时任务:保安部夜班下班打卡提醒 - - code - model.ba_card_night_down() - - - 1 - days - - -1 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yuthon_hr_attendance/security/planning_group.xml b/yuthon_hr_attendance/security/planning_group.xml index e69de29bb..255733526 100644 --- a/yuthon_hr_attendance/security/planning_group.xml +++ b/yuthon_hr_attendance/security/planning_group.xml @@ -0,0 +1,109 @@ + + + + + 值班组 + + + 保安部:用户 + + + + 班组a:用户 + + + + + 班组b:用户 + + + + + 班组c:用户 + + + + + 保安部管理员 + + + + + + + + 工程部:用户 + + + + 运行班:用户 + + + + + 运行班管理员 + + + + + + 高压班:用户 + + + + + 高压班管理员 + + + + + + 综合班:用户 + + + + + 综合班管理员 + + + + + + 工程班管理员 + + + + + + + 粮储:用户 + + + + 粮储管理员 + + + + + + 客服:用户 + + + + 客服管理员 + + + + + + + 计划考勤管理员 + + + + + + diff --git a/yuthon_hr_attendance/views/all_attendance_menu.xml b/yuthon_hr_attendance/views/all_attendance_menu.xml index e409b4575..50d702f27 100644 --- a/yuthon_hr_attendance/views/all_attendance_menu.xml +++ b/yuthon_hr_attendance/views/all_attendance_menu.xml @@ -110,77 +110,83 @@ - + groups="group_he_attendance_security_manager" + sequence="1"/> + sequence="3"/> + sequence="5"/> + sequence="7"/> + sequence="9"/> - @@ -188,20 +194,24 @@ - + + + + 人力资源 + + + 用户 + + + + 管理员 + + + + + User: 角色匹配的数据访问 + + + + + + + + + + + 薪资 + + + 薪资:用户 + + + + 天河投资:用户 + + + + + 天河投资:管理员 + + + + + 天河物管:用户 + + + + + 天河物管:管理员 + + + + + 天河粮储:用户 + + + + + 天河粮储:管理员 + + + + + 薪资管理员 + + + + + diff --git a/yuthon_property/__manifest__.py b/yuthon_property/__manifest__.py index 69d17e238..3b78e1c19 100644 --- a/yuthon_property/__manifest__.py +++ b/yuthon_property/__manifest__.py @@ -9,6 +9,7 @@ 'license': 'LGPL-3', 'data': [ 'security/ir.model.access.csv', + 'security/yuthon_property_group.xml', 'data/data_yuthon_resource_mgmt_config.xml', 'data/yuthon_property_approval_data.xml', 'views/yuthon_property_views.xml', diff --git a/yuthon_property/security/yuthon_property_group.xml b/yuthon_property/security/yuthon_property_group.xml new file mode 100644 index 000000000..bd97b0fd4 --- /dev/null +++ b/yuthon_property/security/yuthon_property_group.xml @@ -0,0 +1,17 @@ + + + + + 物业管理 + + + 用户 + + + + 管理员 + + + + + diff --git a/yuthon_property/views/menuitem.xml b/yuthon_property/views/menuitem.xml index 4fc4f1bc0..b802fda06 100644 --- a/yuthon_property/views/menuitem.xml +++ b/yuthon_property/views/menuitem.xml @@ -10,6 +10,7 @@ + - - + + + + + diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index e34812772..bc0de9d97 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -9,6 +9,7 @@