diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-25 10:34:07 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-06-25 10:34:07 +0530 |
| commit | 3c7cd469e6d69c3c76cf15376e40a447bdf6066f (patch) | |
| tree | 2af6bc55fa83186cf6229b7cb61f5eb51dca852b /addons/project_long_term/project_long_term_view.xml | |
| parent | bbdbb9dd6b84bcdef34e7782432064d88fbe466f (diff) | |
| parent | 0a22debf5fb7af0dbf4ebf5039aa6ecbfb054a95 (diff) | |
[MERGE]
bzr revid: apa@tinyerp.com-20120622090553-lkvmsz12ooao1lug
bzr revid: apa@tinyerp.com-20120625050407-vfjnqgnqexrfvr8d
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 9ae945676b8..419c89cb449 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> @@ -273,18 +273,19 @@ <field name="arch" type="xml"> <search string="Project Phases"> <group> + <field name="name" string="Project Phases"/> + <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"/> |