diff options
| author | Thibault Francois <tfr@openerp.com> | 2010-12-10 13:58:55 +0100 |
|---|---|---|
| committer | Thibault Francois <tfr@openerp.com> | 2010-12-10 13:58:55 +0100 |
| commit | 234edbbbbe167c46803d52c60db2823a0bdb23e6 (patch) | |
| tree | 1a443c480d8a3b2acfd6de3081b14a72dfc628fe /addons/project_long_term/project_long_term_view.xml | |
| parent | 3244532a47717d981294e92641417c5e61b73dc0 (diff) | |
| parent | ac18005dd081d89b1143537da33d46b8a1f62c47 (diff) | |
[MERGE] lp:~openerp-dev/openobject-addons/trunk-dev-addons1/
bzr revid: tfr@openerp.com-20101210125855-eenp28fz2hmaeu13
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 8c7595f24bc..0cdb7af5ad7 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -257,7 +257,7 @@ <field name="arch" type="xml"> <search string="Project Phases"> <group colspan="4" col="20"> - <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check" default="1"/> + <filter string="Current" domain="[('state','in',('open','draft'))]" name="current" help="Draft and In Progress Phases" icon="terp-check"/> <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="In Progress Phases" icon="terp-camera_test"/> <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/> <separator orientation="vertical"/> @@ -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 |