From 920d841ffaa8142e46a881b79ccb8fa692ec0b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 23 Jun 2023 13:55:16 +0200
Subject: [PATCH] Extend the action views for all type of actions

---
 trytond/trytond/ir/action.xml                 | 36 ++++++----
 .../ir/view/action_act_window_form.xml        | 70 ++++++++-----------
 .../ir/view/action_act_window_list.xml        | 11 +--
 trytond/trytond/ir/view/action_form.xml       |  6 +-
 .../trytond/ir/view/action_report_form.xml    | 64 +++++++----------
 .../trytond/ir/view/action_report_list.xml    | 13 ++--
 trytond/trytond/ir/view/action_url_form.xml   | 26 ++-----
 trytond/trytond/ir/view/action_url_list.xml   | 10 +--
 .../trytond/ir/view/action_wizard_form.xml    | 36 +++-------
 .../trytond/ir/view/action_wizard_list.xml    | 10 +--
 10 files changed, 124 insertions(+), 158 deletions(-)

diff --git a/trytond/trytond/ir/action.xml b/trytond/trytond/ir/action.xml
index ca9213502f..81bec8d062 100644
--- a/trytond/trytond/ir/action.xml
+++ b/trytond/trytond/ir/action.xml
@@ -55,12 +55,14 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.ui.view" id="action_report_view_form">
             <field name="model">ir.action.report</field>
-            <field name="type">form</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_form"/>
             <field name="name">action_report_form</field>
         </record>
         <record model="ir.ui.view" id="action_report_view_tree">
             <field name="model">ir.action.report</field>
-            <field name="type">tree</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_tree"/>
             <field name="name">action_report_list</field>
         </record>
         <record model="ir.action.act_window" id="act_action_report_form">
@@ -84,16 +86,19 @@ this repository contains the full copyright notices and license terms. -->
             parent="menu_action"
             action="act_action_report_form"
             sequence="20"
-            id="menu_action_report_form"/>
+            id="menu_action_report_form"
+            icon="tryton-list"/>
 
         <record model="ir.ui.view" id="action_act_window_view_form">
             <field name="model">ir.action.act_window</field>
-            <field name="type">form</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_form"/>
             <field name="name">action_act_window_form</field>
         </record>
         <record model="ir.ui.view" id="action_act_window_view_tree">
             <field name="model">ir.action.act_window</field>
-            <field name="type">tree</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_tree"/>
             <field name="name">action_act_window_list</field>
         </record>
         <record model="ir.action.act_window" id="act_action_act_window_form">
@@ -115,7 +120,8 @@ this repository contains the full copyright notices and license terms. -->
             parent="menu_action"
             action="act_action_act_window_form"
             sequence="20"
-            id="menu_action_act_window"/>
+            id="menu_action_act_window"
+            icon="tryton-list"/>
 
         <record model="ir.ui.view" id="act_window_view_view_form">
             <field name="model">ir.action.act_window.view</field>
@@ -159,12 +165,14 @@ this repository contains the full copyright notices and license terms. -->
 
         <record model="ir.ui.view" id="action_wizard_view_form">
             <field name="model">ir.action.wizard</field>
-            <field name="type">form</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_form"/>
             <field name="name">action_wizard_form</field>
         </record>
         <record model="ir.ui.view" id="action_wizard_view_tree">
             <field name="model">ir.action.wizard</field>
-            <field name="type">tree</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_tree"/>
             <field name="name">action_wizard_list</field>
         </record>
         <record model="ir.action.act_window" id="act_action_wizard_form">
@@ -187,16 +195,19 @@ this repository contains the full copyright notices and license terms. -->
         <menuitem
             parent="menu_action"
             action="act_action_wizard_form"
-            id="menu_action_wizard"/>
+            id="menu_action_wizard"
+            icon="tryton-list"/>
 
         <record model="ir.ui.view" id="action_url_view_form">
             <field name="model">ir.action.url</field>
-            <field name="type">form</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_form"/>
             <field name="name">action_url_form</field>
         </record>
         <record model="ir.ui.view" id="action_url_view_tree">
             <field name="model">ir.action.url</field>
-            <field name="type">tree</field>
+            <field name="type" eval="None"/>
+            <field name="inherit" ref="action_view_tree"/>
             <field name="name">action_url_list</field>
         </record>
         <record model="ir.action.act_window" id="act_action_url_form">
@@ -220,6 +231,7 @@ this repository contains the full copyright notices and license terms. -->
             parent="menu_action"
             action="act_action_url_form"
             sequence="20"
-            id="menu_action_url"/>
+            id="menu_action_url"
+            icon="tryton-list"/>
     </data>
 </tryton>
