From cd78d490f3b2dce95b11fdd4ba3e9ed9de85a768 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 22 Feb 2025 17:52:22 +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

---
 yuthon_will_task/__manifest__.py              |  2 +-
 .../security/yuthon_will_task_security.xml    | 25 ++++++-------------
 yuthon_will_task/views/yuthon_task_menu.xml   | 20 +++------------
 .../views/yuthon_will_task_views.xml          | 17 +------------
 4 files changed, 13 insertions(+), 51 deletions(-)

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 @@
             <field name="name">日程组</field>
         </record>
         <record id="group_yuthon_will_task_user" model="res.groups">
-            <field name="name">用户</field>
+            <field name="name">日程用户</field>
             <field name="category_id" ref="module_yuthon_will_task"/>
         </record>
         <record id="group_yuthon_will_task_leader" model="res.groups">
-            <field name="name">天河投资领导</field>
+            <field name="name">日程组管理员</field>
             <field name="category_id" ref="module_yuthon_will_task"/>
             <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user'))]"/>
         </record>
-        <record id="group_yuthon_will_task_leader2" model="res.groups">
-            <field name="name">天河物管领导</field>
-            <field name="category_id" ref="module_yuthon_will_task"/>
-            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user'))]"/>
-        </record>
-        <record id="group_yuthon_will_task_leader3" model="res.groups">
-            <field name="name">天河粮储领导</field>
-            <field name="category_id" ref="module_yuthon_will_task"/>
-            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user'))]"/>
-        </record>
-        <record id="group_yuthon_will_task_manager" model="res.groups">
-            <field name="name">管理者</field>
-            <field name="category_id" ref="module_yuthon_will_task"/>
-            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user')), (4, ref('group_yuthon_will_task_leader')),
-            (4, ref('group_yuthon_will_task_leader2')), (4, ref('group_yuthon_will_task_leader3'))]"/>
-            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        <record id="yuthon_will_company_rule_manager" model="ir.rule">
+            <field name="name">yuthon_will_company_rule_admin</field>
+            <field name="model_id" ref="model_yuthon_will_task"/>
+            <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+            <field name="groups" eval="[(4, ref('group_yuthon_will_task_leader'))]"/>
         </record>
     </data>
 </odoo>
\ 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'/>
     <menuitem id='menu_yuthon_will_task_root21'
-              name='领导日程(天河投资)'
+              name='领导日程'
               parent='menu_yuthon_will_task'
               action='view_yuthon_will_task_action21'
               groups="group_yuthon_will_task_leader"
               sequence='2'/>
-    <menuitem id='menu_yuthon_will_task_root22'
-              name='领导日程(天河物管)'
-              parent='menu_yuthon_will_task'
-              action='view_yuthon_will_task_action22'
-              groups="group_yuthon_will_task_leader2"
-              sequence='3'/>
-    <menuitem id='menu_yuthon_will_task_root23'
-              name='领导日程(天河粮储)'
-              parent='menu_yuthon_will_task'
-              action='view_yuthon_will_task_action23'
-              groups="group_yuthon_will_task_leader3"
-              sequence='4'/>
     <menuitem id='menu_yuthon_will_task_root4'
               name='全部领导日程'
               parent='menu_yuthon_will_task'
               action='view_yuthon_will_task_action4'
-              groups="group_yuthon_will_task_manager"
+              groups="group_yuthon_will_task_leader"
               sequence='8'/>
     <menuitem id='menu_yuthon_will_task_roo3'
               name='全部日程'
               parent='menu_yuthon_will_task'
               action='view_yuthon_will_task_action3'
-              groups="group_yuthon_will_task_manager"
+              groups="group_yuthon_will_task_leader"
               sequence='10'/>
     <menuitem id="task_type_menu"
               name="配置"
               parent="menu_yuthon_will_task"
-              groups="group_yuthon_will_task_manager"
+              groups="group_yuthon_will_task_leader"
               sequence="100"/>
     <menuitem id="task_type_setting_menu"
               name="任务类型"
diff --git a/yuthon_will_task/views/yuthon_will_task_views.xml b/yuthon_will_task/views/yuthon_will_task_views.xml
index faeb15d45..81e98505d 100644
--- a/yuthon_will_task/views/yuthon_will_task_views.xml
+++ b/yuthon_will_task/views/yuthon_will_task_views.xml
@@ -96,24 +96,9 @@
         <field name="context">{'search_default_next_seven_days': 1}</field>
     </record>
     <record id='view_yuthon_will_task_action21' model='ir.actions.act_window'>
-        <field name='name'>天河投资领导日程</field>
+        <field name='name'>领导日程</field>
         <field name='res_model'>yuthon.will.task</field>
         <field name='view_mode'>tree,calendar</field>
-        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=', 'thtz')]</field>
-        <field name="context">{'search_default_next_seven_days': 1}</field>
-    </record>
-    <record id='view_yuthon_will_task_action22' model='ir.actions.act_window'>
-        <field name='name'>天河物管领导日程</field>
-        <field name='res_model'>yuthon.will.task</field>
-        <field name='view_mode'>tree,calendar</field>
-        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=', 'thwg')]</field>
-        <field name="context">{'search_default_next_seven_days': 1}</field>
-    </record>
-    <record id='view_yuthon_will_task_action23' model='ir.actions.act_window'>
-        <field name='name'>天河粮储领导日程</field>
-        <field name='res_model'>yuthon.will.task</field>
-        <field name='view_mode'>tree,calendar</field>
-        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=', 'thlc')]</field>
         <field name="context">{'search_default_next_seven_days': 1}</field>
     </record>
     <record id='view_yuthon_will_task_action4' model='ir.actions.act_window'>