diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java b/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java
@@ -18,6 +18,8 @@
  */
 package org.openbravo.erpCommon.ad_callouts;
 
+import java.math.BigDecimal;
+
 import javax.servlet.ServletException;
 
 import org.apache.commons.lang.StringUtils;
@@ -106,19 +108,16 @@
     boolean isUomManagementEnabled = UOMUtil.isUomManagementEnabled();
     String fromOrder = SLInOutLineProductData.fromOrder(this, strmInoutlineId);
     if (fromOrder.equals("0")) {
-      info.addResult("inpquantityorder", StringUtils.isEmpty(strQtyOrder) ? "\"\""
-          : (Object) strQtyOrder);
-      if (strHasSecondaryUOM.equals("1")
-          && (!isUomManagementEnabled || (isUomManagementEnabled && !"".equals(strUOMProduct)))) {
-        info.addResult("inpquantityorder", StringUtils.isEmpty(strQtyOrder) ? "\"\""
-            : (Object) strQtyOrder);
-      }
-      info.addResult("inpmovementqty", StringUtils.isEmpty(strQty) ? "\"\"" : (Object) strQty);
+      BigDecimal qtyOrder = StringUtils.isNotEmpty(strQtyOrder) ? new BigDecimal(strQtyOrder)
+          : null;
+      BigDecimal qty = StringUtils.isNotEmpty(strQty) ? new BigDecimal(strQty) : null;
+      info.addResult("inpquantityorder", qtyOrder);
+      info.addResult("inpmovementqty", qty);
     }
 
     if (isUomManagementEnabled && "".equals(strUOMProduct)) {
       // Set AUM based on default
-      try{
+      try {
         OBContext.setAdminMode();
         ShipmentInOut mInOut = OBDal.getInstance().get(ShipmentInOut.class,
             info.vars.getStringParameter("inpmInoutId"));
@@ -127,7 +126,7 @@
         if (finalAUM != null) {
           info.addResult("inpcAum", finalAUM);
         }
-      }finally{
+      } finally {
         OBContext.restorePreviousMode();
       }
     }
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java
@@ -11,13 +11,15 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2001-2016 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2017 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
 package org.openbravo.erpCommon.ad_callouts;
 
+import java.math.BigDecimal;
+
 import javax.servlet.ServletException;
 
 import org.apache.commons.lang.StringUtils;
@@ -91,18 +93,18 @@
     // Quantity order
 
     String strQtyOrder = info.vars.getNumericParameter("inpmProductId_PQTY");
+    BigDecimal qtyOrder = StringUtils.isNotEmpty(strQtyOrder) ? new BigDecimal(strQtyOrder) : null;
 
-    info.addResult("inpquantityorder", StringUtils.isEmpty(strQtyOrder) ? "\"\""
-        : (Object) strQtyOrder);
-    info.addResult("inpquantityorderbook", StringUtils.isEmpty(strQtyOrder) ? "\"\""
-        : (Object) strQtyOrder);
+    info.addResult("inpquantityorder", qtyOrder);
+    info.addResult("inpquantityorderbook", qtyOrder);
 
     // Quantity
 
     String strQty = info.vars.getNumericParameter("inpmProductId_QTY");
+    BigDecimal qty = StringUtils.isNotEmpty(strQty) ? new BigDecimal(strQty) : null;
 
-    info.addResult("inpqtycount", StringUtils.isEmpty(strQty) ? "\"\"" : (Object) strQty);
-    info.addResult("inpqtybook", StringUtils.isEmpty(strQty) ? "\"\"" : (Object) strQty);
+    info.addResult("inpqtycount", qty);
+    info.addResult("inpqtybook", qty);
 
     // UOM
 
diff --git a/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java b/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java
@@ -18,6 +18,8 @@
  */
 package org.openbravo.erpCommon.ad_callouts;
 
+import java.math.BigDecimal;
+
 import javax.servlet.ServletException;
 
 import org.apache.commons.lang.StringUtils;
@@ -87,10 +89,11 @@
 
     String strQtyOrder = info.vars.getNumericParameter("inpmProductId_PQTY");
     String strQty = info.vars.getNumericParameter("inpmProductId_QTY");
+    BigDecimal qtyOrder = StringUtils.isNotEmpty(strQtyOrder) ? new BigDecimal(strQtyOrder) : null;
+    BigDecimal qty = StringUtils.isNotEmpty(strQty) ? new BigDecimal(strQty) : null;
 
-    info.addResult("inpmovementqty", StringUtils.isEmpty(strQty) ? "\"\"" : (Object) strQty);
-    info.addResult("inpquantityorder", StringUtils.isEmpty(strQtyOrder) ? "\"\""
-        : (Object) strQtyOrder);
+    info.addResult("inpmovementqty", qty);
+    info.addResult("inpquantityorder", qtyOrder);
 
     // Secondary UOM