diff --git a/yuthon_will_task/__manifest__.py b/yuthon_will_task/__manifest__.py index 645957276..8504a001e 100644 --- a/yuthon_will_task/__manifest__.py +++ b/yuthon_will_task/__manifest__.py @@ -18,7 +18,7 @@ 'views/yuthon_task_menu.xml', ], 'demo': [], - 'depends': ['hr', 'mail', 'soong_workflow'], + 'depends': ['hr', 'mail', 'soong_workflow','yuthon_hr_employee'], 'installable': True, 'application': True, } diff --git a/yuthon_will_task/security/yuthon_will_task_security.xml b/yuthon_will_task/security/yuthon_will_task_security.xml index c9662c942..0acfb864d 100644 --- a/yuthon_will_task/security/yuthon_will_task_security.xml +++ b/yuthon_will_task/security/yuthon_will_task_security.xml @@ -5,30 +5,19 @@ 日程组 - 用户 + 日程用户 - 天河投资领导 + 日程组管理员 - - 天河物管领导 - - - - - 天河粮储领导 - - - - - 管理者 - - - + + yuthon_will_company_rule_admin + + [('yuthon_company', '=', user.employee_id.yuthon_company)] + \ No newline at end of file diff --git a/yuthon_will_task/views/yuthon_task_menu.xml b/yuthon_will_task/views/yuthon_task_menu.xml index 66e17a792..b2735cd68 100644 --- a/yuthon_will_task/views/yuthon_task_menu.xml +++ b/yuthon_will_task/views/yuthon_task_menu.xml @@ -12,39 +12,27 @@ groups="group_yuthon_will_task_user" sequence='1'/> - - {'search_default_next_seven_days': 1} - 天河投资领导日程 + 领导日程 yuthon.will.task tree,calendar - [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=', 'thtz')] - {'search_default_next_seven_days': 1} - - - 天河物管领导日程 - yuthon.will.task - tree,calendar - [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=', 'thwg')] - {'search_default_next_seven_days': 1} - - - 天河粮储领导日程 - yuthon.will.task - tree,calendar - [('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=', 'thlc')] {'search_default_next_seven_days': 1}