From b61f4c4885e252c8924511e5dd4a0f74267c8e30 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 3 Apr 2025 16:59:48 +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/models/yuthon_party_setting.py         | 3 ++-
 yuthon_hr_employee/security/company_rule.xml              | 5 +++++
 yuthon_hr_employee/views/yuthon_party_setting_views.xml   | 1 +
 yuthon_salary/models/yuthon_payroll_type_setting.py       | 2 ++
 yuthon_salary/views/yuthon_payroll_project_views.xml      | 4 ++--
 yuthon_salary/views/yuthon_payroll_type_setting_views.xml | 1 +
 yuthon_work_brand/views/hr_menus.xml                      | 2 --
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/yuthon_hr_employee/models/yuthon_party_setting.py b/yuthon_hr_employee/models/yuthon_party_setting.py
index 0cd871620..742e5f549 100644
--- a/yuthon_hr_employee/models/yuthon_party_setting.py
+++ b/yuthon_hr_employee/models/yuthon_party_setting.py
@@ -21,4 +21,5 @@ class YuthonSalaryGroup(models.Model):
   _description = '工资单分组'
 
   sequence = fields.Char(string='序号', store=True)
-  name = fields.Char(string='名称', required=True)
\ No newline at end of file
+  name = fields.Char(string='名称', required=True)
+  company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
\ No newline at end of file
diff --git a/yuthon_hr_employee/security/company_rule.xml b/yuthon_hr_employee/security/company_rule.xml
index 79ff739d1..be7d1db73 100644
--- a/yuthon_hr_employee/security/company_rule.xml
+++ b/yuthon_hr_employee/security/company_rule.xml
@@ -5,4 +5,9 @@
         <field name="model_id" ref="model_hr_department"/>
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
+    <record model="ir.rule" id="yuthon_salary_group_rule">
+        <field name="name">工资单分组多公司</field>
+        <field name="model_id" ref="model_yuthon_salary_group"/>
+        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_hr_employee/views/yuthon_party_setting_views.xml b/yuthon_hr_employee/views/yuthon_party_setting_views.xml
index 84fa66475..e0c76b20c 100644
--- a/yuthon_hr_employee/views/yuthon_party_setting_views.xml
+++ b/yuthon_hr_employee/views/yuthon_party_setting_views.xml
@@ -26,6 +26,7 @@
             <tree string="工资单分组" editable="bottom">
                 <field name="sequence" widget="handle"/>
                 <field name="name"/>
+                <field name="company_id" required="1" optional="show"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_salary/models/yuthon_payroll_type_setting.py b/yuthon_salary/models/yuthon_payroll_type_setting.py
index 74a8b0ee1..67772a348 100644
--- a/yuthon_salary/models/yuthon_payroll_type_setting.py
+++ b/yuthon_salary/models/yuthon_payroll_type_setting.py
@@ -7,6 +7,8 @@ class YuthonPayrollTypeSetting(models.Model):
     _description = '职级类别配置'
 
     name = fields.Char(string='职级类别')
+    yuthon_company = fields.Selection([('thtz', 'thtz')], default="thtz")
+    company_id = fields.Many2one('res.company', string='公司', default=lambda self: self.env.company)
 
 
 class YuthonAccountGroup(models.Model):
diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml
index 0e55ebc8b..441e10a58 100644
--- a/yuthon_salary/views/yuthon_payroll_project_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_project_views.xml
@@ -12,7 +12,7 @@
                 <field name="attributes"/>
                 <field name="department_id"/>
                 <field name="conditional_formulas"/>
-                <field name="payroll_type_ids" widget="many2many_tags"/>
+                <field name="payroll_type_ids" widget="many2many_tags" domain="[('company_id', '=' ,company_id)]"/>
                 <field name="payroll_structure_ids" widget="many2many_tags" column_invisible="1"/>
                 <field name="start_date"/>
                 <field name="end_date"/>
@@ -68,7 +68,7 @@
                 <field name="company_base_floor"/>
                 <field name="employee_base_ceiling"/>
                 <field name="employee_base_floor"/>
-                <field name="payroll_type_ids" widget="many2many_tags"/>
+                <field name="payroll_type_ids" widget="many2many_tags" domain="[('company_id', '=' ,company_id)]"/>
                 <field name="payroll_structure_ids" widget="many2many_tags" column_invisible="1"/>
                 <field name="documents_ids" widget="preview_many2many" class="list_width"/>
                 <field name="remarks"/>
diff --git a/yuthon_salary/views/yuthon_payroll_type_setting_views.xml b/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
index 95f62f823..7de283c97 100644
--- a/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
@@ -6,6 +6,7 @@
         <field name="arch" type="xml">
             <tree string="职级类别配置" editable="bottom">
                 <field name="name"/>
+                <field name="company_id" required="1" optional="hide"/>
             </tree>
         </field>
     </record>
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index a8b998bab..d823c2ff5 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -155,7 +155,6 @@
     <menuitem id="hr_set_process_menu_root_board"
               name="流程"
               parent="hr_menu_root_board"
-                
               sequence="5"/>
     <menuitem id="hr_menu_regularization_approval_root_board"
               name="转正申请表"
@@ -206,7 +205,6 @@
     <menuitem id="hr_setting_menu_root_board"
               name="配置"
               parent="hr_menu_root_board"
-                
               sequence="9"/>
     <menuitem id="hr_set_menu_root_board"
               name="设置"