Merge lp:~openerp-dev/openobject-addons/trunk-bug-1186938-jpr into lp:openobject-addons

[Jitendra Prajapati(OpenERP)]

Hello,

   I have fixed this issue, Sales margin calculation need to consider uom in sales line

Thanks,
Jitendra (JPR)

Unmerged revisions

8993. By Arif (arifmlpm) on 2013-11-26

[FIX]consider uom in sales line

=== 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-11-26 12:29:28 +0000
@@ -35,7 +35,10 @@
         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
-            price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False)
+            if context is None:
+                context = {}
+            context.update({'currency_id': to_cur, 'uom':uom})
+            price = self.pool.get('product.product').price_get(cr, uid, [product], ptype='standard_price', context=context)[product]
             res['value'].update({'purchase_price': price})
         return res