From 5bac583ce71eb3118b1c69968dc2b282ff0c4a0a Mon Sep 17 00:00:00 2001 From: mtr Date: Wed, 8 Jun 2011 12:59:35 +0530 Subject: [PATCH 1/4] [FIX] analytic,hr,hr_evaluation,hr_expense,hr_recruitment: added multi-company access rules lp bug: https://launchpad.net/bugs/788139 fixed bzr revid: mtr@mtr-20110608072935-blig6ejq1oa36un5 --- .../analytic/security/analytic_security.xml | 8 ++++++++ addons/hr/security/hr_security.xml | 19 +++++++++++++++++-- .../security/hr_evaluation_security.xml | 15 +++++++++++++++ addons/hr_expense/security/ir_rule.xml | 6 ++++++ .../security/hr_recruitment_security.xml | 6 ++++++ 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index dfa8c840bb6..165bb92f6b9 100644 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -7,6 +7,14 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + Analytic line multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Useability / Analytic Accounting diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index aba7d4b45e1..cf7dbd19f80 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -1,6 +1,6 @@ - + Human Resources / Manager @@ -9,5 +9,20 @@ Human Resources / Officer - + + + Department multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Job multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml index 1520b61b55a..c99ddf41545 100644 --- a/addons/hr_evaluation/security/hr_evaluation_security.xml +++ b/addons/hr_evaluation/security/hr_evaluation_security.xml @@ -19,5 +19,20 @@ + + + Evaluation Plan multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Evaluation Plan Phase multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml index 292db38bf5e..65b02edeb1a 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -20,6 +20,12 @@ [('employee_id.user_id','=',user.id)] + + Expense multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml index e159be6a9db..570b0f036cd 100644 --- a/addons/hr_recruitment/security/hr_recruitment_security.xml +++ b/addons/hr_recruitment/security/hr_recruitment_security.xml @@ -2,6 +2,12 @@ + + Applicant multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + From eadf55ff5eb04af96ea565e3ef36f334b65f82c6 Mon Sep 17 00:00:00 2001 From: mtr Date: Wed, 8 Jun 2011 15:03:19 +0530 Subject: [PATCH 2/4] [FIX] account_followup,account_analytic_default: added security.xml file to have multi-company access rules bzr revid: mtr@mtr-20110608093319-wffw6e4w07tn2c8d --- .../security/account_analytic_default_security.xml | 13 +++++++++++++ .../security/account_followup_security.xml | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 addons/account_analytic_default/security/account_analytic_default_security.xml create mode 100644 addons/account_followup/security/account_followup_security.xml diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml new file mode 100644 index 00000000000..7ff68c7d849 --- /dev/null +++ b/addons/account_analytic_default/security/account_analytic_default_security.xml @@ -0,0 +1,13 @@ + + + + + + Analytic Default multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml new file mode 100644 index 00000000000..6d9ac39ac33 --- /dev/null +++ b/addons/account_followup/security/account_followup_security.xml @@ -0,0 +1,13 @@ + + + + + + Account Followup multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + From 307197d8e934c05383906479fac70716477b2a59 Mon Sep 17 00:00:00 2001 From: mtr Date: Mon, 20 Jun 2011 17:22:37 +0530 Subject: [PATCH 3/4] [IMP] account_followup, account_analytic_default: added newly created security files in __openerp__.py file bzr revid: mtr@mtr-20110620115237-f0p0jho7gv4oyzgl --- addons/account_analytic_default/__openerp__.py | 6 +++++- addons/account_followup/__openerp__.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py index 0b9aa33c503..847a44ba1e7 100644 --- a/addons/account_analytic_default/__openerp__.py +++ b/addons/account_analytic_default/__openerp__.py @@ -38,7 +38,11 @@ Allows to automatically select analytic accounts based on criterions: 'images' : ['images/analytic_defaults.jpeg'], 'depends' : ['sale'], 'init_xml' : [], - 'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'], + 'update_xml': [ + 'security/ir.model.access.csv', + 'security/account_analytic_default_security.xml', + 'account_analytic_default_view.xml' + ], 'demo_xml' : [], 'installable': True, 'active': False, diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index bda833d5767..274a34fb736 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -47,6 +47,7 @@ Note that if you want to check the followup level for a given partner/account en 'depends': ['account'], 'init_xml': [], 'update_xml': [ + 'security/account_followup_security.xml', 'security/ir.model.access.csv', 'wizard/account_followup_print_view.xml', 'report/account_followup_report.xml', From eea80125f7d1c739260929fb1f38866ef21439e1 Mon Sep 17 00:00:00 2001 From: mtr Date: Wed, 6 Jul 2011 17:36:52 +0530 Subject: [PATCH 4/4] [IMP] account_followup: added security rule for 'Followup Statistics by Partner' model bzr revid: mtr@mtr-20110706120652-1g70tb4wsl3q0dtx --- .../security/account_followup_security.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml index 6d9ac39ac33..f21c21e2367 100644 --- a/addons/account_followup/security/account_followup_security.xml +++ b/addons/account_followup/security/account_followup_security.xml @@ -9,5 +9,12 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Account Followup Statistics by Partner Rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + +