details: /erp/devel/pi/rev/3ed0494bd0b0
changeset: 10543:3ed0494bd0b0
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Feb 10 19:58:22 2011 +0100
summary: Fixes issue 0015945: Add payment details grid filters by document
organization instead of organization tree
details: /erp/devel/pi/rev/6557fc09762b
changeset: 10544:6557fc09762b
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Feb 10 20:10:09 2011 +0100
summary: Fixes bug 0015948: WEAK matches are cleared even if they are not
flagged
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
| 2 +-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 8 ++-
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
| 19 ++++++++++
3 files changed, 25 insertions(+), 4 deletions(-)
diffs (71 lines):
diff -r 457864c109e2 -r 6557fc09762b
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 Feb 10 20:09:52 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java
Thu Feb 10 20:10:09 2011 +0100
@@ -480,7 +480,7 @@
matched = new FIN_MatchedTransaction(null,
FIN_MatchedTransaction.NOMATCH);
}
transaction = matched.getTransaction();
- if (transaction != null) {
+ if (transaction != null &&
FIN_MatchedTransaction.STRONG.equals(matched.getMatchLevel())) {
FIN_BankStatementLine bsl = FIN_BankStatementLines[i];
bsl.setFinancialAccountTransaction(transaction);
bsl.setMatchingtype(matched.getMatchLevel());
diff -r 457864c109e2 -r 6557fc09762b
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Thu Feb 10 20:09:52 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Thu Feb 10 20:10:09 2011 +0100
@@ -140,9 +140,10 @@
whereClause.append(" is null");
whereClause.append(" and psd.");
whereClause.append(FIN_PaymentSchedule.PROPERTY_ORGANIZATION);
- whereClause.append(".id = '");
- whereClause.append(organization.getId());
- whereClause.append("'");
+ whereClause.append(".id in (");
+ whereClause.append(FIN_Utility.getInStrSet(OBContext.getOBContext()
+
.getOrganizationStructureProvider().getNaturalTree(organization.getId())));
+ whereClause.append(")");
// remove selected payments
if (selectedScheduledPaymentDetails != null &&
selectedScheduledPaymentDetails.size() > 0) {
@@ -1192,4 +1193,5 @@
obcPayment.addOrderBy(FIN_Payment.PROPERTY_DOCUMENTNO, false);
return obcPayment.list();
}
+
}
diff -r 457864c109e2 -r 6557fc09762b
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
Thu Feb 10 20:09:52 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
Thu Feb 10 20:10:09 2011 +0100
@@ -28,6 +28,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.StringTokenizer;
import java.util.TimeZone;
@@ -241,6 +242,24 @@
}
/**
+ * Creates a comma separated string with the Id's of the Set of Strings.
+ *
+ * @param set
+ * Set of Strings
+ * @return Comma separated string of Id's
+ */
+ public static String getInStrSet(Set<String> set) {
+ StringBuilder strInList = new StringBuilder();
+ for (String string : set) {
+ if (strInList.length() == 0)
+ strInList.append("'" + string + "'");
+ else
+ strInList.append(", '" + string + "'");
+ }
+ return strInList.toString();
+ }
+
+ /**
* Returns the cause of a trigger exception (BatchupdateException).
*
* Hibernate and JDBC will wrap the exception thrown by the trigger in
another exception (the
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
