Merge lp:~openerp-dev/openobject-addons/trunk-bug-1218212-ypa into lp:openobject-addons

[Yogesh Parekh(OpenERP)]

Hello,

        Set the Product_id in _product_margin function for compute the margin in sale line.

Thanks,
Yogesh Parekh.

[Amit Parik (amit-parik)]

Not valid bug please see my comment on bug, Aslo I have marked bug as a invaild.

Thank You!

review: Disapprove

[Amit Parik (amit-parik)]

After the comment#4 of Andrius on bug this issue is valid and we need to fix.
Let me approve the Andrius.

@Andrius: Thanks for the fix!

review: Approve

Unmerged revisions

8876. By Yogesh Parekh(OpenERP) on 2013-09-03

[FIX] Margin not computed in sale line when product is not selected in sale order

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2013-04-15 10:23:49 +0000
+++ sale_margin/sale_margin.py	2013-09-03 10:08:25 +0000
@@ -43,11 +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:
-                    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)
+            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)
+            elif 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
 
     _columns = {
@@ -82,4 +81,4 @@
     }
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: