diff --git a/addons/product/product.py b/addons/product/product.py
index b595b8d8ecf..5b1d100fc8b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -180,7 +180,7 @@ class product_uom(osv.osv):
         if to_unit:
             amount = amount * to_unit.factor
             if round:
-                amount = ceiling(amount * to_unit.factor, to_unit.rounding)
+                amount = ceiling(amount, to_unit.rounding)
         return amount
 
     def _compute_price(self, cr, uid, from_uom_id, price, to_uom_id=False):
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index aeda0f87358..c7f3219b1be 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -58,7 +58,7 @@ class product_product(osv.osv):
 
             #Cost price is calculated afterwards as it is a property
             sqlstr="""select
-                    sum(l.price_unit * l.quantity)/sum(nullif(l.quantity * pu.factor / pu2.factor),0) as avg_unit_price,
+                    sum(l.price_unit * l.quantity)/sum(nullif(l.quantity * pu.factor / pu2.factor,0)) as avg_unit_price,
                     sum(l.quantity * pu.factor / pu2.factor) as num_qty,
                     sum(l.quantity * (l.price_subtotal/(nullif(l.quantity,0)))) as total,
                     sum(l.quantity * pu.factor * pt.list_price / pu2.factor) as sale_expected
@@ -79,7 +79,7 @@ class product_product(osv.osv):
             res[val.id]['sale_expected'] = result[3] and result[3] or 0.0
             res[val.id]['sales_gap'] = res[val.id]['sale_expected']-res[val.id]['turnover']
             prod_obj = self.pool.get("product.product")
-            ctx=context.copy()
+            ctx = context.copy()
             ctx['force_company'] = company_id
             prod = prod_obj.browse(cr, uid, val.id, context=ctx)
             invoice_types = ('in_invoice', 'out_refund')