diff options
| author | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-06-25 09:49:34 +0530 |
|---|---|---|
| committer | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-06-25 09:49:34 +0530 |
| commit | 43a50a651bbe4edf7288b088acc1ec7fbf94bcfd (patch) | |
| tree | 5ffad287a27fefc3e747bcbb3e5b89acb83abc20 /addons/project_long_term/project_long_term_view.xml | |
| parent | 501721883d488f6a6981bdb49ac112943d32001f (diff) | |
| parent | 0a22debf5fb7af0dbf4ebf5039aa6ecbfb054a95 (diff) | |
[MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
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 2dc5137b4ed..6d992a96cdc 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"/> + <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"/> |