diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-03 16:24:50 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-03 16:24:50 +0200 |
| commit | f0873dcb32a673c83a7d9e5c3e35f4226d9051a8 (patch) | |
| tree | 669f2f30cb225f24681cb6de886c8fb6e0a49ea5 /addons/analytic_user_function/security | |
| parent | 093f7392738355edb718e777bd951908c29c12ec (diff) | |
| parent | c61431bd3ee9db871317156fddb80ce662543f96 (diff) | |
[MERGE] Sync with trunk - bunch of conflicts resolved
bzr revid: odo@openerp.com-20120803142450-97z551yam1js822h
Diffstat (limited to 'addons/analytic_user_function/security')
| -rw-r--r-- | addons/analytic_user_function/security/ir.model.access.csv | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv index fe48e329aea..e97dc28bca7 100644 --- a/addons/analytic_user_function/security/ir.model.access.csv +++ b/addons/analytic_user_function/security/ir.model.access.csv @@ -4,3 +4,4 @@ access_analytic_user_funct_manager,analytic user funct manager,model_analytic_us access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0
access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1
+access_analytic_user_funct_grid_all,analytic user funct grid,model_analytic_user_funct_grid,base.group_user,1,0,0,0
|