!2333 !2332 添加功能

Merge pull request !2333 from 李鹏宇/dev

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)
+  name = fields.Char(string='名称', required=True)
+  company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)

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>

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>

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):

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"/>

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>

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="设置"