diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-08-31 16:32:22 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-08-31 16:32:22 +0200 |
| commit | b3ec8d76470ea9b49e9ef548dce58780f571ba00 (patch) | |
| tree | 77cf367600fe58e3ba7c241c09073bf7f2d300e2 /addons/project_long_term | |
| parent | 846ec67adc911b32712039c09225142195aa70ad (diff) | |
| parent | 1eac0fbe525eea0cca7ba137878d31124b648535 (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20120831143222-j86sa4w0vuy24z7j
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 4 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index d5ac3868a5e..2eab5fa6ac6 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -273,9 +273,9 @@ class account_analytic_account(osv.osv): _inherit = 'account.analytic.account' _description = 'Analytic Account' _columns = { - 'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"), + 'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"), } - + def on_change_template(self, cr, uid, ids, template_id, context=None): res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) if template_id and 'value' in res: 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> |