0018752: FIN_AddPayment - savePayment method not managing properly exceptions

diff -r a0e5f516750c src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
--- a/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Oct 11 12:44:22 2011 +0200
+++ b/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Oct 11 16:08:51 2011 +0200
@@ -187,44 +187,41 @@
 
         if (strAction.equals("PRP") || strAction.equals("PPP") || strAction.equals("PRD")
             || strAction.equals("PPW")) {
-          try {
-            message = FIN_AddPayment.processPayment(vars, this,
-                (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", payment);
-            String strNewPaymentMessage = Utility.parseTranslation(this, vars, vars.getLanguage(),
-                "@PaymentCreated@" + " " + payment.getDocumentNo())
-                + ".";
-            message.setMessage(strNewPaymentMessage + " " + message.getMessage());
-            if (strDifferenceAction.equals("refund")) {
-              Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty();
-              FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment,
-                  refundAmount.negate());
-              OBError auxMessage = FIN_AddPayment.processPayment(vars, this, (strAction
-                  .equals("PRP") || strAction.equals("PPP")) ? "P" : "D", refundPayment);
-              if (newPayment) {
-                final String strNewRefundPaymentMessage = Utility.parseTranslation(this, vars, vars
-                    .getLanguage(), "@APRM_RefundPayment@" + ": " + refundPayment.getDocumentNo())
-                    + ".";
-                message.setMessage(strNewRefundPaymentMessage + " " + message.getMessage());
-                if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) != 0) {
-                  payment.setDescription(payment.getDescription() + strNewRefundPaymentMessage
-                      + "\n");
-                  OBDal.getInstance().save(payment);
-                  OBDal.getInstance().flush();
-                }
-              } else {
-                message = auxMessage;
+          message = FIN_AddPayment.processPayment(vars, this, (strAction.equals("PRP") || strAction
+              .equals("PPP")) ? "P" : "D", payment);
+          String strNewPaymentMessage = Utility.parseTranslation(this, vars, vars.getLanguage(),
+              "@PaymentCreated@" + " " + payment.getDocumentNo())
+              + ".";
+          message.setMessage(strNewPaymentMessage + " " + message.getMessage());
+          if (strDifferenceAction.equals("refund")) {
+            Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty();
+            FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment,
+                refundAmount.negate());
+            OBError auxMessage = FIN_AddPayment.processPayment(vars, this,
+                (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", refundPayment);
+            if (newPayment) {
+              final String strNewRefundPaymentMessage = Utility.parseTranslation(this, vars, vars
+                  .getLanguage(), "@APRM_RefundPayment@" + ": " + refundPayment.getDocumentNo())
+                  + ".";
+              message.setMessage(strNewRefundPaymentMessage + " " + message.getMessage());
+              if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) != 0) {
+                payment
+                    .setDescription(payment.getDescription() + strNewRefundPaymentMessage + "\n");
+                OBDal.getInstance().save(payment);
+                OBDal.getInstance().flush();
               }
-            }
-
-          } catch (Exception ex) {
-            message = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
-            log4j.error(ex);
-            if (!message.isConnectionAvailable()) {
-              bdErrorConnection(response);
-              return;
+            } else {
+              message = auxMessage;
             }
           }
         }
+      } catch (Exception ex) {
+        message = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
+        log4j.error(ex);
+        if (!message.isConnectionAvailable()) {
+          bdErrorConnection(response);
+          return;
+        }
 
       } finally {
         OBContext.restorePreviousMode();
diff -r a0e5f516750c src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
--- a/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Oct 11 12:44:22 2011 +0200
+++ b/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Oct 11 16:08:51 2011 +0200
@@ -122,7 +122,11 @@
     else {
       payment = dao.getNewPayment(isReceipt, organization, docType, strPaymentDocumentNo,
           businessPartner, paymentMethod, finAccount, strPaymentAmount, paymentDate, referenceNo);
+      try {
       OBDal.getInstance().flush();
+      } catch (Exception ex) {
+       throw new OBException(FIN_Utility.getExceptionMessage(ex));
+      }
     }
 
     for (FIN_PaymentDetail paymentDetail : payment.getFINPaymentDetailList())