diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index fb62f3e2d80..054ec7477a7 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 dropshipping",
+ 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 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index eb5218f160f..b3e7c53229b 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 dropshipping",
+ 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 @@
+
+
+
+
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 81%
rename from addons/stock_complex_routes/__openerp__.py
rename to addons/stock_dropshipping/__openerp__.py
index 739650f81c4..718bcdc2b30 100644
--- a/addons/stock_complex_routes/__openerp__.py
+++ b/addons/stock_dropshipping/__openerp__.py
@@ -20,15 +20,15 @@
##############################################################################
{
- 'name': 'Complex routes when using stock locations, purchase and sale',
+ 'name': 'Dropshipping Module',
'version': '1.0',
'category': 'Hidden',
- 'summary': 'Complex routes',
+ 'summary': 'Dropshipping',
'description': """
-Manage sales quotations and stock_location
+Manage sales quotations and stock locations
==========================================
-This adds a route on the sales order and sales order line (mini module)
+This adds the route to make dropshipping sales orders in which the product sold are directly transfered from the reseller to the customer (direct delivery) without creating any internal document for the transfer.
""",
'author': 'OpenERP SA',
@@ -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'