diff options
| author | Atik Agewan (OpenERP) <aag@tinyerp.com> | 2011-09-27 18:37:44 +0530 |
|---|---|---|
| committer | Atik Agewan (OpenERP) <aag@tinyerp.com> | 2011-09-27 18:37:44 +0530 |
| commit | 3d4e825221524617747d4801d3552a41f2b2e2d2 (patch) | |
| tree | 4bb301b2f04e97c2cf5eff467348c20b3bd790f1 /addons/project_long_term/project_long_term_view.xml | |
| parent | cb99fda783295e9b666c8cd2d3fe44ac569d0bd1 (diff) | |
| parent | 74eccd8e0cdf4f61bcc7d8ec8f3933a91a8b2f1f (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: aag@tinyerp.com-20110927130744-wmo9u75w6zxfz3t0
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 14 |
1 files changed, 7 insertions, 7 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..49b306ebfd5 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'}"/> @@ -140,7 +140,7 @@ </field> <separator string="" colspan="4"/> <group col="12" colspan="4"> - <field name="state" select="1"/> + <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/> <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/> <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/> <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/> @@ -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','pending'))]" name="current" help="Draft, In Progress and Pending Phases" icon="terp-check"/> + <group> + <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"/> <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"/> |