diff --git a/trytond/trytond/ir/view/action_act_window_form.xml b/trytond/trytond/ir/view/action_act_window_form.xml
index e53ba732c5..7e7b79bca3 100644
--- a/trytond/trytond/ir/view/action_act_window_form.xml
+++ b/trytond/trytond/ir/view/action_act_window_form.xml
@@ -1,43 +1,33 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
-    <label name="name"/>
-    <field name="name"/>
-    <label name="active"/>
-    <field name="active" xexpand="0" width="100"/>
-    <notebook colspan="4">
-        <page string="General" id="general">
-            <label name="res_model"/>
-            <field name="res_model"/>
-            <label name="context_model"/>
-            <field name="context_model"/>
-            <label name="usage"/>
-            <field name="usage"/>
-            <label name="icon"/>
-            <field name="icon"/>
-            <field name="act_window_views" colspan="4"
-                view_ids="ir.act_window_view_view_list2"/>
-            <field name="act_window_domains" colspan="4"
-                view_ids="ir.act_window_domain_view_list2"/>
-            <label name="domain"/>
-            <field name="domain" colspan="3" widget="pyson"/>
-            <label name="context_domain"/>
-            <field name="context_domain" colspan="3" widget="pyson"/>
-            <label name="context"/>
-            <field name="context" colspan="3" widget="pyson"/>
-            <label name="order"/>
-            <field name="order" colspan="3"/>
-            <label name="search_value"/>
-            <field name="search_value" colspan="3" widget="pyson"/>
-            <label name="limit"/>
-            <field name="limit"/>
-        </page>
-        <page name="keywords">
-            <field name="keywords" colspan="4"/>
-        </page>
-        <page name="groups">
-            <field name="groups" colspan="4"/>
-        </page>
-    </notebook>
-</form>
+<data>
+    <xpath expr="//page[@id='general']" position="inside">
+        <label name="res_model"/>
+        <field name="res_model"/>
+        <label name="context_model"/>
+        <field name="context_model"/>
+
+        <field name="act_window_views" colspan="4" view_ids="ir.act_window_view_view_list2"/>
+
+        <field name="act_window_domains" colspan="4" view_ids="ir.act_window_domain_view_list2"/>
+
+        <label name="domain"/>
+        <field name="domain" colspan="3" widget="pyson"/>
+
+        <label name="context_domain"/>
+        <field name="context_domain" colspan="3" widget="pyson"/>
+
+        <label name="context"/>
+        <field name="context" colspan="3" widget="pyson"/>
+
+        <label name="order"/>
+        <field name="order" colspan="3"/>
+
+        <label name="search_value"/>
+        <field name="search_value" colspan="3" widget="pyson"/>
+
+        <label name="limit"/>
+        <field name="limit"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_act_window_list.xml b/trytond/trytond/ir/view/action_act_window_list.xml
index 63845480e9..aaf701a904 100644
--- a/trytond/trytond/ir/view/action_act_window_list.xml
+++ b/trytond/trytond/ir/view/action_act_window_list.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree>
-    <field name="name" expand="2"/>
-    <field name="res_model" expand="1"/>
-    <field name="domain" expand="1"/>
-</tree>
+<data>
+    <xpath expr="//tree" position="inside">
+        <field name="res_model" expand="1"/>
+        <field name="domain" expand="1"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_form.xml b/trytond/trytond/ir/view/action_form.xml
index 7a00d8b93e..d1d87ec98d 100644
--- a/trytond/trytond/ir/view/action_form.xml
+++ b/trytond/trytond/ir/view/action_form.xml
@@ -4,8 +4,10 @@ this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="name"/>
     <field name="name"/>
-    <label name="active"/>
-    <field name="active" xexpand="0" width="100"/>
+    <group id="checkboxes" colspan="2" col="-1">
+        <label name="active"/>
+        <field name="active" xexpand="0" width="25"/>
+    </group>
     <notebook colspan="4">
         <page string="General" id="general">
             <label name="type"/>
diff --git a/trytond/trytond/ir/view/action_report_form.xml b/trytond/trytond/ir/view/action_report_form.xml
index 3a6c3e0cb5..278c3f8e43 100644
--- a/trytond/trytond/ir/view/action_report_form.xml
+++ b/trytond/trytond/ir/view/action_report_form.xml
@@ -1,46 +1,36 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
-    <label name="name"/>
-    <field name="name"/>
-    <group id="checkboxes" colspan="2" col="-1">
-        <label name="active"/>
-        <field name="active" xexpand="0" width="25"/>
+<data>
+    <xpath expr="//group[@id='checkboxes']" position="inside">
         <label name="translatable"/>
         <field name="translatable" xexpand="0" width="25"/>
         <label name="single"/>
         <field name="single" xexpand="0" width="25"/>
         <label name="direct_print"/>
         <field name="direct_print" xexpand="0" width="25"/>
