summaryrefslogtreecommitdiff
path: root/addons/project_long_term/security
diff options
context:
space:
mode:
authorHarry (OpenERP) <hmo@tinyerp.com>2010-09-14 15:24:41 +0530
committerHarry (OpenERP) <hmo@tinyerp.com>2010-09-14 15:24:41 +0530
commit58cfff7027a3537fcb78f7a754d87c19a31299c9 (patch)
tree0f42075395af7d868b7f0994526cfe7a5051dab2 /addons/project_long_term/security
parentf9dd99169d569ebe2b710bf4f4305ff55293eb14 (diff)
parent91e1d6b44548673d8649ce768ba9a0768d4b04a2 (diff)
[MERGE] Merged after remove conflicts
bzr revid: hmo@tinyerp.com-20100914095441-8y5erodnlhpka4cx
Diffstat (limited to 'addons/project_long_term/security')
-rw-r--r--addons/project_long_term/security/ir.model.access.csv17
1 files changed, 7 insertions, 10 deletions
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index a2cbb2b3ddf..3653cd375f1 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,12 +1,9 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
-"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
-"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
-"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
-"access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,1,0,0
-"access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
+"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,0
+"access_project_phase_manager","project.phase manager","model_project_phase",project.group_project_manager,1,0,0,0
+"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation",project.group_project_manager,1,0,0,0
+"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation",base.group_system,1,0,0,0
+"access_project_phase_system","project.phase system","model_project_phase",base.group_system,1,0,0,0
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource",project.group_project_user,1,1,1,1
"access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
-"access_resource_calendar_manager","resource.calendar manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
-"access_resource_calendar_user","resource.calendar user","resource.model_resource_calendar","project.group_project_user",1,0,0,0