diff -r 2329370972e3 src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml	Fri Apr 29 04:35:33 2016 +0000
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml	Mon May 16 13:04:52 2016 +0200
@@ -551,14 +551,14 @@
               IF (Cur_ResLine.QtyDelivered=0) THEN
                 v_QtyOrderPO := -Cur_ResLine.QuantityOrder;
               ELSIF Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
-                v_QtyOrderPO := -C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID, Cur_ResLine.M_Product_UOM_ID, 'Y');
+                v_QtyOrderPO := -C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID, (select c_uom_id from m_product_uom where m_product_uom_id = Cur_ResLine.M_Product_UOM_ID), 'Y');
               END IF;
             ELSE
               v_QtySO:=-Cur_ResLine.QtyReserved;
               IF (Cur_ResLine.QtyReserved=Cur_ResLine.Qty) THEN
                 v_QtyOrderSO := -Cur_ResLine.QuantityOrder;
               ELSIF Cur_ResLine.M_Product_UOM_ID IS NOT NULL THEN
-                v_QtyOrderSO := -C_Uom_Convert(v_QtySO, Cur_ResLine.C_UOM_ID, Cur_ResLine.M_Product_UOM_ID, 'Y');
+                v_QtyOrderSO := -C_Uom_Convert(v_QtySO, Cur_ResLine.C_UOM_ID, (select c_uom_id from m_product_uom where m_product_uom_id = Cur_ResLine.M_Product_UOM_ID), 'Y');
               END IF;
               v_QtyPO:=0;
               v_QtyOrderPO:=NULL;
@@ -1149,7 +1149,7 @@
               IF (Cur_ResLine.QtyReserved = 0 AND Cur_ResLine.QtyDelivered = 0) THEN
                 v_QtyOrderSO := Cur_ResLine.QuantityOrder;
               ELSIF (Cur_ResLine.M_Product_UOM_ID IS NOT NULL) THEN
-                v_QtyOrderSO := C_Uom_Convert(v_QtySO, Cur_ResLine.C_UOM_ID, Cur_ResLine.M_Product_UOM_ID, 'Y');
+                v_QtyOrderSO := C_Uom_Convert(v_QtySO, Cur_ResLine.C_UOM_ID, (select c_uom_id from m_product_uom where m_product_uom_id = Cur_ResLine.M_Product_UOM_ID), 'Y');
               END IF;
               v_QtyPO   := 0;
               v_QtyOrderPO := NULL;
@@ -1161,7 +1161,7 @@
               IF (Cur_ResLine.QtyReserved = 0 AND Cur_ResLine.QtyDelivered = 0) THEN
                 v_QtyOrderPO := Cur_ResLine.QuantityOrder;
               ELSIF (Cur_ResLine.M_Product_UOM_ID IS NOT NULL) THEN
-                v_QtyOrderPO := C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID, Cur_ResLine.M_Product_UOM_ID, 'Y');
+                v_QtyOrderPO := C_Uom_Convert(v_QtyPO, Cur_ResLine.C_UOM_ID, (select c_uom_id from m_product_uom where m_product_uom_id = Cur_ResLine.M_Product_UOM_ID), 'Y');
               END IF;
             END IF;
             IF ((v_DocStatus<>'IP' OR v_DocAction<>'CO') AND COALESCE(v_DocSubTypeSO, '')<>'OB') THEN
diff -r 2329370972e3 src-db/database/model/triggers/C_ORDERLINE2_TRG.xml
--- a/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Fri Apr 29 04:35:33 2016 +0000
+++ b/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Mon May 16 13:04:52 2016 +0200
@@ -54,7 +54,7 @@
           IF :old.qtydelivered=0 AND :new.qtydelivered=:new.qtyordered THEN
             v_QtyOrderReserved:=-:new.QuantityOrder;
           ELSIF :new.M_Product_UOM_ID IS NOT NULL THEN
-            v_QtyOrderReserved:=C_Uom_Convert(v_QtyReserved, :new.C_UOM_ID, :new.m_product_uom_id, 'Y') ;
+            v_QtyOrderReserved:=C_Uom_Convert(v_QtyReserved, :new.C_UOM_ID, (select c_uom_id from m_product_uom where m_product_uom_id = :new.m_product_uom_id), 'Y') ;
           END IF;
           SELECT COUNT(*)
           INTO V_STOCKED