From 373321d062734afcff12dddc4fa6c8724f3f6b21 Mon Sep 17 00:00:00 2001
From: Florian Damhaut <flda@odoo.com>
Date: Fri, 10 Feb 2023 14:03:20 +0000
Subject: [PATCH] [IMP] sale: flatten template

- Flatten the group list in sale's SO for cleaner UI.
- Modify wording to reflect changes in enterprise PR.

related to odoo/enterprise#36968

closes odoo/odoo#112433

Task-id: 2877341
Signed-off-by: Arnaud Joset (arj) <arj@odoo.com>
---
 addons/sale/views/sale_order_views.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/sale/views/sale_order_views.xml b/addons/sale/views/sale_order_views.xml
index 6e58e6f829f..e057fc321be 100644
--- a/addons/sale/views/sale_order_views.xml
+++ b/addons/sale/views/sale_order_views.xml
@@ -672,7 +672,7 @@
                                 <field name="client_order_ref"/>
                                 <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
                             </group>
-                            <group name="sale_info" string="Invoicing and Payments">
+                            <group name="sale_info" string="Invoicing">
                                 <field name="show_update_fpos" invisible="1"/>
                                 <label for="fiscal_position_id"/>
                                 <div class="o_row">
@@ -690,9 +690,7 @@
                                 <!-- test_event_configurator -->
                                 <field name="invoice_status" invisible="1" groups="!base.group_no_one"/>
                             </group>
-                        </group>
-                        <group>
-                            <group name="sale_shipping">
+                            <group name="sale_shipping" string="Shipping">
                                 <label for="commitment_date" string="Delivery Date"/>
                                 <div name="commitment_date_div" class="o_row">
                                     <field name="commitment_date"/>