diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-06-22 15:00:58 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-06-22 15:00:58 +0530 |
| commit | 7c9436f69c5d82d0b7b1c9847b9209bcbf800d77 (patch) | |
| tree | 0651704cb7a1f588e48b7eca2fe48721d610689c /addons/project_long_term/project_long_term_view.xml | |
| parent | 2b85a687e531ce32a8d3260c0db5a38ce4ced618 (diff) | |
| parent | 4ad7c5d05061f0ef8631aee0be10ea8a9983608d (diff) | |
[MERGE] merge with old review_all_search branch to get all changes
bzr revid: psi@tinyerp.com-20120622093058-njdc6dmlmjzrs618
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 18babab66a4..57f43c17e06 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -70,16 +70,16 @@ <field name="arch" type="xml"> <search string="Planning of Users"> <group> - <field name="user_id"/> - <field name="phase_id"/> - <field name="project_id"/> + <field name="user_id"/> + <field name="phase_id"/> + <field name="project_id"/> </group> <newline/> <group expand="0" string="Group By..."> - <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> - <separator orientation="vertical"/> - <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> - <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/> + <filter name="user" string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <separator orientation="vertical"/> + <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> + <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/> </group> </search> </field> @@ -272,18 +272,19 @@ <field name="arch" type="xml"> <search string="Project Phases"> <group> + <field name="name" string="Project Phases" filter_domain="[('name','ilike',self)]"/> + <separator orientation="vertical"/> + <field name="date_start"/> + <field name="date_end"/> + <separator orientation="vertical"/> <filter string="New" domain="[('state','=','draft')]" name="current" help="New 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"/> + <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/> <separator orientation="vertical"/> - <field name="name"/> - <field name="project_id"> - <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/> - </field> - <field name="date_start"/> - <field name="date_end"/> + <field name="project_id"/> </group> - <newline/> + <newline/> <group expand="0" string="Group By..."> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/> <separator orientation="vertical"/> |