Merge lp:~openerp-dev/openobject-addons/trunk-wms-1271466-csn into lp:~openerp-dev/openobject-addons/trunk-wms

[Cedric Snauwaert (OpenERP)]

=== modified file 'mrp/res_config.py'
--- mrp/res_config.py	2013-11-29 16:56:44 +0000
+++ mrp/res_config.py	2014-01-22 14:15:43 +0000
@@ -44,12 +44,6 @@
                  'Without this module: A + B + C -> D.\n'
                  'With this module: A + B + C -> D + E.\n'
                  '-This installs the module mrp_byproduct.'),
-        'module_stock_no_autopicking': fields.boolean("Manage manual picking to fulfill manufacturing orders ",
-            help='This module allows an intermediate picking process to provide raw materials to production orders.\n'
-                 'For example to manage production made by your suppliers (sub-contracting).\n'
-                 '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.\n'
-                 '-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 '

=== modified file 'mrp/res_config_view.xml'
--- mrp/res_config_view.xml	2013-09-03 10:17:36 +0000
+++ mrp/res_config_view.xml	2014-01-22 14:15:43 +0000
@@ -35,10 +35,6 @@
                                 <field name="module_mrp_repair" class="oe_inline"/>
                                 <label for="module_mrp_repair"/>
                             </div>
-                             <div>
-                                 <field name="module_stock_no_autopicking" class="oe_inline"/>
-                                 <label for="module_stock_no_autopicking" />
-                            </div>
                         </div>
                     </group>
                     <group >