diff options
| author | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-14 09:52:50 +0530 |
|---|---|---|
| committer | Sbh (OpenERP) <sbh@tinyerp.com> | 2010-12-14 09:52:50 +0530 |
| commit | 2d258d4113c4aa71ed3f9d8dcc6356d58ed72e51 (patch) | |
| tree | df6decd3b7af6887a5376b88aeb72ee1a892d3b7 /addons/project_long_term | |
| parent | 27245543a3502e7b534abd9f29421d006d8e97df (diff) | |
| parent | 1a59775f59513ee016df96754863580fc24c6de0 (diff) | |
[MERGE] merge with team1 branch
bzr revid: sbh@tinyerp.com-20101214042250-8wop16wze4felppt
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 |
2 files changed, 16 insertions, 3 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 |