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

Merged release-1.0c into release-2.0

This commit is contained in:
Elaine Tan 2013-12-24 16:42:25 +08:00
parent 469edd0b96 8a6f3709b0
commit 8d5d9350aa
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.adempiere.base/src/org/compiere/model/MMatchPO.java
View File

@ -791,8 +791,25 @@ public class MMatchPO extends X_M_MatchPO
if (mpi[i].getC_InvoiceLine_ID() != 0 &&
mpi[i].getM_AttributeSetInstance_ID() == getM_AttributeSetInstance_ID())
{
setC_InvoiceLine_ID(mpi[i].getC_InvoiceLine_ID());
break;
if (mpi[i].getQty().compareTo(getQty()) == 0) // same quantity
{
setC_InvoiceLine_ID(mpi[i].getC_InvoiceLine_ID());
break;
}
else // create MatchPO record for PO-Invoice if different quantity
{
MInvoiceLine il = new MInvoiceLine(getCtx(), mpi[i].getC_InvoiceLine_ID(), get_TrxName());
MMatchPO match = new MMatchPO(il, getDateTrx(), mpi[i].getQty());
match.setC_OrderLine_ID(getC_OrderLine_ID());
if (!match.save())
{
String msg = "Failed to create match po";
ValueNamePair error = CLogger.retrieveError();
if (error != null)
msg = msg + " " + error.getName();
throw new RuntimeException(msg);
}
}
}
}
}