diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index c384f5d6ee4..ddff6676088 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -54,6 +54,12 @@ class mrp_config_settings(osv.osv_memory):
                 All procurement orders will be processed immediately, which could in some
                 cases entail a small performance impact.
                 This installs the module mrp_jit."""),
+        'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders",
+            help="""This module allows an intermediate picking process to provide raw materials to production orders.
+                For example to manage production made by your suppliers (sub-contracting).
+                To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
+                and put the location of the supplier in the routing of the assembly operation.
+                This installs the module stock_no_autopicking."""),                
         'group_mrp_routings': fields.boolean("Manage Routings and Work Orders",
             implied_group='mrp.group_mrp_routings',
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 66b8e735ed6..c1b0b44d934 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -17,10 +17,9 @@
                         <field name="module_stock_planning"/>
                         <field name="module_mrp_subproduct"/>
                         <field name="module_mrp_repair"/>
-
                         <separator string="Logistics" colspan="4"/>
                         <field name="module_mrp_jit"/>
-
+                        <field name="module_stock_no_autopicking"/>
                         <separator string="Bill Of Material" colspan="4"/>
                         <field name="group_mrp_routings"/>
                         <field name="group_mrp_properties"/>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 6148efc1131..14ba77d6993 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -26,12 +26,6 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_no_autopicking': fields.boolean("Force Picking before Manufactoring Orders",
-            help="""This module allows an intermediate picking process to provide raw materials to production orders.
-                For example to manage production made by your suppliers (sub-contracting).
-                To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
-                and put the location of the supplier in the routing of the assembly operation.
-                This installs the module stock_no_autopicking."""),
         'module_claim_from_delivery': fields.boolean("Track Claims from Delivery",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 06611f4cdb0..eb589563300 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -22,7 +22,6 @@
 
                         <separator string="Logistics" colspan="4"/>
                         <field name="group_stock_multiple_locations"/>
-                        <field name="module_stock_no_autopicking"/>
                         <field name="module_stock_location"/>
                         <field name="module_stock_invoice_directly"/>