From 19dad8973c61d98bb2f9c9f44a1714efd3634f4b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 24 Apr 2014 10:58:38 +0200
Subject: [PATCH] [FIX] stock_landed_cost: setting option appears at the right
 place in the right moment

bzr revid: qdp-launchpad@openerp.com-20140424085838-nzk6p11ncitvkbta
---
 addons/stock/res_config.py               |  2 --
 addons/stock/res_config_view.xml         | 10 ----------
 addons/stock_account/res_config.py       |  2 ++
 addons/stock_account/res_config_view.xml |  4 ++++
 addons/stock_landed_costs/__openerp__.py |  2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index f57615f1130..73a3db67608 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -110,8 +110,6 @@ This installs the module product_expiry."""),
             help='\nCreates the dropship route and add more complex tests'
                  '-This installs the module stock_dropshipping.'),
         'module_stock_picking_wave': fields.boolean('Manage picking wave', help='Install the picking wave module which will help you grouping your pickings and processing them in batch'),
-        'module_stock_landed_costs': fields.boolean("Calculate landed costs on products",
-            help="""Install the module that allows to affect landed costs on pickings, and split them onto the different products."""),
     }
 
     def onchange_adv_location(self, cr, uid, ids, group_stock_adv_location, context=None):
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index a0568bca970..140ab36c774 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -44,16 +44,6 @@
                              </div>
                         </div>    
                     </group>
-                    <separator string="Accounting"/>
-                    <group>
-                        <label for="id" string="Accounting"/>
-                        <div>
-                            <div>
-                                <field name="module_stock_landed_costs" class="oe_inline"/>
-                                <label for="module_stock_landed_costs"/>
-                            </div>
-                         </div>
-                    </group>
                     <separator string="Location &amp; Warehouse"/>
                     <group>
                         <label for="id" string="Logistic"/>
diff --git a/addons/stock_account/res_config.py b/addons/stock_account/res_config.py
index bcbbab1d641..a6076bebf94 100644
--- a/addons/stock_account/res_config.py
+++ b/addons/stock_account/res_config.py
@@ -34,6 +34,8 @@ class stock_config_settings(osv.osv_memory):
             help='This allows to automatically launch the invoicing wizard if the delivery is '
                  'to be invoiced when you send or deliver goods.\n'
                  '-This installs the module stock_invoice_directly.'),
+        'module_stock_landed_costs': fields.boolean("Calculate landed costs on products",
+            help="""Install the module that allows to affect landed costs on pickings, and split them onto the different products."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_account/res_config_view.xml b/addons/stock_account/res_config_view.xml
index 9ed855fc170..4a48349f8df 100644
--- a/addons/stock_account/res_config_view.xml
+++ b/addons/stock_account/res_config_view.xml
@@ -18,6 +18,10 @@
                                 <field name="module_stock_invoice_directly" class="oe_inline"/>
                                 <label for="module_stock_invoice_directly"/>
                             </div>
+                            <div>
+                                <field name="module_stock_landed_costs" class="oe_inline"/>
+                                <label for="module_stock_landed_costs"/>
+                            </div>
                          </div>
                     </group>
                 </xpath>
diff --git a/addons/stock_landed_costs/__openerp__.py b/addons/stock_landed_costs/__openerp__.py
index 5ad9bdd8d89..46fc74af956 100644
--- a/addons/stock_landed_costs/__openerp__.py
+++ b/addons/stock_landed_costs/__openerp__.py
@@ -32,7 +32,7 @@
     'website': 'http://www.openerp.com',
     'images': [],
     'depends': ['stock_account'],
-    'category': 'Hidden',
+    'category': 'Warehouse Management',
     'sequence': 16,
     'demo': [
     ],