[FIX] sale_margin: cost price uom

When computing the cost price to display, take the uom into account. The cost of 1 Unit or 1 dozen should not be the same. opw 599727
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0-linux64