From 217e1460228ec74ccdea58e0d80345fb60aa3f65 Mon Sep 17 00:00:00 2001
From: Demesmaeker <edm@odoo.com>
Date: Wed, 24 May 2023 09:45:23 +0000
Subject: [PATCH] [FIX] sale,stock: differentiate container names

Following 78ae3da90213261071fdadb06cbb0507182303e2 names were added to improve the view inheritance.
But some names were duplicates. This commit will ensure every name is unique to facilitate
inheritance.

closes odoo/odoo#122270

Signed-off-by: Morgane Demesmaeker <edm@odoo.com>
---
 addons/sale/wizard/res_config_settings_views.xml | 2 +-
 addons/stock/views/res_config_settings_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/wizard/res_config_settings_views.xml b/addons/sale/wizard/res_config_settings_views.xml
index ef86051c298..1a4f93bda5f 100644
--- a/addons/sale/wizard/res_config_settings_views.xml
+++ b/addons/sale/wizard/res_config_settings_views.xml
@@ -110,7 +110,7 @@
                             <field name="group_proforma_sales"/>
                         </setting>
                     </block>
-                    <block title="Shipping" name="shipping_setting_container">
+                    <block title="Shipping" name="sale_shipping_setting_container">
                         <setting id="delivery" help="Compute shipping costs on orders">
                             <field name="module_delivery"/>
                         </setting>
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 19a217fb790..97f7da2c69e 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -69,7 +69,7 @@
                                 <field name="module_delivery"/>
                             </setting>
                         </block>
-                        <block title="Shipping Connectors" name="product_setting_container">
+                        <block title="Shipping Connectors" name="shipping_connectors_setting_container">
                             <setting id="compute_shipping_costs_ups" documentation="/applications/inventory_and_mrp/inventory/shipping/setup/third_party_shipper.html" help="Compute shipping costs and ship with UPS">
                                 <field name="module_delivery_ups" widget="upgrade_boolean"/>
                             </setting>