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 @@ [('company_id', 'in', company_ids)] + + 工资单分组多公司 + + [('company_id', 'in', company_ids)] + \ 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 @@ + 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 @@ - + @@ -68,7 +68,7 @@ - + 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 @@ + 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 @@