0029906: It could be nice to take into account reservations on stocks popups

diff --git a/src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java b/src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java
--- a/src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java
+++ b/src/org/openbravo/retail/posterminal/stock/OtherStoresDetailedStock.java
@@ -1,3 +1,12 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
 package org.openbravo.retail.posterminal.stock;
 
 import java.math.BigDecimal;
@@ -31,7 +40,8 @@
       orgId = jsonData.getString("organization");
       prodId = jsonData.getString("product");
 
-      String hqlQuery = "select ow.organization.id, ow.organization.name, ow.warehouse.id, ow.warehouse.name, sum(ms.quantityOnHand) as qtyonhand "
+      String hqlQuery = "select ow.organization.id, ow.organization.name, ow.warehouse.id, ow.warehouse.name, "
+          + "sum(ms.quantityOnHand - ms.reservedQty) as qtyonhand "
           + "from OrganizationWarehouse as ow, MaterialMgmtStorageDetail as ms "
           + "where ow.organization.id <> ' "
           + orgId
diff --git a/src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java b/src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java
--- a/src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java
+++ b/src/org/openbravo/retail/posterminal/stock/StoreDetailedStock.java
@@ -1,3 +1,12 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2015 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
 package org.openbravo.retail.posterminal.stock;
 
 import java.math.BigDecimal;
@@ -28,7 +37,8 @@
       orgId = jsonData.getString("organization");
       prodId = jsonData.getString("product");
 
-      String hqlQuery = "select ms.storageBin.warehouse.id, ms.storageBin.warehouse.name, ms.storageBin.id, ms.storageBin.searchKey, sum(ms.quantityOnHand) as qtyonhand "
+      String hqlQuery = "select ms.storageBin.warehouse.id, ms.storageBin.warehouse.name, ms.storageBin.id, ms.storageBin.searchKey, "
+          + "sum(ms.quantityOnHand - ms.reservedQty) as qtyonhand "
           + "from MaterialMgmtStorageDetail ms "
           + "where ms.storageBin.warehouse.id in ( "
           + "SELECT ow.warehouse.id "