From 4d53266e236d1816e45b13aa50bcafb1bab2bc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 8 Nov 2018 12:37:04 +0000
Subject: [PATCH] [IMP] base, mail: better xpath for server actions and add
 autofocus

Commit linked to task ID 1906924 and PR #28538.
---
 addons/mail/views/ir_actions_views.xml      | 8 ++++----
 odoo/addons/base/views/ir_actions_views.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mail/views/ir_actions_views.xml b/addons/mail/views/ir_actions_views.xml
index 9a83ebf0316..6d75522b755 100644
--- a/addons/mail/views/ir_actions_views.xml
+++ b/addons/mail/views/ir_actions_views.xml
@@ -7,7 +7,7 @@
             <field name="model">ir.actions.server</field>
             <field name="inherit_id" ref="base.view_server_action_form"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
+                <xpath expr="//page[@name='page_object']" position="after">
                     <page string="Activity" name="next_activity" autofocus="autofocus" attrs="{'invisible': [('state', '!=', 'next_activity')]}">
                         <group>
                             <group>
@@ -33,8 +33,8 @@
                         </group>
                         <field name="activity_note" placeholder="Log a note..."/>
                     </page>
-                </notebook>
-                <field name="link_field_id" position="after">
+                </xpath>
+                <xpath expr="//field[@name='link_field_id']" position="after">
                     <field name="partner_ids" widget="many2many_tags"
                         attrs="{'invisible': [('state', '!=', 'followers')]}"/>
                     <field name="channel_ids" widget="many2many_tags"
@@ -42,7 +42,7 @@
                     <field name="template_id"
                         attrs="{'invisible': [('state', '!=', 'email')],
                                 'required': [('state', '=', 'email')]}"/>
-                </field>
+                </xpath>
             </field>
         </record>
 
diff --git a/odoo/addons/base/views/ir_actions_views.xml b/odoo/addons/base/views/ir_actions_views.xml
index 35e390bdba6..a81ce4b5bf9 100644
--- a/odoo/addons/base/views/ir_actions_views.xml
+++ b/odoo/addons/base/views/ir_actions_views.xml
@@ -294,7 +294,7 @@
                                 <field name="code" widget="ace" options="{'mode': 'python'}" placeholder="Enter Python code here. Help about Python expression is available in the help tab of this document."/>
                             </page>
 
-                            <page string="Data to Write" autofocus="autofocus"
+                            <page string="Data to Write" name="page_object" autofocus="autofocus"
                                     attrs="{'invisible':[('state', 'not in', ['object_create', 'object_write'])]}">
                                 <p attrs="{'invisible': [('model_id', '!=', False)]}">
                                     Please set the Model to Create before choosing values
@@ -318,7 +318,7 @@
                                 <field name="child_ids" domain="[('model_id', '=', model_id)]"/>
                             </page>
 
-                            <page string="Help"
+                            <page string="Help" autofocus="autofocus"
                                     attrs="{'invisible': [('state', '!=', 'code')]}">
                                 <group>
                                     <div style="margin-top: 4px;">