diff options
| author | tfr@openerp.com <> | 2011-09-22 05:02:01 +0200 |
|---|---|---|
| committer | tfr@openerp.com <> | 2011-09-22 05:02:01 +0200 |
| commit | 2f7006896fb27c381f38618ade69801be8ae7626 (patch) | |
| tree | 28ffa636934472d05e5eceedc8358239da5659c1 /addons/project_long_term/project_long_term_view.xml | |
| parent | 66f6e85d642bbd482a063377f3aa668427a7456c (diff) | |
| parent | 3b643521330363310a330c22aab0de161870939b (diff) | |
[MERGE] trunk
bzr revid: tfr@openerp.com-20110922030201-e3skbi1cbp5iv1bl
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b720da13654..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,8 +266,8 @@ <field name="type">search</field> <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"/> + <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"/> <separator orientation="vertical"/> @@ -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"/> |