From 8fd3c3e2e5e6dea19cd0184ff51ec81272fe8d7b Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 8 Mar 2025 17:43:02 +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_hr_employee/security/hr_group.xml      | 44 ----------
 .../security/yuthon_salary_group.xml          | 14 ++--
 yuthon_work_brand/views/hr_menus.xml          | 83 +++----------------
 3 files changed, 17 insertions(+), 124 deletions(-)

diff --git a/yuthon_hr_employee/security/hr_group.xml b/yuthon_hr_employee/security/hr_group.xml
index b674b3c6b..efcdffcfc 100644
--- a/yuthon_hr_employee/security/hr_group.xml
+++ b/yuthon_hr_employee/security/hr_group.xml
@@ -23,49 +23,5 @@
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
         </record>
-
-        <record id="group_hr_employee_salary" model="ir.module.category">
-            <field name="name">薪资</field>
-        </record>
-        <record id="group_hr_employee_salary_user" model="res.groups">
-            <field name="name">薪资：用户</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-        </record>
-        <record id="group_hr_employee_tt_salary_user" model="res.groups">
-            <field name="name">天河投资：用户</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-             <field name="implied_ids" eval="[(4, ref('group_hr_employee_salary_user'))]"/>
-        </record>
-        <record id="group_hr_employee_tt_salary_manager" model="res.groups">
-            <field name="name">天河投资：管理员</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-            <field name="implied_ids" eval="[(4, ref('group_hr_employee_tt_salary_user'))]"/>
-        </record>
-        <record id="group_hr_employee_wg_salary_user" model="res.groups">
-            <field name="name">天河物管：用户</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-            <field name="implied_ids" eval="[(4, ref('group_hr_employee_salary_user'))]"/>
-        </record>
-        <record id="group_hr_employee_wg_salary_manager" model="res.groups">
-            <field name="name">天河物管：管理员</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-            <field name="implied_ids" eval="[(4, ref('group_hr_employee_wg_salary_user'))]"/>
-        </record>
-        <record id="group_hr_employee_lc_salary_user" model="res.groups">
-            <field name="name">天河粮储：用户</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-            <field name="implied_ids" eval="[(4, ref('group_hr_employee_salary_user'))]"/>
-        </record>
-        <record id="group_hr_employee_lc_salary_manager" model="res.groups">
-            <field name="name">天河粮储：管理员</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-            <field name="implied_ids" eval="[(4, ref('group_hr_employee_lc_salary_user'))]"/>
-        </record>
-        <record id="group_hr_employee_salary_manager" model="res.groups">
-            <field name="name">薪资管理员</field>
-            <field name="category_id" ref="group_hr_employee_salary"/>
-            <field name="implied_ids" eval="[(4, ref('group_hr_employee_lc_salary_manager')), (4, ref('group_hr_employee_wg_salary_manager')),
-            (4, ref('group_hr_employee_tt_salary_manager'))]"/>
-        </record>
     </data>
 </odoo>
diff --git a/yuthon_salary/security/yuthon_salary_group.xml b/yuthon_salary/security/yuthon_salary_group.xml
index 4ca739a04..6ee19381e 100644
--- a/yuthon_salary/security/yuthon_salary_group.xml
+++ b/yuthon_salary/security/yuthon_salary_group.xml
@@ -14,7 +14,7 @@
         <field name="users" eval="[(4, ref('base.user_admin'))]"/>
     </record>
     <record id="group_salary_super_admin" model="res.groups">
-        <field name="name">薪资超级管理员</field>
+        <field name="name">薪资人事管理员</field>
         <field name="category_id" ref="module_category_yuthon_salary"/>
         <field name="implied_ids" eval="[(4, ref('group_salary_admin'))]"/>
         <field name="users" eval="[(4, ref('base.user_admin'))]"/>
