diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index e07bf65af46..54c7a3df277 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -152,7 +152,7 @@ class mrp_repair(osv.osv):
             select=True, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, track_visibility="onchange"),
         'move_id': fields.many2one('stock.move', 'Move', readonly=True, help="Move created by the repair order", track_visibility="onchange"),
-        'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft': [('readonly', False)]}),
+        'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees', readonly=True, states={'draft': [('readonly', False)]}),
         'internal_notes': fields.text('Internal Notes'),
         'quotation_notes': fields.text('Quotation Notes'),
         'company_id': fields.many2one('res.company', 'Company'),
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 86029a085d6..63db81070d0 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -129,7 +129,7 @@
                                 attrs="{'readonly':[('invoice_method','=', 'none')]}"/>
                         </group>
                         <!-- <field name="invoice_id"/> -->
-                        <separator string="Fees Lines"/>
+                        <separator string="Fees"/>
                         <field name="fees_lines" attrs="{'readonly': [('invoice_method','=', 'none')]}">
                             <form string="Fees" version="7.0">
                                 <label for="name" class="oe_edit_only"/>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 98cde818341..563ef6a991f 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -707,11 +707,8 @@ class pos_order(osv.osv):
         return False
 
     def _get_out_picking_type(self, cr, uid, context=None):
-        try:
-            picking_type = self.pool.get('ir.model.data').get_object(cr, uid, 'point_of_sale', 'picking_type_posout', context=context).id
-        except:
-            picking_type = False
-        return picking_type
+        return self.pool.get('ir.model.data').xmlid_to_res_id(
+                    cr, uid, 'point_of_sale.picking_type_posout', context=context)
 
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
diff --git a/addons/point_of_sale/views/report_receipt.xml b/addons/point_of_sale/views/report_receipt.xml
index cec54bfb8bb..4bbd44afbe4 100644
--- a/addons/point_of_sale/views/report_receipt.xml
+++ b/addons/point_of_sale/views/report_receipt.xml
@@ -11,7 +11,6 @@
                         <div t-field="o.partner_id"
                             t-field-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": true}'/>
                         User: <span t-field="o.user_id"/><br/>
-                        <span t-if="o.picking_type_id">Warehouse: <span t-field="o.picking_type_id"/><br/></span>
                         Date: <span t-field="o.date_order"/><br/>
                     </div>
                 </div>
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index f14b3a80096..5c712b3af38 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -21,15 +21,12 @@
 
 import threading
 
-from openerp.osv import fields, osv
+from openerp.osv import osv
 
 class procurement_compute_all(osv.osv_memory):
     _name = 'procurement.order.compute.all'
     _description = 'Compute all schedulers'
 
-    _columns = {
-    }
-
     def _procure_calculation_all(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer.
diff --git a/addons/product_extended/product_extended.py b/addons/product_extended/product_extended.py
index 01c87ea5dbe..e8adcba36b7 100644
--- a/addons/product_extended/product_extended.py
+++ b/addons/product_extended/product_extended.py
@@ -1,8 +1,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2011 OpenERP S.A. (<http://www.openerp.com>).
+#    Copyright (C) 2004-2014 OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -23,8 +22,6 @@ from openerp.osv import fields
 from openerp.osv import osv
 
 
-
-
 class product_product(osv.osv):
     _name = 'product.product'
     _inherit = 'product.product'
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 8a23ef8f46b..8c1d5c87f99 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -51,9 +51,9 @@ class sale_configuration(osv.osv_memory):
             help="Allows you to tag sales order lines with properties."),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
-        'group_route_so_lines': fields.boolean('Choose MTO, Dropship, ... on sale order lines',
+        'group_route_so_lines': fields.boolean('Choose MTO, drop shipping,... on sales order lines',
             implied_group='sale_stock.group_route_so_lines',
-            help="Allows you to set route on sale order lines."),
+            help="Allows you to choose a delivery route on sales order lines"),
     }
 
     _defaults = {
diff --git a/addons/stock_dropshipping/__openerp__.py b/addons/stock_dropshipping/__openerp__.py
index dda07fcad3e..6d6c91bd31d 100644
--- a/addons/stock_dropshipping/__openerp__.py
+++ b/addons/stock_dropshipping/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2014 OpenERP S.A. (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,31 +20,36 @@
 ##############################################################################
 
 {
-    'name': 'Dropshipping Module',
+    'name': 'Drop Shipping',
     'version': '1.0',
     'category': 'Warehouse Management',
-    'summary': 'Dropshipping',
+    'summary': 'Drop Shipping',
     'description': """
-Manage sales quotations and stock locations
-==========================================
+Manage drop shipping orders
+===========================
 
-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.
+This module adds a pre-configured Drop Shipping picking type
+as well as a procurement route that allow configuring Drop
+Shipping products and orders.
+
+When drop shipping is used the goods are directly transferred
+from suppliers to customers (direct delivery) without
+going through the retailer's warehouse. In this case no
+internal transfer document is needed.
 
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': [],
     'depends': ['purchase', 'sale_stock'],
-    'init_xml': [],
     'data': ['stock_dropshipping.xml'],
-    'demo_xml': [],
     'test': [
         'test/cancellation_propagated.yml',
         'test/crossdock.yml',
         'test/dropship.yml',
         'test/procurementexception.yml',
         'test/lifo_price.yml'
-        ],
+    ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/stock_landed_costs/stock_landed_costs.py b/addons/stock_landed_costs/stock_landed_costs.py
index 47393d49969..22fd52d85a5 100644
--- a/addons/stock_landed_costs/stock_landed_costs.py
+++ b/addons/stock_landed_costs/stock_landed_costs.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import time
-
 from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _