diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2012-07-16 12:57:42 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2012-07-16 12:57:42 +0530 |
| commit | eeb53ea575225bcc08a8cbf9130ec0606adba6dc (patch) | |
| tree | 92a6c8ba07a8276201c6901863f2ab6f20556df1 /addons/project_long_term/project_long_term_view.xml | |
| parent | 9aa7368efb4babeec4d752365ad2ce0020f5184c (diff) | |
| parent | 6dac47419fa0b65f6be078e74e2664fcb95a2bc4 (diff) | |
[MERGE] upstream
bzr revid: hmo@tinyerp.com-20120716072742-jzalogwmc2va2cbn
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 419c89cb449..7d7310465d6 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -136,7 +136,7 @@ </xpath> </field> </record> - + <record id="view_project_phase_form" model="ir.ui.view"> <field name="name">project.phase.form</field> <field name="model">project.phase</field> @@ -144,7 +144,7 @@ <field name="arch" type="xml"> <form string="Project Phase" version="7.0"> <header> - <button string="Start Phase" name="set_open" states="pending,draft"/> + <button string="Start Phase" name="set_open" states="pending,draft" class="oe_highlight"/> <button string="Done" name="set_done" states="pending,open"/> <button string="Pending" name="set_pending" states="open"/> <button string="Draft" name="set_draft" states="open"/> @@ -152,23 +152,24 @@ <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> </header> <sheet> - <label for="name" class="oe_edit_only"/> - <h1><field name="name"/></h1> - <label for="project_id" class="oe_edit_only"/> - <h2> - <field name="project_id" on_change="onchange_project(project_id)" colspan="3"/> - </h2> + <div class="oe_title"> + <label for="name" class="oe_edit_only"/> + <h1><field name="name"/></h1> + </div> <group> <group> - <field name="date_start"/> - <field name="date_end"/> - </group><group> - <label for="duration"/> + <label for="date_start" string="Duration"/> <div> - <field name="duration" class="oe_inline"/> - <field name="product_uom"/> + <div> + <field name="duration" class="oe_inline"/> + <field name="product_uom" class="oe_inline"/> + </div> + <field name="date_start" class="oe_inline"/><label string=" - " class="oe_inline"/><field name="date_end" class="oe_inline"/> </div> </group> + <group> + <field name="project_id" on_change="onchange_project(project_id)"/> + </group> </group> <notebook> <page string="Planning of Users"> @@ -211,10 +212,9 @@ </group> <group> <field name="sequence"/> + <field name="user_force_ids" widget="many2many_tags"/> </group> </group> - <separator string="Force Assigned Users"/> - <field name="user_force_ids" widget="many2many_tags" /> <separator string="Previous Phases"/> <field name="previous_phase_ids"/> <separator string="Next Phases"/> @@ -327,7 +327,7 @@ <field name="type">form</field> <field name="inherit_id" ref="project.view_task_form2"/> <field name="arch" type="xml"> - <xpath expr="//field[@name='effective_hours']" position="after"> + <xpath expr="//field[@name='user_id']" position="after"> <field name="phase_id" context="{'default_project_id' : project_id}"/> </xpath> </field> |