Fix quantity unit conversion on ProductionOrder_viewMaterialConsumption.

bt5/erp5_mrp/SkinTemplateItem/portal_skins/erp5_mrp/ProductionOrder_getConsumptionMovementList.xml

@@ -78,7 +78,6 @@ for inventory in context.portal_simulation.getFutureInventoryList(*args,**kwargs
 result_list = inventory_dict.values()\n
 consumption_dict = {}\n
 for movement in context.getMovementList():\n
-  movement_quantity_unit = movement.getQuantityUnit()\n
   movement_quantity = movement.getQuantity()\n
   movement_destination = movement.getDestination()\n
 \n
@@ -90,22 +89,24 @@ for movement in context.getMovementList():\n
     inventory_dict_key = material_resource_uid, \\\n
         tuple(sorted(material.getVariationCategoryList())), \\\n
         movement_destination\n
+\n
+    quantity = material.getQuantity()\n
 \n
     try:\n
       obj = inventory_dict[inventory_dict_key]\n
     except KeyError:\n
       obj = material\n
       result_list.append(obj)\n
-\n
-    material_quantity_unit = material.getQuantityUnit()\n
-    if movement_quantity_unit == material_quantity_unit:\n
-      quantity = material.getQuantity()\n
     else:\n
-      quantity = material.getResourceValue().convertQuantity(material.getQuantity(),\n
-                                                             material_quantity_unit,\n
-                                                             movement_quantity_unit)\n
+      inventory_quantity_unit = obj.getQuantityUnit()\n
+      quantity_unit = material.getQuantityUnit()\n
+      if quantity_unit != inventory_quantity_unit:\n
+        quantity = material.getResourceValue().convertQuantity(quantity,\n
+                                                               quantity_unit,\n
+                                                               inventory_quantity_unit)\n
 \n
-    consumption_dict[obj.getUid()] = quantity * movement_quantity\n
+    if quantity:\n
+      consumption_dict[obj.getUid()] = quantity * movement_quantity\n
 \n
 context.REQUEST.set(\'consumption_dict\', consumption_dict)\n
 return result_list\n

bt5/erp5_mrp/bt/change_log

+2011-06-02 arnaud.fontaine
+* Fix quantity unit conversion on ProductionOrder_viewMaterialConsumption.
+
 2011-06-01 arnaud.fontaine
 * Fix ProductionOrder_viewMaterialConsumption and display materials even when not in the inventory.
 

bt5/erp5_mrp/bt/revision

-460
+461
\ No newline at end of file