details: https://code.openbravo.com/erp/devel/pi/rev/bb458216d9b1
changeset: 22793:bb458216d9b1
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Sun Mar 30 18:42:52 2014 +0530
summary: Related to Issue 26073: When a payment is processed, even if the
process fails, the ProcessBundle returns 'success'
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
| 22 +++++----
1 files changed, 13 insertions(+), 9 deletions(-)
diffs (39 lines):
diff -r 548bfa48bd30 -r bb458216d9b1
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
Sun Mar 30 18:36:39 2014 +0530
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
Sun Mar 30 18:42:52 2014 +0530
@@ -39,6 +39,7 @@
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.OBDateUtils;
import org.openbravo.erpCommon.utility.OBError;
import org.openbravo.erpCommon.utility.OBMessageUtils;
import org.openbravo.erpCommon.utility.Utility;
@@ -153,15 +154,18 @@
boolean orgLegalWithAccounting =
FIN_Utility.periodControlOpened(payment.TABLE_NAME,
payment.getId(), payment.TABLE_NAME + "_ID", "LE");
- /*
- * if (!FIN_Utility.isPeriodOpen(payment.getClient().getId(),
payment.getDocumentType()
- * .getDocumentCategory(), payment.getOrganization().getId(),
OBDateUtils
- * .formatDate(payment.getPaymentDate())) && orgLegalWithAccounting) {
msg.setType("Error");
- * msg.setTitle(Utility.messageBD(conProvider, "Error", language));
- * msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
- * "@PeriodNotAvailable@")); bundle.setResult(msg);
OBDal.getInstance().rollbackAndClose();
- * return; }
- */
+ if (!FIN_Utility.isPeriodOpen(payment.getClient().getId(),
payment.getDocumentType()
+ .getDocumentCategory(), payment.getOrganization().getId(),
OBDateUtils
+ .formatDate(payment.getPaymentDate()))
+ && orgLegalWithAccounting) {
+ msg.setType("Error");
+ msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+ msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
+ "@PeriodNotAvailable@"));
+ bundle.setResult(msg);
+ OBDal.getInstance().rollbackAndClose();
+ return;
+ }
Set<String> documentOrganizations = OBContext.getOBContext()
.getOrganizationStructureProvider(payment.getClient().getId())
.getNaturalTree(payment.getOrganization().getId());
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
