[MERGE] forward port of branch 8.0 up to 1e6b7a5

diff --combined addons/stock/stock.py
index fd2ff86,42dad7d..8f81bb9
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -1069,7 -1069,7 +1069,7 @@@ class stock_picking(osv.osv)
  
      @api.cr_uid_ids_context
      def open_barcode_interface(self, cr, uid, picking_ids, context=None):
 -        final_url="/barcode/web/#action=stock.ui&picking_id="+str(picking_ids[0])
 +        final_url="/stock/barcode/#action=stock.ui&picking_id="+str(picking_ids[0])
          return {'type': 'ir.actions.act_url', 'url':final_url, 'target': 'self',}
  
      @api.cr_uid_ids_context
@@@ -1447,7 -1447,7 +1447,7 @@@ class stock_production_lot(osv.osv)
          'product_id': lambda x, y, z, c: c.get('product_id', False),
      }
      _sql_constraints = [
-         ('name_ref_uniq', 'unique (name, ref, product_id, company_id)', 'The combination of Serial Number, internal reference, Product and Company must be unique !'),
+         ('name_ref_uniq', 'unique (name, ref, product_id)', 'The combination of serial number, internal reference and product must be unique !'),
      ]
  
      def action_traceability(self, cr, uid, ids, context=None):
@@@ -4040,7 -4040,7 +4040,7 @@@ class stock_picking_type(osv.osv)
      _order = 'sequence'
  
      def open_barcode_interface(self, cr, uid, ids, context=None):
 -        final_url = "/barcode/web/#action=stock.ui&picking_type_id=" + str(ids[0]) if len(ids) else '0'
 +        final_url = "/stock/barcode/#action=stock.ui&picking_type_id=" + str(ids[0]) if len(ids) else '0'
          return {'type': 'ir.actions.act_url', 'url': final_url, 'target': 'self'}
  
      def _get_tristate_values(self, cr, uid, ids, field_name, arg, context=None):