diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-09-25 12:33:05 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-09-25 12:33:05 +0200 |
| commit | 8a4bd2e816a7293653b1db42f29a9b87f473bf06 (patch) | |
| tree | 79e47872809e337d34ca4a6c58ead571bd464e0f /addons/project_long_term/project_long_term_view.xml | |
| parent | 642e4c02b1fa3685bb386b5821c4216e98681812 (diff) | |
| parent | 7debc08809d8836995d0e79c6299ca91bdee1dfe (diff) | |
[MERGE] latest trunk
bzr revid: abo@openerp.com-20120925103305-6g4bwz3bmf7edmdt
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index b4b98e8fe4a..55a91b36f08 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -96,11 +96,14 @@ <field name="model">project.project</field> <field name="inherit_id" ref="project.edit_project"/> <field name="arch" type="xml"> - <xpath expr='//tr[@name="use_tasks_row"]' position='after'> - <tr> - <td><group><field name="use_phases"/></group></td> - <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td> - </tr> + <xpath expr="//div[@name='options_active']" position='inside'> + <field name="use_phases" class="oe_inline"/> + <label for="use_phases"/> + </xpath> + <xpath expr="//div[@name='buttons']" position='inside'> + <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" + string="Phases" type="action" + attrs="{'invisible':[('use_phases','=', 0)]}"/> </xpath> </field> </record> @@ -347,11 +350,9 @@ <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/> <field eval="18" name="priority"/> <field name="arch" type="xml"> - <xpath expr='//separator[@name="project_sep"]' position='replace'> - <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute --> - </xpath> - <xpath expr='//separator[@name="project_sep"]' position='after'> + <xpath expr='//div[@name="project"]' position='inside'> <field name="use_phases"/> + <label for="use_phases"/> </xpath> </field> </record> |