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

IDEMPIERE-235 Generate Shipments is generating partial for complete orders (#58)

This commit is contained in:
Carlos Ruiz 2020-05-13 19:19:56 +02:00 committed by GitHub
parent cc159a3e53
commit 86ca0a9523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1289,7 +1289,7 @@ public class MOrder extends X_C_Order implements DocAction
}
// Bug 1564431
if (getDeliveryRule() != null && getDeliveryRule().equals(MOrder.DELIVERYRULE_CompleteOrder))
if (MOrder.DELIVERYRULE_CompleteOrder.equals(getDeliveryRule()) )
{
for (int i = 0; i < lines.length; i++)
{
@ -1300,6 +1300,11 @@ public class MOrder extends X_C_Order implements DocAction
m_processMsg = "@M_Product_ID@ "+product.getValue()+" @IsExcludeAutoDelivery@";
return DocAction.STATUS_Invalid;
}
if (line.getDatePromised() != null && !line.getDatePromised().equals(getDatePromised()))
{
m_processMsg = "@Line@ " + line.getLine() + " - @Invalid@ @DatePromised@";
return DocAction.STATUS_Invalid;
}
}
}