From 9ec399375773a971ed601ce6a4caeacc27cc9e6a Mon Sep 17 00:00:00 2001 From: Bhumika Trivedi Date: Fri, 30 Nov 2018 17:34:12 +0530 Subject: [PATCH] [IMP]: Updated access rights and record rules for hr, hr contract and hr payroll --- addons/hr/security/hr_security.xml | 7 ++++++ addons/hr_contract/__manifest__.py | 1 + .../security/contract_security.xml | 14 +++++++++++ addons/hr_payroll/models/hr_salary_rule.py | 5 +++- .../security/hr_payroll_security.xml | 24 +++++++++++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 addons/hr_contract/security/contract_security.xml diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 441d1d73..e1dac20c 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -28,6 +28,13 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Employee multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Job multi company rule diff --git a/addons/hr_contract/__manifest__.py b/addons/hr_contract/__manifest__.py index c711d627..8ee61f2c 100644 --- a/addons/hr_contract/__manifest__.py +++ b/addons/hr_contract/__manifest__.py @@ -20,6 +20,7 @@ You can assign several contracts per employee. 'website': 'https://flectrahq.com/page/employees', 'depends': ['hr'], 'data': [ + 'security/contract_security.xml', 'security/ir.model.access.csv', 'data/hr_contract_data.xml', 'views/hr_contract_views.xml', diff --git a/addons/hr_contract/security/contract_security.xml b/addons/hr_contract/security/contract_security.xml new file mode 100644 index 00000000..4b976a59 --- /dev/null +++ b/addons/hr_contract/security/contract_security.xml @@ -0,0 +1,14 @@ + + + + + + Hr Contract Multicompany + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + + diff --git a/addons/hr_payroll/models/hr_salary_rule.py b/addons/hr_payroll/models/hr_salary_rule.py index 85a99284..a0ebcd8e 100644 --- a/addons/hr_payroll/models/hr_salary_rule.py +++ b/addons/hr_payroll/models/hr_salary_rule.py @@ -19,7 +19,10 @@ class HrPayrollStructure(models.Model): @api.model def _get_parent(self): - return self.env.ref('hr_payroll.structure_base', False) + if self.env.user.company_id.id == self.env.ref( + 'base.base.main_company', False): + return self.env.ref('hr_payroll.structure_base', False) + return False name = fields.Char(required=True) code = fields.Char(string='Reference', required=True) diff --git a/addons/hr_payroll/security/hr_payroll_security.xml b/addons/hr_payroll/security/hr_payroll_security.xml index 5c25f0ef..1dbfadc8 100644 --- a/addons/hr_payroll/security/hr_payroll_security.xml +++ b/addons/hr_payroll/security/hr_payroll_security.xml @@ -33,5 +33,29 @@ + + Payslip Multicompany + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Payroll Structure Multicompany + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Hr Salary Rule Multicompany + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Hr Contribution Register Multicompany + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + +