From 093f489b063dc792f3ab69065e336059eb8bbecb Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Tue, 3 Dec 2013 18:44:48 +0500
Subject: [PATCH] [IMP]Rename stock_complex_route to stock_dropshipping. Added
 option for stock_dropshipping on warehouse configuration as well as purchase
 configuration

bzr revid: pza@tinyerp.com-20131203134448-v7stzse4y5upx3c1
---
 addons/purchase/res_config.py                          |  3 +++
 addons/purchase/res_config_view.xml                    | 10 ++++++++++
 addons/stock/res_config.py                             |  3 +++
 addons/stock/res_config_view.xml                       |  4 ++++
 .../__init__.py                                        |  0
 .../__openerp__.py                                     |  6 +++---
 .../stock_dropshipping.xml}                            |  0
 .../test/cancellation_propagated.yml                   |  0
 .../test/crossdock.yml                                 |  0
 .../test/dropship.yml                                  |  0
 .../test/lifo_price.yml                                |  0
 .../test/procurementexception.yml                      |  0
 addons/stock_multi_warehouse/__openerp__.py            |  2 +-
 13 files changed, 24 insertions(+), 4 deletions(-)
 rename addons/{stock_complex_routes => stock_dropshipping}/__init__.py (100%)
 rename addons/{stock_complex_routes => stock_dropshipping}/__openerp__.py (92%)
 rename addons/{stock_complex_routes/stock_complex_routes.xml => stock_dropshipping/stock_dropshipping.xml} (100%)
 rename addons/{stock_complex_routes => stock_dropshipping}/test/cancellation_propagated.yml (100%)
 rename addons/{stock_complex_routes => stock_dropshipping}/test/crossdock.yml (100%)
 rename addons/{stock_complex_routes => stock_dropshipping}/test/dropship.yml (100%)
 rename addons/{stock_complex_routes => stock_dropshipping}/test/lifo_price.yml (100%)
 rename addons/{stock_complex_routes => stock_dropshipping}/test/procurementexception.yml (100%)

diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index fb62f3e2d80..07d95ab4cf5 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -63,6 +63,9 @@ class purchase_config_settings(osv.osv_memory):
         'group_analytic_account_for_purchases': fields.boolean('Analytic accounting for purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
+        'module_stock_dropshipping': fields.boolean("Manage dropship route",
+            help='\nCreates the dropship route and add more complex tests'
+                 '-This installs the module stock_dropshipping.'),
     }
 
     _defaults = {
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 6983acb854a..4eaba80c306 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -80,6 +80,16 @@
                             </div>
                         </div>
                     </group>
+                    <separator string="Location &amp; Warehouse"/>
+                    <group>
+                        <label for="id" string="Routes"/>
+                        <div>
+                            <div>
+                                <field name="module_stock_dropshipping" class="oe_inline"/>
+                                <label for="module_stock_dropshipping"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index eb5218f160f..eec430a69ac 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -75,6 +75,9 @@ This installs the module product_expiry."""),
             implied_group='stock.group_adv_location', 
             help="""This option supplements the warehouse application by effectively implementing Push and Pull inventory flows. """),
         'decimal_precision': fields.integer('Decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
+        'module_stock_dropshipping': fields.boolean("Manage dropship route",
+            help='\nCreates the dropship route and add more complex tests'
+                 '-This installs the module stock_dropshipping.'),
     }
 
     def get_default_dp(self, cr, uid, fields, context=None):
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 2ce88479c9a..a784c015ab5 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -78,6 +78,10 @@
                                 <field name="group_stock_adv_location" class="oe_inline"/>
                                 <label for="group_stock_adv_location"/>
                             </div>
+                            <div>
+                                <field name="module_stock_dropshipping" class="oe_inline"/>
+                                <label for="module_stock_dropshipping"/>
+                            </div>
                         </div>
                     </group>
                     <group>
diff --git a/addons/stock_complex_routes/__init__.py b/addons/stock_dropshipping/__init__.py
similarity index 100%
rename from addons/stock_complex_routes/__init__.py
rename to addons/stock_dropshipping/__init__.py
diff --git a/addons/stock_complex_routes/__openerp__.py b/addons/stock_dropshipping/__openerp__.py
similarity index 92%
rename from addons/stock_complex_routes/__openerp__.py
rename to addons/stock_dropshipping/__openerp__.py
index 739650f81c4..91131cbc9d3 100644
--- a/addons/stock_complex_routes/__openerp__.py
+++ b/addons/stock_dropshipping/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    'name': 'Complex routes when using stock locations, purchase and sale',
+    'name': 'Dropship route when using stock locations, purchase and sale',
     'version': '1.0',
     'category': 'Hidden',
-    'summary': 'Complex routes',
+    'summary': 'Dropship route',
     'description': """
 Manage sales quotations and stock_location
 ==========================================
@@ -36,7 +36,7 @@ This adds a route on the sales order and sales order line (mini module)
     'images': [],
     'depends': ['purchase', 'sale_stock'],
     'init_xml': [],
-    'data': ['stock_complex_routes.xml'],
+    'data': ['stock_dropshipping.xml'],
     'demo_xml': [],
     'test': [
         'test/cancellation_propagated.yml',
diff --git a/addons/stock_complex_routes/stock_complex_routes.xml b/addons/stock_dropshipping/stock_dropshipping.xml
similarity index 100%
rename from addons/stock_complex_routes/stock_complex_routes.xml
rename to addons/stock_dropshipping/stock_dropshipping.xml
diff --git a/addons/stock_complex_routes/test/cancellation_propagated.yml b/addons/stock_dropshipping/test/cancellation_propagated.yml
similarity index 100%
rename from addons/stock_complex_routes/test/cancellation_propagated.yml
rename to addons/stock_dropshipping/test/cancellation_propagated.yml
diff --git a/addons/stock_complex_routes/test/crossdock.yml b/addons/stock_dropshipping/test/crossdock.yml
similarity index 100%
rename from addons/stock_complex_routes/test/crossdock.yml
rename to addons/stock_dropshipping/test/crossdock.yml
diff --git a/addons/stock_complex_routes/test/dropship.yml b/addons/stock_dropshipping/test/dropship.yml
similarity index 100%
rename from addons/stock_complex_routes/test/dropship.yml
rename to addons/stock_dropshipping/test/dropship.yml
diff --git a/addons/stock_complex_routes/test/lifo_price.yml b/addons/stock_dropshipping/test/lifo_price.yml
similarity index 100%
rename from addons/stock_complex_routes/test/lifo_price.yml
rename to addons/stock_dropshipping/test/lifo_price.yml
diff --git a/addons/stock_complex_routes/test/procurementexception.yml b/addons/stock_dropshipping/test/procurementexception.yml
similarity index 100%
rename from addons/stock_complex_routes/test/procurementexception.yml
rename to addons/stock_dropshipping/test/procurementexception.yml
diff --git a/addons/stock_multi_warehouse/__openerp__.py b/addons/stock_multi_warehouse/__openerp__.py
index cc607168fa8..aedf7e720dd 100644
--- a/addons/stock_multi_warehouse/__openerp__.py
+++ b/addons/stock_multi_warehouse/__openerp__.py
@@ -32,7 +32,7 @@ It creates 3 warehouses
     """,
     'author': 'OpenERP SA',
     'images': [],
-    'depends': ['stock_complex_routes'],
+    'depends': ['stock_dropshipping'],
     'data': [],
     'demo': [
         'stock_multi_warehouse.yml'