[MERGE] stock_dropshipping

bzr revid: qdp-launchpad@openerp.com-20131205184010-h6ttp41ij15cb3dk

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 = {

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>

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):

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>

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',

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'