@@ -24,41 +24,41 @@
         <field name="name">yuthon_salary_company_rule_admin</field>
         <field name="model_id" ref="model_hr_payroll_structure_type"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+        <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
     <!--职级-->
     <record id="yuthon_salary_structure_company_rule_manager" model="ir.rule">
         <field name="name">yuthon_salary_structure_rule_admin</field>
         <field name="model_id" ref="model_hr_payroll_structure"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+        <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
     <!--常用项-->
     <record id="yuthon_salary_common_item_company_rule_manager" model="ir.rule">
         <field name="name">yuthon_salary_common_item_rule_admin</field>
         <field name="model_id" ref="model_yuthon_payroll_common"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+        <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
     <!--五险一金-->
     <record id="yuthon_salary_insurance_company_rule_manager" model="ir.rule">
         <field name="name">yuthon_salary_insurance_rule_admin</field>
         <field name="model_id" ref="model_yuthon_payroll_insurances"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+        <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
     <!--临时项-->
     <record id="yuthon_salary_temp_item_company_rule_manager" model="ir.rule">
         <field name="name">yuthon_salary_temp_item_rule_admin</field>
         <field name="model_id" ref="model_yuthon_payroll_temporary"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+        <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
     <!--职级类别配置-->
     <record id="yuthon_salary_level_company_rule_manager" model="ir.rule">
         <field name="name">yuthon_salary_level_rule_admin</field>
         <field name="model_id" ref="model_yuthon_payroll_type_setting"/>
         <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
-        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+        <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </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 ce048d148..70e2ab44b 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -327,6 +327,7 @@
               name="工资条"
               parent="human_resources_salary_root_board"
               action="hr_payroll.action_view_hr_payslip_month_form"
+              groups="yuthon_salary.group_salary_user"
               sequence="7"/>
 <!--    <menuitem id="human_pay_be_paid_board"-->
 <!--              name="待支付"-->
@@ -342,119 +343,55 @@
               name="职级类型"
               parent="human_resources_salary_root_board"
               action="yuthon_salary.action_view_hr_payroll_structure_type_form1"
+              groups="yuthon_salary.group_salary_user"
               sequence="9"/>
     <menuitem id="human_resources_salary_root_board1"
               name="职级"
               parent="human_resources_salary_root_board"
               action="yuthon_salary.action_view_hr_payroll_structure_list_form"
+              groups="yuthon_salary.group_salary_user"
               sequence="15"/>
     <menuitem id="hr_payroll_common_board"
               name="常用项"
               parent="human_resources_salary_root_board"
               action="yuthon_salary.view_yuthon_payroll_common_action"
+              groups="yuthon_salary.group_salary_user"
               sequence="20"/>
     <menuitem id="hr_payroll_insurance_board"
               name="五险一金"
               parent="human_resources_salary_root_board"
               action="yuthon_salary.view_yuthon_payroll_insurances_action"
+              groups="yuthon_salary.group_salary_user"
               sequence="25"/>
     <menuitem id="hr_payroll_temporary_board"
               name="临时项"
               parent="human_resources_salary_root_board"
               action="yuthon_salary.view_yuthon_payroll_temporary_action"
+              groups="yuthon_salary.group_salary_user"
               sequence="30"/>
     <menuitem id="human_pay_setting_payroll_items_setting_board"
               name="职级类别配置"
               parent="human_resources_salary_root_board"
               action="yuthon_salary.yuthon_payroll_type_setting_action"
+              groups="yuthon_salary.group_salary_admin"
               sequence="35"/>
