diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-18 11:25:58 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-18 11:25:58 +0530 |
| commit | c45d68d6b80c3a339463d37ecc3bbd766ef101d3 (patch) | |
| tree | f5dba2eacf7f9b0d059fb429d9f9e499997668c0 /addons/project_long_term/project_long_term_view.xml | |
| parent | 8dfc9f18d365d8decd635f69b2b03dcb7f254ad6 (diff) | |
| parent | 2a89c6079c9f7f5d9135bcda777fda3f3ed8d859 (diff) | |
[MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
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> |