Merge remote-tracking branch 'odoo/7.0' into 7.0

diff --cc addons/stock/stock.py
index d7899c0,644dae4..c920c1c
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -1358,10 -1319,10 +1359,10 @@@ class stock_picking(osv.osv)
                  if product_qty != 0:
                      defaults = {
                              'product_qty' : product_qty,
-                             'product_uos_qty': product_qty, #TODO: put correct uos_qty
+                             'product_uos_qty': uos_qty[move.id],
                              'picking_id' : new_picking,
                              'state': 'assigned',
 -                            'move_dest_id': False,
 +                            'move_dest_id': move.move_dest_id.id,
                              'price_unit': move.price_unit,
                              'product_uom': product_uoms[move.id]
                      }