Merge lp:~openerp-dev/openobject-addons/7.0-opw-599727-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

I have fixed the issue of Unit of Measures is not work properly for pricelist in sale.order.line in sale.
When changing the Unit of Measure for a line in a Sales Order, the conversions are not respected.
For example: one product unit price is 10 and the price list is defined as (-.50) from Public price list, the price on the sales order line returns 9.50, but if the Case of 4 UOM is selected the price returns $39.50,It should be $38.00 (9.50*4).
The cost price is also incorrect and it does not reflect the correct cost, it returns the sales UOM not the actual UOM from the sales order line.

Thanks,
FKA

[E.R. Spada II (er-k)]

Hello,
This bug was reported by me, an OpenERP partner and verified by a senior developer at OpenERP. The status should be changed to important since the issue involved every product that the UOS and the purchase UOM are different. Any module that using that inherits the fields is also effected.

I now fixing bzr branch lp:margin-analysis since the calculated BOM is incorrect due to this bug. I cannot believe this is still sitting around

Unmerged revisions

9577. By Foram Katharotiya (OpenERP) on 2013-11-12

[MERGE] with 7.0

9576. By Foram Katharotiya (OpenERP) on 2013-11-11

[IMP] incorrect margin

9575. By Foram Katharotiya (OpenERP) on 2013-11-11

[MERGE] with 7.0

9574. By Foram Katharotiya (OpenERP) on 2013-11-08

[IMP] calculate unit price in sale.order.line when installed discount module

9573. By Foram Katharotiya (OpenERP) on 2013-11-07

[IMP] calculate cost price in sale.order.line

9572. By Foram Katharotiya (OpenERP) on 2013-11-06

[IMP] improve code

9571. By Foram Katharotiya (OpenERP) on 2013-11-06

[IMP] improve code

9570. By Foram Katharotiya (OpenERP) on 2013-11-06

[FIX] bug of pricelist which returns incorrect total in sale.order.line

=== modified file 'product/pricelist.py'
--- product/pricelist.py	2013-09-20 14:45:29 +0000
+++ product/pricelist.py	2013-11-12 05:32:02 +0000
@@ -296,7 +296,11 @@
                             price_limit = price
                             price = price * (1.0+(res['price_discount'] or 0.0))
                             price = rounding(price, res['price_round']) #TOFIX: rounding with tools.float_rouding
-                            price += (res['price_surcharge'] or 0.0)
+                            fact = 1.00 
+                            if context.get('uom'):
+                                fact = product_uom_obj.read(cr, uid, context['uom'], ['factor'])['factor']
+                            if res['price_surcharge']:
+                                price += ((res['price_surcharge'] / fact) or 0.0)
                             if res['price_min_margin']:
                                 price = max(price, price_limit+res['price_min_margin'])
                             if res['price_max_margin']:

=== modified file 'product_visible_discount/product_visible_discount.py'
--- product_visible_discount/product_visible_discount.py	2013-01-25 07:09:52 +0000
+++ product_visible_discount/product_visible_discount.py	2013-11-12 05:32:02 +0000
@@ -59,11 +59,11 @@
             product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
 
             factor = 1.0
-            if uom and uom != product.uom_id.id:
+            if uom:
                 product_uom_obj = self.pool.get('product.uom')
-                uom_data = product_uom_obj.browse(cr, uid,  product.uom_id.id)
+                uom_data = product_uom_obj.browse(cr, uid, uom)
                 factor = uom_data.factor
-            return product_read[field_name] * factor
+            return product_read[field_name] / factor
 
 
         res=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty,

=== 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-11-12 05:32:02 +0000
@@ -34,8 +34,12 @@
         frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         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)
+            product_obj = self.pool.get('product.product').browse(cr, uid, product)
+            frm_uom = product_obj.uom_id.id
+            to_uom = uos or uom
+            purchase_price = product_obj.standard_price
+            price = self.pool.get('product.uom')._compute_price(cr, uid, frm_uom, purchase_price, to_uom)
+            price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, price, round=False)
             res['value'].update({'purchase_price': price})
         return res