From 797af7b6b888c58f76df925fd5b958339878b800 Mon Sep 17 00:00:00 2001 From: uthadehikaru Date: Sat, 21 Apr 2012 15:44:59 -0500 Subject: [PATCH] exception handling processIt on MOrder --- .../src/org/compiere/model/MOrder.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index bb7026b5f1..2c60b41a20 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -30,6 +30,9 @@ import java.util.Vector; import java.util.logging.Level; import java.util.regex.Pattern; +import javax.mail.internet.AddressException; + +import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.BPartnerNoBillToAddressException; import org.adempiere.exceptions.BPartnerNoShipToAddressException; import org.adempiere.exceptions.FillMandatoryException; @@ -1895,8 +1898,10 @@ public class MOrder extends X_C_Order implements DocAction return null; } } - // Manually Process Shipment - shipment.processIt(DocAction.ACTION_Complete); + // added AdempiereException by Amir Sehan + if (!shipment.processIt(DocAction.ACTION_Complete)) + throw new AdempiereException("Failed Processing Document - " + shipment); + // end added shipment.saveEx(get_TrxName()); if (!DOCSTATUS_Completed.equals(shipment.getDocStatus())) { @@ -1996,8 +2001,10 @@ public class MOrder extends X_C_Order implements DocAction } } - // Manually Process Invoice - invoice.processIt(DocAction.ACTION_Complete); + // added AdempiereException by Amir Sehan + if (!invoice.processIt(DocAction.ACTION_Complete)) + throw new AdempiereException("Failed Processing Document - " + invoice); + // end added invoice.saveEx(get_TrxName()); setC_CashLine_ID(invoice.getC_CashLine_ID()); if (!DOCSTATUS_Completed.equals(invoice.getDocStatus())) @@ -2081,7 +2088,10 @@ public class MOrder extends X_C_Order implements DocAction if (counterDT.getDocAction() != null) { counter.setDocAction(counterDT.getDocAction()); - counter.processIt(counterDT.getDocAction()); + // added AdempiereException by Amir Sehan + if (!counter.processIt(counterDT.getDocAction())) + throw new AdempiereException("Failed Processing Document - " + counter); + // end added counter.saveEx(get_TrxName()); } }