diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-07-13 14:54:09 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-07-13 14:54:09 +0200 |
| commit | 79e81b7fd91babd2c9277148ae5700d88d96a8d9 (patch) | |
| tree | 5c849de72f6a480eb0bf90c4652f3bba13b27d62 /addons/project_long_term/project_long_term_view.xml | |
| parent | 6587e7fe998c59aa2f3309440b8c9663a797d8df (diff) | |
| parent | 1176476743be0b76708358b416429006356f1876 (diff) | |
[MERGE] merging is fun !
bzr revid: fva@openerp.com-20120713121803-w74ztfvizlm4v5f9
bzr revid: fva@openerp.com-20120713123434-25ciq29rkgmq0035
bzr revid: fva@openerp.com-20120713125409-uuc3vrr3rcqsgt2n
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> |