-<!--     <menuitem id="human_pay_setting_structural_lc_board"-->
-<!--              name="天河粮储"-->
-<!--              parent="human_resources_salary_root_board"-->
-<!--              sequence="15"/>-->
-<!--&lt;!&ndash;     <menuitem id="hr_payroll_structure_type_lc_board"&ndash;&gt;-->
-<!--&lt;!&ndash;              name="职级类型"&ndash;&gt;-->
-<!--&lt;!&ndash;              parent="human_pay_setting_structural_lc_board"&ndash;&gt;-->
-<!--&lt;!&ndash;              action="yuthon_salary.action_view_hr_payroll_structure_type_form2"&ndash;&gt;-->
-<!--&lt;!&ndash;              sequence="1"/>&ndash;&gt;-->
-<!--    <menuitem id="human_pay_setting_structural_lc_board1"-->
-<!--              name="职级"-->
-<!--              parent="human_pay_setting_structural_lc_board"-->
-<!--              action="yuthon_salary.action_view_hr_payroll_structure_list_form2"-->
-<!--              sequence="3"/>-->
-<!--    <menuitem id="hr_payroll_common_lc_board"-->
-<!--              name="常用项"-->
-<!--              parent="human_pay_setting_structural_lc_board"-->
-<!--              action="yuthon_salary.view_yuthon_payroll_lc_common_action"-->
-<!--              sequence="5"/>-->
-<!--    <menuitem id="hr_payroll_insurances_lc_board"-->
-<!--              name="五险一金"-->
-<!--              parent="human_pay_setting_structural_lc_board"-->
-<!--              action="yuthon_salary.view_yuthon_payroll_lc_insurances_action"-->
-<!--              sequence="7"/>-->
-<!--    <menuitem id="hr_payroll_temporary_lc_board"-->
-<!--              name="临时项"-->
-<!--              parent="human_pay_setting_structural_lc_board"-->
-<!--              action="yuthon_salary.view_yuthon_payroll_lc_temporary_action"-->
-<!--              sequence="9"/>-->
-<!--    <menuitem id="human_pay_setting_payroll_items_lc_setting_board"-->
-<!--              name="职级类别配置"-->
-<!--              parent="human_pay_setting_structural_lc_board"-->
-<!--              action="yuthon_salary.yuthon_payroll_type_setting_action1"-->
-<!--              sequence="15"/>-->
-<!--     <menuitem id="human_pay_setting_structural_wg_board"-->
-<!--              name="天河物管"-->
-<!--              parent="human_resources_salary_root_board"-->
-<!--              sequence="20"/>-->
-<!--&lt;!&ndash;     <menuitem id="hr_payroll_structure_type_wg_board"&ndash;&gt;-->
-<!--&lt;!&ndash;              name="职级类型"&ndash;&gt;-->
-<!--&lt;!&ndash;              parent="human_pay_setting_structural_wg_board"&ndash;&gt;-->
-<!--&lt;!&ndash;              action="yuthon_salary.action_view_hr_payroll_structure_type_form3"&ndash;&gt;-->
-<!--&lt;!&ndash;              sequence="1"/>&ndash;&gt;-->
-<!--    <menuitem id="human_pay_setting_structural_wg_board1"-->
-<!--              name="职级"-->
-<!--              parent="human_pay_setting_structural_wg_board"-->
-<!--              action="yuthon_salary.action_view_hr_payroll_structure_list_form3"-->
-<!--              sequence="5"/>-->
-<!--    <menuitem id="hr_payroll_common_wg_board"-->
-<!--              name="常用项"-->
-<!--              parent="human_pay_setting_structural_wg_board"-->
-<!--              action="yuthon_salary.view_yuthon_payroll_wg_common_action"-->
-<!--              sequence="7"/>-->
-<!--    <menuitem id="hr_payroll_insurance_wg_board"-->
-<!--              name="五险一金"-->
-<!--              parent="human_pay_setting_structural_wg_board"-->
-<!--              action="yuthon_salary.view_yuthon_payroll_wg_insurances_action"-->
-<!--              sequence="9"/>-->
-<!--    <menuitem id="hr_payroll_temporary_wg_board"-->
-<!--              name="临时项"-->
-<!--              parent="human_pay_setting_structural_wg_board"-->
-<!--              action="yuthon_salary.view_yuthon_payroll_wg_temporary_action"-->
-<!--              sequence="11"/>-->
-<!--&lt;!&ndash;    <menuitem id="human_pay_setting_payroll_items_wg_board"&ndash;&gt;-->
-<!--&lt;!&ndash;              name="工资项"&ndash;&gt;-->
-<!--&lt;!&ndash;              parent="human_pay_setting_structural_wg_board"&ndash;&gt;-->
-<!--&lt;!&ndash;              action="yuthon_salary.action_salary_rule_form3"&ndash;&gt;-->
-<!--&lt;!&ndash;              sequence="7"/>&ndash;&gt;-->
-<!--    <menuitem id="human_pay_setting_payroll_items_wg_setting_board"-->
-<!--              name="职级类别配置"-->
-<!--              parent="human_pay_setting_structural_wg_board"-->
-<!--              action="yuthon_salary.yuthon_payroll_type_setting_action2"-->
-<!--              sequence="15"/>-->
     <menuitem id="human_pay_setting_type_rule_argument_root_board"
               name="工资项参数"
               parent="human_resources_salary_root_board"
               action="hr_payroll.hr_rule_parameter_action"
+              groups="yuthon_salary.group_salary_admin"
               sequence="40"/>
     <menuitem id="human_pay_setting_type_rule_type_root_board"
               name="工资项类别"
               parent="human_resources_salary_root_board"
               action="hr_payroll.action_hr_salary_rule_category"
+              groups="yuthon_salary.group_salary_admin"
               sequence="45"/>
     <menuitem id="human_pay_setting_work_entry_root_board"
               name="工作条目类型"
               parent="human_resources_salary_root_board"
               action="hr_work_entry.hr_work_entry_type_action"
+              groups="yuthon_salary.group_salary_admin"
               sequence="50"/>
 
     <!--  培训管理  -->