Merge lp:~openerp-dev/openobject-addons/trunk-bug-1176031-cod into lp:openobject-addons

[Chirag Dodiya(OpenERP)]

Hello,

    I have fixed this bug "Wrong calculation of sale margin",in sale margin it was calculate margin base on product_uos_ qty which was wrong, i removed product_uos_ qty for calculate sale price and set product_uom_ qty for calculate purchase price.

Thanks,
Chirag Dodiya(cod).

Unmerged revisions

9018. By Chirag Dodiya(OpenERP) on 2013-12-16

[FIX] fixed wrong calculation of sale margin

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2013-10-27 12:31:04 +0000
+++ sale_margin/sale_margin.py	2013-12-16 13:06:56 +0000
@@ -45,9 +45,10 @@
             res[line.id] = 0
             if line.product_id:
                 if line.purchase_price:
-                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty), 2)
+                    res[line.id] = round((line.price_unit*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uom_qty), 2)
+
                 else:
-                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty), 2)
+                    res[line.id] = round((line.price_unit*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uom_qty), 2)
         return res
 
     _columns = {