diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-12-26 16:56:05 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-12-26 16:56:05 +0530 |
| commit | 82dd48691ba5ea5c6062d68763c3be2e81fc750a (patch) | |
| tree | e1d147f74edcf248f837cd27a2db5fd4a6bc92f7 /addons/analytic_user_function/security | |
| parent | 04bdda2a295cae1222702b029fdaf61684142816 (diff) | |
| parent | 01555b28a9fdf8ce1d0c17039d9d4af260010671 (diff) | |
[MERGE]: Merge with latest trunk-addons and resolved conflicts
bzr revid: rpa@tinyerp.com-20111226112605-zxbl07jkzjtpyktw
Diffstat (limited to 'addons/analytic_user_function/security')
| -rw-r--r-- | addons/analytic_user_function/security/ir.model.access.csv | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv index d8f2f0d2116..fe48e329aea 100644 --- a/addons/analytic_user_function/security/ir.model.access.csv +++ b/addons/analytic_user_function/security/ir.model.access.csv @@ -1,6 +1,6 @@ -"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","account.group_account_manager",1,0,0,0 -"access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1 -"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 +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_analytic_user_funct_user,analytic user funct user,model_analytic_user_funct_grid,account.group_account_manager,1,0,0,0
+access_analytic_user_funct_manager,analytic user funct manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1
+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
|