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

IDEMPIERE-2063 Ticket #1004146: cannot remove reserve quantity off order

This commit is contained in:
Elaine Tan 2014-07-16 17:49:03 +08:00
parent 85ff580ba1
commit 300ae850ac
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1722,15 +1722,23 @@ 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 || line.getQtyOrdered().signum() < 0)
{ {
MProduct product = line.getProduct(); if (difference.signum() == 0 || line.getQtyReserved().signum() == 0)
if (product != null)
{ {
Volume = Volume.add(product.getVolume().multiply(line.getQtyOrdered())); MProduct product = line.getProduct();
Weight = Weight.add(product.getWeight().multiply(line.getQtyOrdered())); if (product != null)
{
Volume = Volume.add(product.getVolume().multiply(line.getQtyOrdered()));
Weight = Weight.add(product.getWeight().multiply(line.getQtyOrdered()));
}
continue;
}
else if (line.getQtyOrdered().signum() < 0 && line.getQtyReserved().signum() > 0)
{
difference = line.getQtyReserved().negate();
} }
continue;
} }
if (log.isLoggable(Level.FINE)) log.fine("Line=" + line.getLine() if (log.isLoggable(Level.FINE)) log.fine("Line=" + line.getLine()