[FIX] delivery: use unit of measure and not unit of stock to compute price of delivery

The computation expects uom and it was wrongly passing uos qunatities.
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-linux64