[MERGE] merge with main branch

[odoo/odoo.git] / addons / project_scrum / project_scrum_view.xml

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 3063f32..1c73aa0 100644 (file)
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -102,7 +102,7 @@
                                         <field name="type_id" invisible="context.get('set_visible',False)"/>
                                         <field name="date_start" invisible="1"/>
                                         <field name="date_end" invisible="1"/>
-                                        <button name="next_type" invisible="context.get('set_visible',False)"
+                                        <button name="stage_next" invisible="context.get('set_visible',False)"
                                             states="draft,open,pending"
                                             string="Change Stage"
                                             type="object"
@@ -568,7 +568,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="user_id" position="before">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
                         <filter icon="terp-check" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
                         <filter icon="gtk-find" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>