diff options
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term.py | 2 | ||||
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 5b88d5209c8..b19238200e5 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -292,7 +292,7 @@ account_analytic_account() class project_task(osv.osv): _inherit = "project.task" _columns = { - 'phase_id': fields.many2one('project.phase', 'Project Phase'), + 'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"), } project_task() diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 55a91b36f08..69fe335c1b0 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -83,13 +83,14 @@ <!-- Project Phase --> - <act_window id="act_project_phases" - name="Phases" - src_model="project.project" - res_model="project.phase" - view_type="form" - view_mode="tree,form" - context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/> + + <record id="act_project_phases" model="ir.actions.act_window"> + <field name="res_model">project.phase</field> + <field name="view_type">form</field> + <field name="name">Phases</field> + <field name="view_mode">tree,form</field> + <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field> + </record> <record id="project_phase_form" model="ir.ui.view"> <field name="name">Inherit project form : Phase</field> @@ -101,7 +102,7 @@ <label for="use_phases"/> </xpath> <xpath expr="//div[@name='buttons']" position='inside'> - <button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" + <button name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/> </xpath> @@ -123,6 +124,14 @@ </xpath> </field> </record> + + <record id="project_phase_task_list" model="ir.actions.act_window"> + <field name="res_model">project.task</field> + <field name="view_type">form</field> + <field name="name">Tasks</field> + <field name="view_mode">tree,form</field> + <field name="context">{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}</field> + </record> <record id="view_project_phase_form" model="ir.ui.view"> <field name="name">project.phase.form</field> @@ -138,6 +147,7 @@ <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> </header> <sheet> + <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/> <div class="oe_title"> <label for="name" class="oe_edit_only"/> <h1><field name="name"/></h1> @@ -336,14 +346,6 @@ </field> </record> - <act_window - context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}" - id="project_phase_task_list" - name="Related Tasks" - res_model="project.task" - src_model="project.phase" - view_mode="tree,form"/> - <record id="analytic_account_inherited_phase_form" model="ir.ui.view"> <field name="name">account.analytic.account.phase.form.inherit</field> <field name="model">account.analytic.account</field> |