From d0198d167225be9f35b45a3c61ddc00da2979f7c Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Mon, 27 Dec 2021 18:21:34 +0100
Subject: [PATCH] [MOV] sale: reorder sale actions

* Move specific actions to their place of use (as they are not expected
to be used anywhere else)
* order actions by use/importance in sale_order_views.xml, and server
actions in a specific "section"
---
 addons/sale/views/crm_team_views.xml   |  62 ++++++++++-
 addons/sale/views/sale_order_views.xml | 137 ++++++++-----------------
 2 files changed, 102 insertions(+), 97 deletions(-)

diff --git a/addons/sale/views/crm_team_views.xml b/addons/sale/views/crm_team_views.xml
index f720e95a89e..d473b62cd2e 100644
--- a/addons/sale/views/crm_team_views.xml
+++ b/addons/sale/views/crm_team_views.xml
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <!-- Sales Team Dashboard Views -->
+    <!-- Dedicated actions used in views below -->
+    <record id="action_quotations_salesteams" model="ir.actions.act_window">
+        <field name="name">Quotations</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_id" ref="sale.view_quotation_tree"/>
+        <field name="view_mode">tree,form,calendar,graph,kanban,pivot</field>
+        <field name="context">{
+                'search_default_team_id': [active_id],
+                'default_team_id': active_id,
+                'show_address': 1,
+            }
+        </field>
+        <field name="domain">[]</field>
+        <field name="search_view_id" ref="sale.sale_order_view_search_inherit_quotation"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            Create a new quotation, the first step of a new sale!
+            </p><p>
+            Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment.
+            </p>
+        </field>
+    </record>
+
     <record id="action_quotation_form" model="ir.actions.act_window">
         <field name="name">New Quotation</field>
         <field name="res_model">sale.order</field>
@@ -16,6 +39,43 @@
         <field name="search_view_id" ref="sale_order_view_search_inherit_quotation"/>
     </record>
 
+    <record id="action_orders_salesteams" model="ir.actions.act_window">
+        <field name="name">Sales Orders</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,form,calendar,graph,kanban,pivot</field>
+        <field name="search_view_id" ref="sale.sale_order_view_search_inherit_sale"/>
+        <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
+        <field name="context">{
+                'search_default_team_id': [active_id],
+                'default_team_id': active_id,
+            }
+        </field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            Create a new quotation, the first step of a new sale!
+            </p><p>
+            Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment.
+            </p>
+        </field>
+    </record>
+
+    <record id="action_orders_to_invoice_salesteams" model="ir.actions.act_window">
+        <field name="name">Sales Orders</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,form,calendar,graph,kanban,pivot</field>
+        <field name="search_view_id" ref="sale.sale_order_view_search_inherit_sale"/>
+        <field name="domain">[('invoice_status','=','to invoice')]</field>
+        <field name="context">{
+                'search_default_team_id': [active_id],
+                'default_team_id': active_id,
+            }
+        </field>
+    </record>
+
+    <!-- crm.team views (& actions) -->
+
     <record id="crm_team_salesteams_view_form" model="ir.ui.view">
         <field name="name">crm.team.form</field>
         <field name="model">crm.team</field>
diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index 14f25655dab..9aa0d5c72dd 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -714,7 +714,7 @@
         </field>
     </record>
 
-    <!-- ACTIONS -->
+    <!-- ACTIONS (WINDOW) -->
 
     <record id="action_orders" model="ir.actions.act_window">
         <field name="name">Sales Orders</field>
@@ -775,54 +775,6 @@
         <field name="act_window_id" ref="action_orders"/>
     </record>
 
-    <record id="action_orders_to_invoice" model="ir.actions.act_window">
-        <field name="name">Orders to Invoice</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,form,calendar,graph,pivot,kanban,activity</field>
-        <field name="context">{'create': False}</field>
-        <field name="domain">[('invoice_status','=','to invoice')]</field>
-        <field name="search_view_id" ref="view_sales_order_filter"/>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-            No orders to invoice found
-            </p><p>
-            You can select all orders and invoice them in batch,<br/>
-            or check every order and invoice them one by one.
-            </p>
-        </field>
-    </record>
-
-    <record id="model_sale_order_action_quotation_sent" model="ir.actions.server">
-        <field name="name">Mark Quotation as Sent</field>
-        <field name="model_id" ref="sale.model_sale_order"/>
-        <field name="binding_model_id" ref="sale.model_sale_order"/>
-        <field name="binding_view_types">form,list</field>
-        <field name="state">code</field>
-        <field name="code">action = records.action_quotation_sent()</field>
-    </record>
-
-    <record id="action_orders_upselling" model="ir.actions.act_window">
-        <field name="name">Orders to Upsell</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,form,calendar,graph,pivot,kanban,activity</field>
-        <field name="domain">[('invoice_status','=','upselling')]</field>
-        <field name="context">{'create': False}</field>
-        <field name="search_view_id" ref="view_sales_order_filter"/>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-            No orders to upsell found.
-            </p><p>
-            An order is to upsell when delivered quantities are above initially
-            ordered quantities, and the invoicing policy is based on ordered quantities.
-            </p><p>
-            As an example, if you sell pre-paid hours of services, Odoo recommends you
-            to sell extra hours when all ordered hours have been consumed.
-            </p>
-        </field>
-    </record>
-
     <record id="action_quotations_with_onboarding" model="ir.actions.act_window">
         <field name="name">Quotations</field>
         <field name="type">ir.actions.act_window</field>
