From e4381d9f1bc929a01d103b5b9a2cdbc6751c7779 Mon Sep 17 00:00:00 2001
From: Pierre Paridans <app@odoo.com>
Date: Tue, 7 Aug 2018 09:38:04 +0200
Subject: [PATCH] [IMP] base_automation: Reorganize server action form view

---
 .../views/base_automation_view.xml            | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/addons/base_automation/views/base_automation_view.xml b/addons/base_automation/views/base_automation_view.xml
index d767585b10c..206f7897c75 100644
--- a/addons/base_automation/views/base_automation_view.xml
+++ b/addons/base_automation/views/base_automation_view.xml
@@ -22,26 +22,24 @@
                         </button>
                     </div>
                 </div>
-                <xpath expr="//group[@name='action_wrapper']" position="inside">
-                    <group>
-                        <field name="trigger"/>
+                <xpath expr="//group[@name='action_content']" position="inside">
+                    <field name="trigger"/>
 
-                        <field name="filter_pre_domain" widget="domain" options="{'model': 'model_name', 'in_dialog': True}" attrs="{'invisible': [('trigger', 'not in', ['on_write','on_create_or_write'])]}"/>
-                        <field name="filter_domain" widget="domain" options="{'model': 'model_name', 'in_dialog': True}"/>
+                    <field name="filter_pre_domain" widget="domain" options="{'model': 'model_name', 'in_dialog': True}" attrs="{'invisible': [('trigger', 'not in', ['on_write','on_create_or_write'])]}"/>
+                    <field name="filter_domain" widget="domain" options="{'model': 'model_name', 'in_dialog': True}"/>
 
-                        <field name="on_change_fields"
-                            attrs="{'invisible': [('trigger', '!=', 'on_change')], 'required': [('trigger', '=', 'on_change')]}"/>
-                        <field name="trg_date_id"
-                            attrs="{'invisible': [('trigger', '!=', 'on_time')], 'required': [('trigger', '=', 'on_time')]}"/>
-                        <label for="trg_date_range"
-                            attrs="{'invisible': [('trigger', '!=', 'on_time')]}"/>
-                        <div class="o_row" attrs="{'invisible': [('trigger', '!=', 'on_time')]}">
-                            <field name="trg_date_range" attrs="{'required': [('trigger','=','on_time')]}"/>
-                            <field name="trg_date_range_type" attrs="{'required': [('trigger','=','on_time')]}"/>
-                        </div>
-                        <field name="trg_date_calendar_id" 
-                            attrs="{'invisible': ['|', ('trg_date_id','=',False), ('trg_date_range_type', '!=', 'day')]}"/>
-                    </group>
+                    <field name="on_change_fields"
+                        attrs="{'invisible': [('trigger', '!=', 'on_change')], 'required': [('trigger', '=', 'on_change')]}"/>
+                    <field name="trg_date_id"
+                        attrs="{'invisible': [('trigger', '!=', 'on_time')], 'required': [('trigger', '=', 'on_time')]}"/>
+                    <label for="trg_date_range"
+                        attrs="{'invisible': [('trigger', '!=', 'on_time')]}"/>
+                    <div class="o_row" attrs="{'invisible': [('trigger', '!=', 'on_time')]}">
+                        <field name="trg_date_range" attrs="{'required': [('trigger','=','on_time')]}"/>
+                        <field name="trg_date_range_type" attrs="{'required': [('trigger','=','on_time')]}"/>
+                    </div>
+                    <field name="trg_date_calendar_id"
+                        attrs="{'invisible': ['|', ('trg_date_id','=',False), ('trg_date_range_type', '!=', 'day')]}"/>
                 </xpath>
             </field>
         </record>