-    </group>
-    <notebook colspan="4">
-        <page string="General" id="general">
-            <label name="model"/>
-            <field name="model"/>
-            <label name="report_name"/>
-            <field name="report_name"/>
-            <label name="icon"/>
-            <field name="icon"/>
-            <label name="record_name"/>
-            <field name="record_name"/>
-            <label name="report_content"/>
-            <group col="-1" id="report_content">
-                <field name="report_content" xexpand="0"/>
-                <field name="report_content_html" string="Edit" widget="html" xexpand="0"/>
-            </group>
-            <label name="report"/>
-            <field name="report"/>
-            <label name="template_extension"/>
-            <field name="template_extension"/>
-            <label name="extension"/>
-            <field name="extension"/>
-        </page>
-        <page name="keywords">
-            <field name="keywords" colspan="4"/>
-        </page>
-        <page name="groups">
-            <field name="groups" colspan="4"/>
-        </page>
-    </notebook>
-</form>
+    </xpath>
+    <xpath expr="//page[@id='general']" position="inside">
+        <label name="model"/>
+        <field name="model"/>
+        <label name="report_name"/>
+        <field name="report_name"/>
+
+        <label name="record_name"/>
+        <field name="record_name"/>
+        <newline/>
+
+        <label name="report_content"/>
+        <group col="-1" id="report_content">
+            <field name="report_content" xexpand="0"/>
+            <field name="report_content_html" string="Edit" widget="html" xexpand="0"/>
+        </group>
+        <label name="report"/>
+        <field name="report"/>
+
+        <label name="template_extension"/>
+        <field name="template_extension"/>
+        <label name="extension"/>
+        <field name="extension"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_report_list.xml b/trytond/trytond/ir/view/action_report_list.xml
index 818bbf4522..bb02a429bd 100644
--- a/trytond/trytond/ir/view/action_report_list.xml
+++ b/trytond/trytond/ir/view/action_report_list.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree>
-    <field name="name" expand="2"/>
-    <field name="type" expand="1"/>
-    <field name="model" expand="1"/>
-    <field name="report_name" expand="1"/>
-</tree>
-
+<data>
+    <xpath expr="//tree" position="inside">
+        <field name="model" expand="1"/>
+        <field name="report_name" expand="1"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_url_form.xml b/trytond/trytond/ir/view/action_url_form.xml
index c8e9329a78..7c183bd209 100644
--- a/trytond/trytond/ir/view/action_url_form.xml
+++ b/trytond/trytond/ir/view/action_url_form.xml
@@ -1,23 +1,9 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
-    <label name="name"/>
-    <field name="name"/>
-    <label name="active"/>
-    <field name="active" xexpand="0" width="100"/>
-    <notebook colspan="4">
-        <page string="General" id="general">
-            <label name="url"/>
-            <field name="url"/>
-            <label name="icon"/>
-            <field name="icon"/>
-        </page>
-        <page name="keywords">
-            <field name="keywords" colspan="4"/>
-        </page>
-        <page name="groups">
-            <field name="groups" colspan="4"/>
-        </page>
-    </notebook>
-</form>
+<data>
+    <xpath expr="//page[@id='general']" position="inside">
+        <label name="url"/>
+        <field name="url" colspan="3"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_url_list.xml b/trytond/trytond/ir/view/action_url_list.xml
index deb4ef3380..ead32f6a49 100644
--- a/trytond/trytond/ir/view/action_url_list.xml
+++ b/trytond/trytond/ir/view/action_url_list.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree>
-    <field name="name" expand="2"/>
-    <field name="type" expand="1"/>
-    <field name="url" expand="1"/>
-</tree>
+<data>
+    <xpath expr="//tree" position="inside">
+        <field name="url" expand="1"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_wizard_form.xml b/trytond/trytond/ir/view/action_wizard_form.xml
index 8ac9714b7a..aa2d58ccf5 100644
--- a/trytond/trytond/ir/view/action_wizard_form.xml
+++ b/trytond/trytond/ir/view/action_wizard_form.xml
@@ -1,28 +1,14 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form>
-    <label name="name"/>
-    <field name="name"/>
-    <label name="active"/>
-    <field name="active" xexpand="0" width="100"/>
-    <notebook colspan="4">
-        <page string="General" id="general">
-            <label name="wiz_name"/>
-            <field name="wiz_name"/>
-            <label name="model"/>
-            <field name="model"/>
-            <label name="icon"/>
-            <field name="icon"/>
-            <newline/>
-            <label name="window"/>
-            <field name="window"/>
-        </page>
-        <page name="keywords">
-            <field name="keywords" colspan="4"/>
-        </page>
-        <page name="groups">
-            <field name="groups" colspan="4"/>
-        </page>
-    </notebook>
-</form>
+<data>
+    <xpath expr="//page[@id='general']" position="inside">
+        <label name="wiz_name"/>
+        <field name="wiz_name"/>
+        <label name="model"/>
+        <field name="model"/>
+
+        <label name="window"/>
+        <field name="window"/>
+    </xpath>
+</data>
diff --git a/trytond/trytond/ir/view/action_wizard_list.xml b/trytond/trytond/ir/view/action_wizard_list.xml
index 1c175ef25d..9f3380fb23 100644
--- a/trytond/trytond/ir/view/action_wizard_list.xml
+++ b/trytond/trytond/ir/view/action_wizard_list.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<tree>
-    <field name="name" expand="2"/>
-    <field name="type" expand="1"/>
-    <field name="wiz_name" expand="1"/>
-</tree>
+<data>
+    <xpath expr="//tree" position="inside">
+        <field name="wiz_name" expand="1"/>
+    </xpath>
+</data>