Do not convert price if context uom is from different category

issue6407 review39291002
2017-04-02 12:49:47 +02:00
parent 8c5d04920b
commit 1a9ddfa8f2
1 changed files with 8 additions and 5 deletions
@@ -303,12 +303,15 @@ class Product(ModelSQL, ModelView):
        field = name[:-4]
        if Transaction().context.get('uom'):
            to_uom = Uom(Transaction().context['uom'])
-            for product in products:
-                res[product.id] = Uom.compute_price(
-                    product.default_uom, getattr(product, field), to_uom)
        else:
-            for product in products:
-                res[product.id] = getattr(product, field)
+            to_uom = None
+        for product in products:
+            price = getattr(product, field)
+            if to_uom and product.default_uom.category == to_uom.category:
+                res[product.id] = Uom.compute_price(
+                    product.default_uom, price, to_uom)
+            else:
+                res[product.id] = price
        return res

    @classmethod