From 9a7e649bbc4764b570a4f6b675b8d49277793eb8 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 21 Nov 2012 17:20:12 -0500 Subject: [PATCH] IDEMPIERE-385 Resolve M_Storage locking and data consistency / Improve error message - i.e. for negative inventory disallowed --- .../src/org/compiere/model/MInOut.java | 3 ++- .../src/org/compiere/model/MInventory.java | 3 ++- .../src/org/compiere/model/MMovement.java | 13 +++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java index 5e0c2e3723..ffeab33026 100644 --- a/org.adempiere.base/src/org/compiere/model/MInOut.java +++ b/org.adempiere.base/src/org/compiere/model/MInOut.java @@ -1441,7 +1441,8 @@ public class MInOut extends X_M_InOut implements DocAction sLine.getM_AttributeSetInstance_ID(), reservationAttributeSetInstance_ID, Qty, get_TrxName())) { - m_processMsg = "Cannot correct Inventory OnHand"; + String lastError = CLogger.retrieveErrorString(""); + m_processMsg = "Cannot correct Inventory OnHand - " + lastError; return DocAction.STATUS_Invalid; } if (reservedDiff.signum() != 0) { diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java index 19ef3c197d..049a1802c2 100644 --- a/org.adempiere.base/src/org/compiere/model/MInventory.java +++ b/org.adempiere.base/src/org/compiere/model/MInventory.java @@ -494,7 +494,8 @@ public class MInventory extends X_M_Inventory implements DocAction line.getM_AttributeSetInstance_ID(), 0, qtyDiff,get_TrxName())) { - m_processMsg = "Cannot correct Inventory (MA)"; + String lastError = CLogger.retrieveErrorString(""); + m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError; return DocAction.STATUS_Invalid; } diff --git a/org.adempiere.base/src/org/compiere/model/MMovement.java b/org.adempiere.base/src/org/compiere/model/MMovement.java index c2dc65a273..4a8fb7494d 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovement.java +++ b/org.adempiere.base/src/org/compiere/model/MMovement.java @@ -25,6 +25,7 @@ import java.util.Properties; import org.compiere.process.DocAction; import org.compiere.process.DocumentEngine; +import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.Msg; @@ -405,7 +406,8 @@ public class MMovement extends X_M_Movement implements DocAction ma.getM_AttributeSetInstance_ID(), 0, ma.getMovementQty().negate(), get_TrxName())) { - m_processMsg = "Cannot correct Inventory (MA)"; + String lastError = CLogger.retrieveErrorString(""); + m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError; return DocAction.STATUS_Invalid; } @@ -422,7 +424,8 @@ public class MMovement extends X_M_Movement implements DocAction M_AttributeSetInstanceTo_ID, 0, ma.getMovementQty(), get_TrxName())) { - m_processMsg = "Cannot correct Inventory (MA)"; + String lastError = CLogger.retrieveErrorString(""); + m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError; return DocAction.STATUS_Invalid; } @@ -461,7 +464,8 @@ public class MMovement extends X_M_Movement implements DocAction line.getM_AttributeSetInstance_ID(), 0, line.getMovementQty().negate(), get_TrxName())) { - m_processMsg = "Cannot correct Inventory (MA)"; + String lastError = CLogger.retrieveErrorString(""); + m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError; return DocAction.STATUS_Invalid; } @@ -472,7 +476,8 @@ public class MMovement extends X_M_Movement implements DocAction line.getM_AttributeSetInstanceTo_ID(), 0, line.getMovementQty(), get_TrxName())) { - m_processMsg = "Cannot correct Inventory (MA)"; + String lastError = CLogger.retrieveErrorString(""); + m_processMsg = "Cannot correct Inventory OnHand (MA) - " + lastError; return DocAction.STATUS_Invalid; }