diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-07-16 10:12:40 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-07-16 10:12:40 +0530 |
| commit | 248f7ade33f80f51a969d6ff0f6286ca88d01ee7 (patch) | |
| tree | 655de14cf580470a42d54b434838976d7f1d38a5 /addons/project_long_term/project_long_term_view.xml | |
| parent | f397081dce10375a6d8692f554a8049bc5bf915d (diff) | |
| parent | 6dac47419fa0b65f6be078e74e2664fcb95a2bc4 (diff) | |
[Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120712044109-ffyj5eavkrtze574
bzr revid: mdi@tinyerp.com-20120713042730-web0bk83baozc0og
bzr revid: mdi@tinyerp.com-20120716044240-1boga05nifw4gfe9
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index a98e9088402..7d7310465d6 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -155,20 +155,21 @@ <div class="oe_title"> <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> <group> - <label for="date_start" string="Duration"/> - <div> - <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> + <label for="date_start" string="Duration"/> + <div> + <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> |