OLD 7.0 2014 11 04

Conflict

diff --cc addons/stock/stock.py
index c920c1c,1656587..0000000
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -750,9 -721,8 +750,14 @@@ class stock_picking(osv.osv)
          if ('name' not in default) or (picking_obj.name == '/'):
              seq_obj_name = 'stock.picking.' + picking_obj.type
              default['name'] = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)
++<<<<<<< HEAD
 +            default['backorder_id'] = False
 +        if 'origin' not in default:
 +            default['origin'] = ''
++=======
+             default.setdefault('origin', False)
+             default.setdefault('backorder_id', False)
++>>>>>>> odoo/7.0
          if 'invoice_state' not in default and picking_obj.invoice_state == 'invoiced':
              default['invoice_state'] = '2binvoiced'
          res = super(stock_picking, self).copy(cr, uid, id, default, context)

Resolution

Revert https://github.com/OCA/OCB/commit/4335f32a6df9dd131f13c084782a5f8567ed3fdd

Committed as https://github.com/OCA/OCB/commit/c4438afe76f99dc2753ab638995a388d40648c49 by @hbrunn