details: https://code.openbravo.com/erp/devel/pi/rev/1ba52792abc2 changeset: 17971:1ba52792abc2 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Sep 14 13:17:34 2012 +0200 summary: Fixes issue 21588: FIN_BankStatementImport.finBPByName method needs correction.
details: https://code.openbravo.com/erp/devel/pi/rev/4e6bdb057dbd changeset: 17972:4e6bdb057dbd user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Sep 14 14:21:28 2012 +0200 summary: Fixes issue 21590: Standard matching algorithm not considering transaction date diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java | 8 +++++--- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diffs (51 lines): diff -r f7344c95ba24 -r 4e6bdb057dbd modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java Mon Sep 17 18:52:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingAlgorithm.java Fri Sep 14 14:21:28 2012 +0200 @@ -34,12 +34,14 @@ public FIN_MatchedTransaction match(FIN_BankStatementLine line, List<FIN_FinaccTransaction> excluded) throws ServletException { List<FIN_FinaccTransaction> transactions = MatchTransactionDao.getMatchingFinancialTransaction( - line.getBankStatement().getAccount().getId(), line.getReferenceNo(), - (line.getCramount().subtract(line.getDramount())), line.getBpartnername(), excluded); + line.getBankStatement().getAccount().getId(), line.getTransactionDate(), + line.getReferenceNo(), (line.getCramount().subtract(line.getDramount())), + line.getBpartnername(), excluded); if (!transactions.isEmpty()) return new FIN_MatchedTransaction(transactions.get(0), FIN_MatchedTransaction.STRONG); transactions = MatchTransactionDao.getMatchingFinancialTransaction(line.getBankStatement() - .getAccount().getId(), line.getCramount().subtract(line.getDramount()), excluded); + .getAccount().getId(), line.getTransactionDate(), + line.getCramount().subtract(line.getDramount()), excluded); if (!transactions.isEmpty()) return new FIN_MatchedTransaction(transactions.get(0), FIN_MatchedTransaction.WEAK); diff -r f7344c95ba24 -r 4e6bdb057dbd modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java Mon Sep 17 18:52:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java Fri Sep 14 14:21:28 2012 +0200 @@ -261,7 +261,7 @@ private BusinessPartner matchBusinessPartnerByName(String partnername, Organization organization, FIN_FinancialAccount account) { - if (partnername == null || "".equals(partnername)) { + if (partnername == null || "".equals(partnername.trim())) { return null; } final StringBuilder whereClause = new StringBuilder(); @@ -296,7 +296,7 @@ } private BusinessPartner finBPByName(String partnername, Organization organization) { - if (partnername == null || "".equals(partnername)) { + if (partnername == null || "".equals(partnername.trim())) { return null; } final StringBuilder whereClause = new StringBuilder(); @@ -329,7 +329,7 @@ private BusinessPartner matchBusinessPartnerByNameTokens(String partnername, Organization organization) { - if (partnername == null || "".equals(partnername)) { + if (partnername == null || "".equals(partnername.trim())) { return null; } StringTokenizer st = new StringTokenizer(partnername); ------------------------------------------------------------------------------ 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
