From 3fc69673b4a86071e228f6ad5a8e985fdbc06b86 Mon Sep 17 00:00:00 2001
From: teo_sarca <devnull@localhost>
Date: Fri, 30 Jan 2009 08:09:51 +0000
Subject: [PATCH] Revert revision 8251 because it was a bad merge. Manual merge
 is needed.

---
 base/src/org/compiere/model/MInOut.java          | 4 +---
 base/src/org/compiere/model/MInventory.java      | 4 ++--
 base/src/org/compiere/model/MMovement.java       | 4 ++--
 base/src/org/compiere/model/MStorage.java        | 3 ---
 base/src/org/compiere/process/InOutGenerate.java | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/base/src/org/compiere/model/MInOut.java b/base/src/org/compiere/model/MInOut.java
index af1fb878eb..264f74fa57 100644
--- a/base/src/org/compiere/model/MInOut.java
+++ b/base/src/org/compiere/model/MInOut.java
@@ -1695,11 +1695,10 @@ public class MInOut extends X_M_InOut implements DocAction
 				String MMPolicy = product.getMMPolicy();
 				Timestamp minGuaranteeDate = getMovementDate();
 				MStorage[] storages = MStorage.getWarehouse(getCtx(), getM_Warehouse_ID(), line.getM_Product_ID(), line.getM_AttributeSetInstance_ID(), 
-						minGuaranteeDate, MClient.MMPOLICY_FiFo.equals(MMPolicy), false, line.getM_Locator_ID(), get_TrxName());
+						minGuaranteeDate, MClient.MMPOLICY_FiFo.equals(MMPolicy), true, line.getM_Locator_ID(), get_TrxName());
 				BigDecimal qtyToDeliver = line.getMovementQty();
 				for (MStorage storage: storages)
 				{
-
 					if (storage.getQtyOnHand().compareTo(qtyToDeliver) >= 0)
 					{
 						MInOutLineMA ma = new MInOutLineMA (line, 
@@ -1710,7 +1709,6 @@ public class MInOut extends X_M_InOut implements DocAction
 							throw new IllegalStateException("Error try create ASI Reservation");
 						}														
 						qtyToDeliver = Env.ZERO;
-						break;
 					}
 					else
 					{
diff --git a/base/src/org/compiere/model/MInventory.java b/base/src/org/compiere/model/MInventory.java
index d5ea7cb5d7..b2ec362981 100644
--- a/base/src/org/compiere/model/MInventory.java
+++ b/base/src/org/compiere/model/MInventory.java
@@ -596,7 +596,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 			{
 				String MMPolicy = product.getMMPolicy();
 				MStorage[] storages = MStorage.getWarehouse(getCtx(), getM_Warehouse_ID(), line.getM_Product_ID(), 0, 
-						null, MClient.MMPOLICY_FiFo.equals(MMPolicy), false, line.getM_Locator_ID(), get_TrxName());
+						null, MClient.MMPOLICY_FiFo.equals(MMPolicy), true, line.getM_Locator_ID(), get_TrxName());
 				BigDecimal qtyToDeliver = qtyDiff.negate();
 
 				for (MStorage storage: storages)
@@ -612,7 +612,7 @@ public class MInventory extends X_M_Inventory implements DocAction
 						}		
 						qtyToDeliver = Env.ZERO;
 						log.fine( ma + ", QtyToDeliver=" + qtyToDeliver);		
-						break;
+						//return;
 					}
 					else
 					{	
diff --git a/base/src/org/compiere/model/MMovement.java b/base/src/org/compiere/model/MMovement.java
index c51150eeb7..10acd74d4b 100644
--- a/base/src/org/compiere/model/MMovement.java
+++ b/base/src/org/compiere/model/MMovement.java
@@ -665,7 +665,7 @@ public class MMovement extends X_M_Movement implements DocAction
 				MProduct product = MProduct.get(getCtx(), line.getM_Product_ID());
 				String MMPolicy = product.getMMPolicy();
 				MStorage[] storages = MStorage.getWarehouse(getCtx(), 0, line.getM_Product_ID(), 0, 
-						null, MClient.MMPOLICY_FiFo.equals(MMPolicy), false, line.getM_Locator_ID(), get_TrxName());
+						null, MClient.MMPOLICY_FiFo.equals(MMPolicy), true, line.getM_Locator_ID(), get_TrxName());
 
 				BigDecimal qtyToDeliver = line.getMovementQty();
 
@@ -682,7 +682,7 @@ public class MMovement extends X_M_Movement implements DocAction
 							}		
 							qtyToDeliver = Env.ZERO;
 							log.fine( ma + ", QtyToDeliver=" + qtyToDeliver);		
-							break;
+							//return;
 					}
 					else
 					{	
diff --git a/base/src/org/compiere/model/MStorage.java b/base/src/org/compiere/model/MStorage.java
index 193cd1fa01..13e12bd254 100644
--- a/base/src/org/compiere/model/MStorage.java
+++ b/base/src/org/compiere/model/MStorage.java
@@ -332,10 +332,7 @@ public class MStorage extends X_M_Storage
 			}
 			rs = pstmt.executeQuery();
 			while (rs.next())
-			{	
-				if(rs.getBigDecimal(11).signum() != 0)
 				list.add (new MStorage (ctx, rs, trxName));
-			}	
 		}
 		catch (Exception e)
 		{
diff --git a/base/src/org/compiere/process/InOutGenerate.java b/base/src/org/compiere/process/InOutGenerate.java
index 974588af2b..0e932712c2 100644
--- a/base/src/org/compiere/process/InOutGenerate.java
+++ b/base/src/org/compiere/process/InOutGenerate.java
@@ -542,7 +542,7 @@ public class InOutGenerate extends SvrProcess
 		{
 			m_lastStorages = MStorage.getWarehouse(getCtx(), 
 				M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID,
-				minGuaranteeDate, FiFo, false, 0 , get_TrxName());
+				minGuaranteeDate, FiFo, true, 0 , get_TrxName());
 			m_map.put(m_lastPP, m_lastStorages);
 		}
 		return m_lastStorages;