details: https://code.openbravo.com/erp/devel/pi/rev/52784b6c4c5a
changeset: 13992:52784b6c4c5a
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Fri Oct 14 11:48:31 2011 +0200
summary: Removes unnecessary DalConnectionProvider and changes some formal
code
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
| 16 +++------
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 6 +--
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
| 2 +-
3 files changed, 9 insertions(+), 15 deletions(-)
diffs (91 lines):
diff -r 47fef1b036b7 -r 52784b6c4c5a
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
Fri Oct 14 11:17:48 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java
Fri Oct 14 11:48:31 2011 +0200
@@ -65,7 +65,6 @@
import org.openbravo.model.project.Project;
import org.openbravo.model.sales.SalesRegion;
import org.openbravo.scheduling.ProcessBundle;
-import org.openbravo.service.db.DalConnectionProvider;
import org.openbravo.xmlEngine.XmlDocument;
public class AddTransaction extends HttpSecureAppServlet {
@@ -166,9 +165,8 @@
: "PWNC", depositAmt, paymentAmt, null, null, null,
p.isReceipt() ? "BPD" : "BPW",
FIN_Utility.getDate(strTransactionDate), p
.getCurrency(), p.getFinancialTransactionConvertRate(),
p.getAmount());
- OBError processTransactionError = processTransaction(vars, new
DalConnectionProvider(),
- "P", finTrans);
- if (processTransactionError != null &&
processTransactionError.getType().equals("Error")) {
+ OBError processTransactionError = processTransaction(vars, this,
"P", finTrans);
+ if (processTransactionError != null &&
"Error".equals(processTransactionError.getType())) {
throw new OBException(processTransactionError.getMessage());
}
if (!"".equals(strFinBankStatementLineId)) {
@@ -219,9 +217,8 @@
glItemDepositAmt, glItemPaymentAmt, project, campaign, activity,
isReceipt ? "BPD"
: "BPW", FIN_Utility.getDate(strTransactionDate), null, null,
null,
businessPartner, product, salesRegion);
- OBError processTransactionError = processTransaction(vars, new
DalConnectionProvider(),
- "P", finTrans);
- if (processTransactionError != null &&
processTransactionError.getType().equals("Error")) {
+ OBError processTransactionError = processTransaction(vars, this, "P",
finTrans);
+ if (processTransactionError != null &&
"Error".equals(processTransactionError.getType())) {
throw new OBException(processTransactionError.getMessage());
}
strMessage = "1 " + "@RowsInserted@";
@@ -243,9 +240,8 @@
FIN_Utility.getDate(strTransactionDate), null, isReceipt ? "RDNC"
: "PWNC",
feeDepositAmt, feePaymentAmt, null, null, null, "BF",
FIN_Utility.getDate(strTransactionDate), null, null, null);
- OBError processTransactionError = processTransaction(vars, new
DalConnectionProvider(),
- "P", finTrans);
- if (processTransactionError != null &&
processTransactionError.getType().equals("Error")) {
+ OBError processTransactionError = processTransaction(vars, this, "P",
finTrans);
+ if (processTransactionError != null &&
"Error".equals(processTransactionError.getType())) {
throw new OBException(processTransactionError.getMessage());
}
strMessage = "1 " + "@RowsInserted@";
diff -r 47fef1b036b7 -r 52784b6c4c5a
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Fri Oct 14 11:17:48 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Fri Oct 14 11:48:31 2011 +0200
@@ -73,7 +73,6 @@
import org.openbravo.model.financialmgmt.payment.FIN_ReconciliationLine_v;
import org.openbravo.model.financialmgmt.payment.MatchingAlgorithm;
import org.openbravo.scheduling.ProcessBundle;
-import org.openbravo.service.db.DalConnectionProvider;
import org.openbravo.xmlEngine.XmlDocument;
public class MatchTransaction extends HttpSecureAppServlet {
@@ -918,10 +917,9 @@
OBDal.getInstance().save(payment);
OBDal.getInstance().flush();
try {
- ConnectionProvider conn = new DalConnectionProvider();
FIN_AddPayment.processPayment(new
VariablesSecureApp(OBContext.getOBContext().getUser()
.getId(), OBContext.getOBContext().getCurrentClient().getId(),
OBContext.getOBContext()
- .getCurrentOrganization().getId(),
OBContext.getOBContext().getRole().getId()), conn,
+ .getCurrentOrganization().getId(),
OBContext.getOBContext().getRole().getId()), this,
"P", payment);
} catch (Exception e) {
return null;
@@ -932,7 +930,7 @@
OBDal.getInstance().save(transaction);
OBDal.getInstance().flush();
try {
- processTransaction(new DalConnectionProvider(), "P", transaction);
+ processTransaction(this, "P", transaction);
} catch (Exception e) {
OBError newError = Utility.translateError(this, vars,
vars.getLanguage(),
FIN_Utility.getExceptionMessage(e));
diff -r 47fef1b036b7 -r 52784b6c4c5a
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
Fri Oct 14 11:17:48 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java
Fri Oct 14 11:48:31 2011 +0200
@@ -136,7 +136,7 @@
OBError processTransactionError = processTransaction(vars,
new DalConnectionProvider(), "P", transaction);
if (processTransactionError != null
- && processTransactionError.getType().equals("Error")) {
+ && "Error".equals(processTransactionError.getType())) {
return processTransactionError;
}
}
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
