diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-12-13 15:55:12 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-12-13 15:55:12 +0530 |
| commit | cc9ff03c665d9e17f76b86cc849baff51eacdb2e (patch) | |
| tree | 3b88ac0ec14eed1fbd950782fa863aae11820948 /addons/project_long_term | |
| parent | 35da4ac8a958288b4e1fd3fc95726e6d4df437b9 (diff) | |
| parent | 9af72a1af1da64a622cba89dc99e4147586df11f (diff) | |
[MERGE] Merge from trunk addons
bzr revid: mra@mra-laptop-20101213102512-pdoxe192euxfqrse
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/i18n/project_long_term.pot | 2 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 17 | ||||
| -rw-r--r-- | addons/project_long_term/security/ir.model.access.csv | 4 |
3 files changed, 18 insertions, 5 deletions
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot index b3a2358809d..2e28070c646 100644 --- a/addons/project_long_term/i18n/project_long_term.pot +++ b/addons/project_long_term/i18n/project_long_term.pot @@ -500,7 +500,7 @@ msgstr "" #. module: project_long_term #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar -msgid "Working Period" +msgid "Working Time" msgstr "" #. module: project_long_term diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 39d9d1cfa8b..0cdb7af5ad7 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -377,7 +377,7 @@ src_model="project.phase" view_mode="tree,form" context="{'search_default_phase_id': [active_id]}" - domain="[('phase_id', '=', active_id)]" + domain="[('phase_id', '=', active_id),('project_id','=',project_id)]" /> <act_window @@ -386,8 +386,21 @@ name="Phases" res_model="project.phase" src_model="project.project" + domain="[('project_id', '=', active_id)]" view_mode="tree,form" - view_type="form" /> + view_type="form" + /> + + <act_window + context="{'search_default_user_id': [user_id]}" + id="act_project_resource" + name="Resources" + res_model="resource.resource" + src_model="project.project" + domain="[('user_id', '=',user_id)]" + view_mode="tree,form" + view_type="form" + /> # ------------------------------------------------------ # Menu Items diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv index 3aaebb64294..6d4961f2cfe 100644 --- a/addons/project_long_term/security/ir.model.access.csv +++ b/addons/project_long_term/security/ir.model.access.csv @@ -1,8 +1,8 @@ "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,0,0,0 +"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,1,1,1 +"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1 "access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1 |