diff options
| author | Khushboo Bhatt (Open ERP) <kbh@tinyerp.com> | 2012-07-19 17:26:38 +0530 |
|---|---|---|
| committer | Khushboo Bhatt (Open ERP) <kbh@tinyerp.com> | 2012-07-19 17:26:38 +0530 |
| commit | 4a87389f3189c86d99df317c4cd236afb013b5df (patch) | |
| tree | 112ceaae233c76a3924fb7f0245a37b95b129cad /addons/analytic_user_function/security | |
| parent | b0508a59a8367c97957f41ede9b1f0443d6b2909 (diff) | |
| parent | 06d731ebd2d20e8e58c3ec0e2242f9e27219f38d (diff) | |
[MERGE]merge with project branch and resolve conflicts
bzr revid: kbh@tinyerp.com-20120719115638-yd622zv6okdtaxfa
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
|