From 97ac742910c04a46e3121796216e988d7ba60904 Mon Sep 17 00:00:00 2001
From: Eduardo De Miguel <edu@moduon.team>
Date: Thu, 19 Oct 2023 12:26:57 +0200
Subject: [PATCH] [REF] stock_picking_batch_extended: Move settings option
 under Batch Picking group

---
 .../readme/CONFIGURE.rst                      |  2 +-
 .../views/res_config_settings_views.xml       | 33 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/stock_picking_batch_extended/readme/CONFIGURE.rst b/stock_picking_batch_extended/readme/CONFIGURE.rst
index 9514f546e0c3..456d7088064f 100644
--- a/stock_picking_batch_extended/readme/CONFIGURE.rst
+++ b/stock_picking_batch_extended/readme/CONFIGURE.rst
@@ -1,4 +1,4 @@
-In Inventory / Settings it is possible to activate or deactivate which approach for batch handling will be used per company. By default after installation this option will be activated for all companies.
+In Inventory / Settings / Batch Picking it is possible to activate or deactivate which approach for batch handling will be used per company. By default after installation this option will be activated for all companies.
 
 .. figure:: ../static/picking_batch_configuration_settings.png
     :alt: Picking batch configuration settings
diff --git a/stock_picking_batch_extended/views/res_config_settings_views.xml b/stock_picking_batch_extended/views/res_config_settings_views.xml
index 6255fada8a38..bf466a53a0dd 100644
--- a/stock_picking_batch_extended/views/res_config_settings_views.xml
+++ b/stock_picking_batch_extended/views/res_config_settings_views.xml
@@ -5,25 +5,24 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <div data-key="stock" position="inside">
-                <h2>Picking Batch</h2>
-                <div class="row mt16 o_settings_container">
-                    <div
-                        class="col-12 col-lg-6 o_setting_box"
-                        title="Switch behaviour bettwen Odoo and OCA for batch validation"
-                    >
-                        <div class="o_setting_left_pane">
-                            <field name="use_oca_batch_validation" />
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="use_oca_batch_validation" />
-                            <div class="text-muted">
-                                Apply OCA batch validation
-                            </div>
-                        </div>
+            <xpath
+                expr="//label[@for='module_stock_picking_batch']/.."
+                position="inside"
+            >
+                <div
+                    class="row mt-2"
+                    attrs="{'invisible': [('module_stock_picking_batch','=',False)]}"
+                >
+                    <field
+                        name="use_oca_batch_validation"
+                        class="col flex-grow-0 ml16 mr0 pe-2"
+                    />
+                    <div class="col ps-0">
+                        <label for="use_oca_batch_validation" />
+                        <div class="text-muted">Apply OCA batch validation</div>
                     </div>
                 </div>
-            </div>
+            </xpath>
         </field>
     </record>
 </odoo>