@@ -898,61 +850,54 @@
         <field name="act_window_id" ref="action_quotations"/>
     </record>
 
-    <!-- search by Salesteams -->
-    <record id="action_orders_salesteams" model="ir.actions.act_window">
-        <field name="name">Sales Orders</field>
+    <record id="action_orders_to_invoice" model="ir.actions.act_window">
+        <field name="name">Orders to Invoice</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,form,calendar,graph,kanban,pivot</field>
-        <field name="search_view_id" ref="sale.sale_order_view_search_inherit_sale"/>
-        <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
-        <field name="context">{
-                'search_default_team_id': [active_id],
-                'default_team_id': active_id,
-            }
-        </field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-            Create a new quotation, the first step of a new sale!
-            </p><p>
-            Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment.
-            </p>
-        </field>
-    </record>
-    <record id="action_orders_to_invoice_salesteams" model="ir.actions.act_window">
-        <field name="name">Sales Orders</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_mode">tree,form,calendar,graph,kanban,pivot</field>
-        <field name="search_view_id" ref="sale.sale_order_view_search_inherit_sale"/>
+        <field name="view_mode">tree,form,calendar,graph,pivot,kanban,activity</field>
+        <field name="context">{'create': False}</field>
         <field name="domain">[('invoice_status','=','to invoice')]</field>
-        <field name="context">{
-                'search_default_team_id': [active_id],
-                'default_team_id': active_id,
-            }
-        </field>
-    </record>
-    <record id="action_quotations_salesteams" model="ir.actions.act_window">
-        <field name="name">Quotations</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">sale.order</field>
-        <field name="view_id" ref="sale.view_quotation_tree"/>
-        <field name="view_mode">tree,form,calendar,graph,kanban,pivot</field>
-        <field name="context">{
-                'search_default_team_id': [active_id],
-                'default_team_id': active_id,
-                'show_address': 1,
-            }
-        </field>
-        <field name="domain">[]</field>
-        <field name="search_view_id" ref="sale.sale_order_view_search_inherit_quotation"/>
+        <field name="search_view_id" ref="view_sales_order_filter"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
-            Create a new quotation, the first step of a new sale!
+            No orders to invoice found
             </p><p>
-            Once the quotation is confirmed by the customer, it becomes a sales order.<br/> You will be able to create an invoice and collect the payment.
+            You can select all orders and invoice them in batch,<br/>
+            or check every order and invoice them one by one.
             </p>
         </field>
     </record>
 
+    <record id="action_orders_upselling" model="ir.actions.act_window">
+        <field name="name">Orders to Upsell</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">sale.order</field>
+        <field name="view_mode">tree,form,calendar,graph,pivot,kanban,activity</field>
+        <field name="domain">[('invoice_status','=','upselling')]</field>
+        <field name="context">{'create': False}</field>
+        <field name="search_view_id" ref="view_sales_order_filter"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            No orders to upsell found.
+            </p><p>
+            An order is to upsell when delivered quantities are above initially
+            ordered quantities, and the invoicing policy is based on ordered quantities.
+            </p><p>
+            As an example, if you sell pre-paid hours of services, Odoo recommends you
+            to sell extra hours when all ordered hours have been consumed.
+            </p>
+        </field>
+    </record>
+
+    <!-- ACTIONS (SERVER) -->
+
+    <record id="model_sale_order_action_quotation_sent" model="ir.actions.server">
+        <field name="name">Mark Quotation as Sent</field>
+        <field name="model_id" ref="sale.model_sale_order"/>
+        <field name="binding_model_id" ref="sale.model_sale_order"/>
+        <field name="binding_view_types">form,list</field>
+        <field name="state">code</field>
+        <field name="code">action = records.action_quotation_sent()</field>
+    </record>
+
 </odoo>