diff options
| author | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2011-09-22 14:42:49 +0530 |
|---|---|---|
| committer | Mayur Maheshwari (OpenERP) <mma@tinyerp.com> | 2011-09-22 14:42:49 +0530 |
| commit | 4b7f5b73a61a59048d690ef99d1d918d384ad300 (patch) | |
| tree | f621604b62d635629974f4900eeff8865d0dcddc /addons/project_long_term/project_long_term_view.xml | |
| parent | b66ca8252eeee30df9722c857b6e79296106bf05 (diff) | |
| parent | ef4795dbe6637893fdf627ddd5e15ae6e8be1983 (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20110922091249-qlx9jubz52izvifr
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 819fdbd7542..c53f4196202 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -74,13 +74,13 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Resources Allocation"> - <group colspan="4" col="20"> + <group> <field name="resource_id"/> <field name="phase_id"/> <field name="project_id"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20"> + <group expand="0" string="Group By..."> <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/> <separator orientation="vertical"/> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/> @@ -220,7 +220,7 @@ <field name="type">tree</field> <field name="priority" eval="5"/> <field name="arch" type="xml"> - <tree colors="grey:state in ('cancelled','done');blue:state in ('pending')" string="Project Phases"> + <tree colors="grey:state in ('cancelled','done');blue:state == 'pending'" string="Project Phases"> <field name="name"/> <field name="project_id" on_change="onchange_project(project_id)"/> <field name="responsible_id"/> @@ -266,7 +266,7 @@ <field name="type">search</field> <field name="arch" type="xml"> <search string="Project Phases"> - <group colspan="4" col="20"> + <group> <filter string="Current" domain="[('state','in',('open','draft','pending'))]" name="current" help="Draft, In Progress and Pending 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"/> @@ -280,7 +280,7 @@ <field name="date_end"/> </group> <newline/> - <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended"> + <group expand="0" string="Group By..." groups="base.group_extended"> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/> <separator orientation="vertical"/> <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/> |