details: https://code.openbravo.com/erp/devel/pi/rev/8bac1304f99c
changeset: 15943:8bac1304f99c
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Thu Mar 29 14:24:33 2012 +0200
summary: Fixes issue 20152.
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
| 12 ++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diffs (99 lines):
diff -r b42654f43606 -r 8bac1304f99c
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Thu Mar 29 14:06:07 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Thu Mar 29 14:24:33 2012 +0200
@@ -99,6 +99,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
"@APRM_FinancialAccountNotInNaturalTree@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
Set<String> invoiceDocNos = new TreeSet<String>();
@@ -122,6 +123,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@APRM_PaymentNoLines@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
for (FIN_PaymentDetail paymentDetail : paymentDetails) {
@@ -260,6 +262,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@NoExecutionProcessFound@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
} catch (final Exception e) {
e.printStackTrace(System.err);
@@ -267,6 +270,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@IssueOnExecutionProcess@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
} else {
@@ -350,6 +354,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
"@PostedDocument@"
+ ": " + payment.getDocumentNo()));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
// Transaction exists
@@ -359,6 +364,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
"@APRM_TransactionExists@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
// Payment with generated credit already used on other payments.
@@ -369,6 +375,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
"@APRM_PaymentGeneratedCreditIsUsed@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
@@ -556,6 +563,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@PostedDocument@" + ": " + payment.getDocumentNo()));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
// Transaction exists
@@ -565,6 +573,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@APRM_TransactionExists@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
// Payment with generated credit already used on other payments.
@@ -575,6 +584,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@APRM_PaymentGeneratedCreditIsUsed@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
// Payment not in Awaiting Execution
@@ -584,6 +594,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars,
language,
"@APRM_PaymentNotRPAE_NotVoid@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
@@ -689,6 +700,7 @@
msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
"@CouldNotUpdateOriginalPaymentPlan@"));
bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
return;
}
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
