Merge lp:~openerp-dev/openobject-addons/trunk-bug-1082409-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

Unmerged revisions

8484. By Hiral Patel (OpenERP) on 2013-01-02

[MERGE] Merge with lp:openobject-addons

8483. By Hiral Patel (OpenERP) on 2013-01-02

[trunk] Change the price based on uom change

8482. By Hiral Patel (OpenERP) on 2012-12-27

[trunk] Can not change UOM on Sales Order Line

=== modified file 'product_visible_discount/product_visible_discount.py'
--- product_visible_discount/product_visible_discount.py	2012-12-06 14:56:32 +0000
+++ product_visible_discount/product_visible_discount.py	2013-01-02 09:18:24 +0000
@@ -91,6 +91,8 @@
                 discount = (new_list_price - price) / new_list_price * 100
                 result['price_unit'] = new_list_price
                 result['discount'] = discount
+                if uom != product.uom_id.id:
+                    result['price_unit'] = price
             else:
                 result['discount'] = 0.0
         return res

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-12-21 16:48:08 +0000
+++ sale/sale.py	2013-01-02 09:18:24 +0000
@@ -918,7 +918,7 @@
         elif uom: # whether uos is set or not
             default_uom = product_obj.uom_id and product_obj.uom_id.id
             q = product_uom_obj._compute_qty(cr, uid, uom, qty, default_uom)
-            result['product_uom'] = default_uom
+            result['product_uom'] = uom
             if product_obj.uos_id:
                 result['product_uos'] = product_obj.uos_id.id
                 result['product_uos_qty'] = qty * product_obj.uos_coeff