From 80e81f4c86ca55fd26c0238d66f49a0847508e04 Mon Sep 17 00:00:00 2001
From: uthadehikaru <devnull@localhost>
Date: Mon, 12 Nov 2012 09:54:53 +0700
Subject: [PATCH] fixed bug related to inventory move

---
 .../src/org/compiere/model/CalloutMovement.java        |  2 +-
 .../src/org/compiere/model/MStorageReservation.java    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutMovement.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutMovement.java
index 8d776803b6..2b1a844e6f 100644
--- a/org.adempiere.base.callout/src/org/compiere/model/CalloutMovement.java
+++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutMovement.java
@@ -123,7 +123,7 @@ public class CalloutMovement extends CalloutEngine
 				if (M_Locator_ID <= 0)
 					return;
 				//@win - IDEMPIERE-385
-				int M_Warehouse_ID = DB.getSQLValue(null, "SELECT M_Warehouse_ID FROM M_Locator WHERE M_Locator_ID=?");
+				int M_Warehouse_ID = DB.getSQLValue(null, "SELECT M_Warehouse_ID FROM M_Locator WHERE M_Locator_ID=?", M_Locator_ID);
 				//
 				int M_AttributeSetInstance_ID = Env.getContextAsInt(ctx, WindowNo, "M_AttributeSetInstance_ID");
 				BigDecimal available = MStorageReservation.getQtyAvailable(M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID, null);
diff --git a/org.adempiere.base/src/org/compiere/model/MStorageReservation.java b/org.adempiere.base/src/org/compiere/model/MStorageReservation.java
index 98d6c693c4..6b9c736055 100644
--- a/org.adempiere.base/src/org/compiere/model/MStorageReservation.java
+++ b/org.adempiere.base/src/org/compiere/model/MStorageReservation.java
@@ -87,10 +87,12 @@ public class MStorageReservation extends X_M_StorageReservation {
 	public static BigDecimal getQtyReserved(int M_Product_ID, int M_Warehouse_ID, int M_AttributeSetInstance_ID, String trxName){
 		ArrayList<Object> params = new ArrayList<Object>();
 		StringBuffer sql = new StringBuffer();
-		sql.append(" SELECT SUM(QtyReserved) FROM M_StorageReservation oh")
-			.append(" WHERE oh.M_Product_ID=? AND oh.M_Warehouse_ID=?");
-			
-		params.add(M_Product_ID,M_Warehouse_ID);
+		sql.append(" SELECT SUM(Qty) FROM M_StorageReservation oh")
+			.append(" WHERE oh.M_Product_ID=? AND oh.M_Warehouse_ID=?")
+			.append(" AND oh.IsSOTrx='Y'");
+		
+		params.add(M_Product_ID);
+		params.add(M_Warehouse_ID);
 		
 		// With ASI
 		if (M_AttributeSetInstance_ID != 0) {