diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-04-24 14:59:25 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-04-24 14:59:25 +0530 |
| commit | dfc4e3fb0979d76e47376680fbefc2a33e38bcd3 (patch) | |
| tree | 148f0e02cda3f890f40f0003d92334a44752e867 /addons/project_scrum | |
| parent | c6bcc6d69fd7a1f8de0ad93baa642d5801b96a32 (diff) | |
| parent | e9f015e217f1ff48d95e9b55a9515b7276240c48 (diff) | |
[MERGE]
bzr revid: apa@tinyerp.com-20120417112722-7rz5vvcg6eo0jf3e
bzr revid: apa@tinyerp.com-20120419051214-j4wvjp9kz1w0zqs7
bzr revid: apa@tinyerp.com-20120423053400-unc6y6lonksopys3
bzr revid: apa@tinyerp.com-20120424092925-ezqfnppvfgocj94t
Diffstat (limited to 'addons/project_scrum')
| -rw-r--r-- | addons/project_scrum/board_project_scrum_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_scrum/project_scrum_view.xml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml index 924a1cbf5cc..284208ee21f 100644 --- a/addons/project_scrum/board_project_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -75,7 +75,7 @@ <field name="model">board.board</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="My Board"> + <form string="My Board" layout="manual"> <board style="2-1"> <column> <action name="%(action_sprint_all_dashboard_tree)d" string="Sprints"/> diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 7fb84f12213..fe1301eb4c3 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -545,9 +545,9 @@ <field name="type">form</field> <field name="inherit_id" ref="project.view_task_form2"/> <field name="arch" type="xml"> - <xpath expr="/form/group/field[@name='progress']" position="after"> + <field name="progress" position="after"> <field domain="[('project_id','=',project_id),]" name="product_backlog_id" select="1"/> - </xpath> + </field> </field> </record> @@ -557,9 +557,9 @@ <field name="type">form</field> <field name="inherit_id" ref="project.view_task_form2"/> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page[@string='Extra Info']/group/field[@name='sequence']" position="after"> + <field name="sequence" position="after"> <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" readonly="1"/> - </xpath> + </field> </field> </record> |