midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2042 Don't reserved stock if c_orderline.qtyordered is -ve.

This commit is contained in:
Heng Sin Low 2014-07-04 18:55:17 +08:00
parent f94deb552a
commit b08aebfab8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.base/src/org/compiere/model/MInOut.java
View File

@ -1407,7 +1407,7 @@ public class MInOut extends X_M_InOut implements DocAction
m_processMsg = "Cannot correct Inventory OnHand (MA) [" + product.getValue() + "] - " + lastError; m_processMsg = "Cannot correct Inventory OnHand (MA) [" + product.getValue() + "] - " + lastError;
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
if (reservedDiff.signum() != 0) { if (reservedDiff.signum() != 0 && oLine.getQtyOrdered().signum() > 0) {
if (!MStorageReservation.add(getCtx(), reservationWarehouse_ID, if (!MStorageReservation.add(getCtx(), reservationWarehouse_ID,
sLine.getM_Product_ID(), sLine.getM_Product_ID(),
ma.getM_AttributeSetInstance_ID(), reservationAttributeSetInstance_ID, ma.getM_AttributeSetInstance_ID(), reservationAttributeSetInstance_ID,
@ -1460,7 +1460,7 @@ public class MInOut extends X_M_InOut implements DocAction
m_processMsg = "Cannot correct Inventory OnHand [" + product.getValue() + "] - " + lastError; m_processMsg = "Cannot correct Inventory OnHand [" + product.getValue() + "] - " + lastError;
return DocAction.STATUS_Invalid; return DocAction.STATUS_Invalid;
} }
if (reservedDiff.signum() != 0) { if (reservedDiff.signum() != 0 && oLine.getQtyOrdered().signum() > 0) {
if (!MStorageReservation.add(getCtx(), reservationWarehouse_ID, if (!MStorageReservation.add(getCtx(), reservationWarehouse_ID,
sLine.getM_Product_ID(), sLine.getM_Product_ID(),
sLine.getM_AttributeSetInstance_ID(), reservationAttributeSetInstance_ID, sLine.getM_AttributeSetInstance_ID(), reservationAttributeSetInstance_ID,

2
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -1722,7 +1722,7 @@ public class MOrder extends X_C_Order implements DocAction
BigDecimal difference = target BigDecimal difference = target
.subtract(line.getQtyReserved()) .subtract(line.getQtyReserved())
.subtract(line.getQtyDelivered()); .subtract(line.getQtyDelivered());
if (difference.signum() == 0) if (difference.signum() <= 0)
{ {
MProduct product = line.getProduct(); MProduct product = line.getProduct();
if (product != null) if (product != null)