[MERGE] from trunk

bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl

1 files changed, 3 insertions, 2 deletions

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index c88fb276fcb..8da415a7ae1 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -3,7 +3,8 @@ access_project_project,project.project,model_project_project,project.group_proje
 access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1

 access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0

 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1

-access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1

+access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,0,0,0

+access_project_task_type_manager,project.task.type manager,model_project_task_type,project.group_project_manager,1,1,1,1

 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1

 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1

 access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1

@@ -11,7 +12,7 @@ access_partner_task user,base.res.partner user,base.model_res_partner,project.gr
 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0

 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0

 access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,1

-access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,1,1,1

+access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,0,0,0

 access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,1

 access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0

 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1