details: https://code.openbravo.com/erp/devel/pi/rev/6ce3115fb452
changeset: 28882:6ce3115fb452
user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com>
date: Wed Apr 13 10:50:18 2016 +0200
summary: Related to issue 32573: Code review improvements
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
| 18 ++-------
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
| 9 +++++
2 files changed, 14 insertions(+), 13 deletions(-)
diffs (66 lines):
diff -r 03f806e35c93 -r 6ce3115fb452
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Wed Apr 13 08:38:40 2016 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Wed Apr 13 10:50:18 2016 +0200
@@ -25,7 +25,6 @@
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.hibernate.criterion.Restrictions;
import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
import org.openbravo.advpaymentmngt.dao.TransactionsDao;
import org.openbravo.advpaymentmngt.exception.NoExecutionProcessFoundException;
@@ -35,7 +34,6 @@
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.client.kernel.RequestContext;
import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.utility.OBError;
@@ -196,13 +194,7 @@
if
(FIN_Utility.isAutomaticDepositWithdrawn(paymentRunPayment.getPayment())
&&
paymentRunPayment.getPayment().getAmount().compareTo(BigDecimal.ZERO) != 0
&&
!StringUtils.equals(internalParameters.get("comingFrom"), "TRANSACTION")) {
- OBCriteria<FIN_FinaccTransaction>
finAccTransactionCriteria = OBDal
-
.getInstance().createCriteria(FIN_FinaccTransaction.class);
- finAccTransactionCriteria.add(Restrictions.eq(
- FIN_FinaccTransaction.PROPERTY_FINPAYMENT, payment));
- finAccTransactionCriteria.setMaxResults(1);
- FIN_FinaccTransaction transaction =
(FIN_FinaccTransaction) finAccTransactionCriteria
- .uniqueResult();
+ FIN_FinaccTransaction transaction =
FIN_Utility.getFinAccTransaction(payment);
if (transaction == null) {
transaction =
TransactionsDao.createFinAccTransaction(paymentRunPayment
.getPayment());
@@ -334,10 +326,10 @@
private OBError processTransaction(VariablesSecureApp vars,
ConnectionProvider conn,
String strAction, FIN_FinaccTransaction transaction) throws Exception {
ProcessBundle pb = new ProcessBundle("F68F2890E96D4D85A1DEF0274D105BCE",
vars).init(conn);
- HashMap<String, Object> parameters = new HashMap<String, Object>();
- parameters.put("action", strAction);
- parameters.put("Fin_FinAcc_Transaction_ID", transaction.getId());
- pb.setParams(parameters);
+ HashMap<String, Object> params = new HashMap<String, Object>();
+ params.put("action", strAction);
+ params.put("Fin_FinAcc_Transaction_ID", transaction.getId());
+ pb.setParams(params);
OBError myMessage = null;
new FIN_TransactionProcess().execute(pb);
myMessage = (OBError) pb.getResult();
diff -r 03f806e35c93 -r 6ce3115fb452
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Wed Apr 13 08:38:40 2016 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Wed Apr 13 10:50:18 2016 +0200
@@ -1658,4 +1658,13 @@
}
}
}
+
+ public static FIN_FinaccTransaction getFinAccTransaction(FIN_Payment
payment) {
+ OBCriteria<FIN_FinaccTransaction> finAccTransactionCriteria =
OBDal.getInstance()
+ .createCriteria(FIN_FinaccTransaction.class);
+
finAccTransactionCriteria.add(Restrictions.eq(FIN_FinaccTransaction.PROPERTY_FINPAYMENT,
+ payment));
+ finAccTransactionCriteria.setMaxResults(1);
+ return (FIN_FinaccTransaction) finAccTransactionCriteria.uniqueResult();
+ }
}
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
