IDEMPIERE-3860 Reversed MatchPO cannot be deleted

This commit is contained in:
Carlos Ruiz 2019-01-05 22:36:17 +01:00
parent 4e5174fb5f
commit a4130cd988
1 changed files with 26 additions and 4 deletions

View File

@ -53,10 +53,32 @@ public class MatchPODelete extends SvrProcess
protected String doIt() throws Exception protected String doIt() throws Exception
{ {
if (log.isLoggable(Level.INFO)) log.info ("M_MatchPO_ID=" + p_M_MatchPO_ID); if (log.isLoggable(Level.INFO)) log.info ("M_MatchPO_ID=" + p_M_MatchPO_ID);
String msg = "";
MMatchPO po = new MMatchPO (getCtx(), p_M_MatchPO_ID, get_TrxName()); MMatchPO po = new MMatchPO (getCtx(), p_M_MatchPO_ID, get_TrxName());
if (po.get_ID() == 0) if (po.get_ID() == 0)
throw new AdempiereUserError("@NotFound@ @M_MatchPO_ID@ " + p_M_MatchPO_ID); throw new AdempiereUserError("@NotFound@ @M_MatchPO_ID@ " + p_M_MatchPO_ID);
// int reversalId = po.getReversal_ID();
if (! deleteMatchPO(po)) {
return "@Error@";
}
msg += "@Deleted@";
if (reversalId > 0) {
MMatchPO porev = new MMatchPO (getCtx(), reversalId, get_TrxName());
if (porev.get_ID() == 0)
throw new AdempiereUserError("@NotFound@ @M_MatchPO_ID@ " + reversalId);
if (! deleteMatchPO(porev)) {
return "@Error@ @Reversal_ID@";
}
msg += " + @Deleted@ @Reversal_ID@";
}
return msg;
} // doIt
private boolean deleteMatchPO(MMatchPO po) {
MOrderLine orderLine = null; MOrderLine orderLine = null;
boolean isMatchReceipt = (po.getM_InOutLine_ID() != 0); boolean isMatchReceipt = (po.getM_InOutLine_ID() != 0);
if (isMatchReceipt) if (isMatchReceipt)
@ -72,10 +94,10 @@ public class MatchPODelete extends SvrProcess
if (!orderLine.save(get_TrxName())) if (!orderLine.save(get_TrxName()))
throw new AdempiereUserError("Delete MatchPO failed to restore PO's On Ordered Qty"); throw new AdempiereUserError("Delete MatchPO failed to restore PO's On Ordered Qty");
} }
return "@OK@"; return true;
} }
po.saveEx(); po.saveEx();
return "@Error@"; return false;
} // doIt }
} // MatchPODelete } // MatchPODelete