diff options
| author | Saurang Suthar (OpenERP) <ssu@tinyerp.com> | 2012-05-09 18:16:04 +0530 |
|---|---|---|
| committer | Saurang Suthar (OpenERP) <ssu@tinyerp.com> | 2012-05-09 18:16:04 +0530 |
| commit | 0e6f4821c4a9e739f4f3c7d8706c4664473a77b6 (patch) | |
| tree | 9bafa1d2999fc47478c1dfb8be43e4a32a3052bd /addons/project_long_term/project_long_term_view.xml | |
| parent | ecf4383009fa58b39d9b209db470926abca8ab33 (diff) | |
| parent | 8a4959cd290685109955677df2b75a40867d88d9 (diff) | |
merge with latest trunk
bzr revid: ssu@tinyerp.com-20120509054553-e5mpyl997izy28nx
bzr revid: ssu@tinyerp.com-20120509124604-hv7x2zvq2gcxbjvl
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 54 |
1 files changed, 41 insertions, 13 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index d6c2dcb43e2..ccde2f2d877 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -84,12 +84,12 @@ </search> </field> </record> - <record id="act_resouce_allocation" model="ir.actions.act_window"> + <record id="act_resouce_allocation" model="ir.actions.act_window"> <field name="name">Planning of Users</field> <field name="res_model">project.user.allocation</field> <field name="view_type">form</field> <field name="view_mode">gantt,tree,form,calendar</field> - <field name="context">{}</field> + <field name="context">{}</field> <field name="search_view_id" ref="view_project_user_allocation_search"/> </record> @@ -98,6 +98,44 @@ # Project Phase # ------------------------------------------------------ + <record id="project_phase_form" model="ir.ui.view"> + <field name="name">Inherit project form : Phase</field> + <field name="model">project.project</field> + <field name="type">form</field> + <field name="inherit_id" ref="project.edit_project"/> + <field name="arch" type="xml"> + <field name="use_tasks" position="after"> + <field name="use_phases"/> + </field> + </field> + </record> + + <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="view_project_kanban_phase" model="ir.ui.view"> + <field name="name">project.project.kanban.inherited</field> + <field name="model">project.project</field> + <field name="type">kanban</field> + <field name="inherit_id" ref="project.view_project_kanban"/> + <field name="arch" type="xml"> + <field name="use_tasks" position="after"> + <field name="use_phases"/> + <field name="phase_count"/> + </field> + <xpath expr="//div[@id='list']" position="inside"> + <a t-if="record.use_phases.raw_value" class="oe_project_buttons" + id="4" name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a> + </xpath> + </field> + </record> + <record id="view_project_phase_form" model="ir.ui.view"> <field name="name">project.phase.form</field> <field name="model">project.phase</field> @@ -278,7 +316,7 @@ <field name="inherit_id" ref="project.view_task_form2"/> <field name="arch" type="xml"> <xpath expr="//field[@name='effective_hours']" position="after"> - <field name="phase_id"/> + <field name="phase_id" context="{'default_project_id' : project_id}"/> </xpath> </field> </record> @@ -327,16 +365,6 @@ view_mode="tree,form" /> - <act_window - context="{'search_default_project_id': active_id, 'default_project_id': active_id}" - id="act_project_phases" - name="Phases" - res_model="project.phase" - src_model="project.project" - view_mode="tree,form" - view_type="form" - /> - # ------------------------------------------------------ # Menu Items # ------------------------------------------------------ |