diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-30 18:35:22 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-30 18:35:22 +0530 |
| commit | b02a3684d0ad01c19ecf540232fc17c896d9bd85 (patch) | |
| tree | b3dfbcb368a2ad95bcb55608392d420098418bd6 /addons/project_long_term | |
| parent | 11bf57f1bf45f308ad76c35fd0f42560298a86f4 (diff) | |
| parent | eddbed0f583d5d81ab61759d5e25af3c04181334 (diff) | |
[MERGE]merge with parent branch and resolve conflicts
bzr revid: sgo@tinyerp.com-20120530130522-f8d6vem8wwlp0z4r
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 2d7412f7e7d..9497b3ad6ec 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -97,28 +97,30 @@ # ------------------------------------------------------ # 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="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> + <xpath expr='//tr[@name="use_tasks_row"]' position='after'> + <tr name="use_phases_row"> + <th style="border-right:1px solid #DDD;" width="140px">Phases Planing</th> + <td><field name="use_phases" nolabel="1"/></td> + <td style="text-align:right;"><button class="oe_btn_width" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td> + </tr> + </xpath> </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> @@ -330,7 +332,7 @@ <field name="type">search</field> <field name="inherit_id" ref="project.view_task_search_form"/> <field name="arch" type="xml"> - <field name="project_id" position="after"> + <field name="name" position="after"> <field name="phase_id" select="1"/> </field> </field> |