Merge lp:~openerp-dev/openobject-addons/7.0-opw-599529-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello,

I improved sale_margin to calculate margin without product.

Steps to reproduce :
create a sale order, add a line with a selling price and a cost price, without making a link to a product, there is no margin calculated.

Thanks,
pna

Unmerged revisions

9541. By Pinakin Nayi (OpenERP) on 2013-10-24

[IMP]sale_margin : allow margin to calculate without product also

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2012-12-19 01:25:10 +0000
+++ sale_margin/sale_margin.py	2013-10-24 05:32:10 +0000
@@ -43,10 +43,10 @@
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             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)
-                else:
+            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)
+            else:
+                if line.product_id:
                     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)
         return res