Merge lp:~openerp-dev/openobject-addons/6.1-opw-579984-WrongUnitPrice-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[FIX]account_invoice: Unit price of the product will be wrong in invoice line when the default UOM will be of type bigger.

Note: Check this issue in Web client.
Steps:
1. Create a product and set the default UOM as "tonne" and with sale price 100.
2. Create a Invoice and select the product and see the Unit price of the product it will be 100000.
It should be 100 because the UOM of the product is tonne.

This branch fixes this issue, Kindly review the branch and please share your views in it.

Thanks,
Somesh Khare

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as not reproducible on Trunk . If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7015. By Somesh Khare on 2012-10-05

[FIX]account_invoice: Unit price of the product will be wrong in invoice line when the default UOM will be of type bigger (Case: ref 579984)

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-08-20 15:52:57 +0000
+++ account/account_invoice.py	2012-10-05 12:42:24 +0000
@@ -1404,9 +1404,10 @@
             res_final['value']['price_unit'] = new_price
 
         if uom:
-            uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
-            if res.uom_id.category_id.id == uom.category_id.id:
-                new_price = res_final['value']['price_unit'] * uom.factor_inv
+            uom_obj = self.pool.get('product.uom')
+            uom = uom_obj.browse(cr, uid, uom, context=context)
+            if res.uom_id.category_id.id == uom.category_id.id and res.uom_id.id != uom.id:
+                new_price = uom_obj._compute_price(cr, uid, res.uom_id.id, res_final['value']['price_unit'], uom.id)
                 res_final['value']['price_unit'] = new_price
         return res_final