[MERGE] forward port of branch 7.0 up to 00ec786

[odoo/odoo.git] / addons / sale_margin / sale_margin.py

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 36b0a74..6329463 100644 (file)
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -36,7 +36,11 @@ class sale_order_line(osv.osv):
         frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id
         if product:
-            purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
+            product = self.pool['product.product'].browse(cr, uid, product, context=context)
+            purchase_price = product.standard_price
+            to_uom = res.get('product_uom', uom)
+            if to_uom != product.uom_id.id:
+                purchase_price = self.pool['product.uom']._compute_price(cr, uid, product.uom_id.id, purchase_price, to_uom)
             ctx = context.copy()
             ctx['date'] = date_order
             price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False, context=ctx)