details: https://code.openbravo.com/erp/devel/pi/rev/0d35521fc856
changeset: 16779:0d35521fc856
user: Egoitz Castillo <egoitz.castillo <at> openbravo.com>
date: Thu Jun 07 17:24:07 2012 +0200
summary: Related to issue 20551. Improve the for onload and getSnashot
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 16 +++++----
1 files changed, 9 insertions(+), 7 deletions(-)
diffs (49 lines):
diff -r 2a2e526a1da5 -r 0d35521fc856
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
Thu Jun 07 17:17:34 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Thu Jun 07 17:24:07 2012 +0200
@@ -468,6 +468,11 @@
FieldProvider[] data =
FieldProviderFactory.getFieldProviderArray(bankLines);
OBContext.setAdminMode();
+ final String MATCHED_AGAINST_TRANSACTION =
FIN_Utility.messageBD("APRM_Transaction");
+ final String MATCHED_AGAINST_PAYMENT =
FIN_Utility.messageBD("APRM_Payment");
+ final String MATCHED_AGAINST_INVOICE =
FIN_Utility.messageBD("APRM_Invoice");
+ final String MATCHED_AGAINST_ORDER = FIN_Utility.messageBD("APRM_Order");
+ final String MATCHED_AGAINST_CREDIT = FIN_Utility.messageBD("APRM_Credit");
try {
List<FIN_FinaccTransaction> excluded = new
ArrayList<FIN_FinaccTransaction>();
for (int i = 0; i < data.length; i++) {
@@ -547,11 +552,6 @@
FieldProviderFactory.setField(data[i], "matchingType", matchingType);
if (transaction != null) {
- final String MATCHED_AGAINST_TRANSACTION =
FIN_Utility.messageBD("APRM_Transaction");
- final String MATCHED_AGAINST_PAYMENT =
FIN_Utility.messageBD("APRM_Payment");
- final String MATCHED_AGAINST_INVOICE =
FIN_Utility.messageBD("APRM_Invoice");
- final String MATCHED_AGAINST_ORDER =
FIN_Utility.messageBD("APRM_Order");
- final String MATCHED_AGAINST_CREDIT =
FIN_Utility.messageBD("APRM_Credit");
FieldProviderFactory.setField(data[i], "disabled", "N");
// Auto Matching or already matched
FieldProviderFactory.setField(data[i], "checked",
@@ -654,8 +654,9 @@
.getFINReconciliationLineTempList();
for (FIN_ReconciliationLineTemp oldtempLine : oldTempLines) {
OBDal.getInstance().remove(oldtempLine);
- OBDal.getInstance().flush();
}
+ oldTempLines.clear();
+ OBDal.getInstance().flush();
// Now copy info taken from the reconciliation when first opened
List<FIN_ReconciliationLine_v> reconciledlines = reconciliation
.getFINReconciliationLineVList();
@@ -700,8 +701,9 @@
.setMatched(reconciledLine.getBankStatementLine().getFinancialAccountTransaction()
!= null);
lineTemp.setMatchlevel(reconciledLine.getBankStatementLine().getMatchingtype());
OBDal.getInstance().save(lineTemp);
- OBDal.getInstance().flush();
}
+ OBDal.getInstance().flush();
+ OBDal.getInstance().getSession().clear();
} finally {
OBContext.restorePreviousMode();
}
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
