From d0f299e985ccc1e4b17aaba1d4a2660db7ba66ed Mon Sep 17 00:00:00 2001
From: "Tiffany Chang (tic)" <tic@odoo.com>
Date: Tue, 19 Oct 2021 12:30:22 +0000
Subject: [PATCH] [IMP] mrp: fix minor UX in settings

odoo/odoo#35551 removed the section the "byproducts" setting was in, but
the "o_settings_container" div wasn't removed at the same time. This is
mostly not noticeable, but it is annoying when adding new settings after
this setting since the layout will be messed up, so let's delete it now.

odoo/odoo#73939 switched the setting Lock by default => Unlock by
default, but forgot to update the setting title. Let's delete this title
as the setting is now self-explanatory.

Part-of: odoo/odoo#79627
---
 addons/mrp/views/res_config_settings_views.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 362dbe9d1d1..7f5abb8a64f 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -63,7 +63,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-lg-6 col-12 o_setting_box" id="mrp_lock" title="Makes confirmed manufacturing orders locked rather than unlocked by default. This only applies to new manufacturing orders, not previously created ones.">
+                            <div class="col-lg-6 col-12 o_setting_box" id="mrp_lock">
                                 <div class="o_setting_left_pane">
                                     <field name="group_unlocked_by_default"/>
                                 </div>
@@ -74,8 +74,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row mt16 o_settings_container">
                             <div class="col-lg-6 col-12 o_setting_box" id="mrp_byproduct" title="Add by-products to bills of materials. This can be used to get several finished products as well. Without this option you only do: A + B = C. With the option: A + B = C + D.">
                                 <div class="o_setting_left_pane">
                                     <field name="group_mrp_byproducts"/>