midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DEMPIERE-3292 

MBankStatementLoader:
Added lookup for C_BankAccount_ID and C_Currency_ID
This commit is contained in:
markus_bozem 2017-02-03 13:42:13 +01:00
parent e52e1ff87f
commit fef5b774b5
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java
View File

@ -17,11 +17,15 @@
package org.compiere.model; package org.compiere.model;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.HashMap;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.base.Core; import org.adempiere.base.Core;
import org.compiere.impexp.BankStatementLoaderInterface; import org.compiere.impexp.BankStatementLoaderInterface;
import org.compiere.util.Env;
import org.compiere.util.Util;
/** /**
@ -72,7 +76,11 @@ import org.compiere.impexp.BankStatementLoaderInterface;
/** File name from process parameter */ /** File name from process parameter */
private String localFileName = null; private String localFileName = null;
/** List of own bank accounts to lookup id */
private List<X_C_BankAccount> bankAccountList;
/** Map of currency ISO-Codes to lookup id */
private HashMap<String,Integer> currencyMap;
/** /**
* Create a Statement Loader * Create a Statement Loader
@ -168,6 +176,19 @@ import org.compiere.impexp.BankStatementLoaderInterface;
errorMessage = "ClassNotLoaded"; errorMessage = "ClassNotLoaded";
return result; return result;
} }
// Initialize lookup lists
MTable table = MTable.get(Env.getCtx(), X_C_BankAccount.Table_ID);
Query query = table.createQuery("IsActive='Y'", null);
bankAccountList = query.list();
table = MTable.get(Env.getCtx(), X_C_Currency.Table_ID);
query = table.createQuery("IsActive='Y'", null);
List<X_C_Currency> currencyList = query.list();
currencyMap = new HashMap<String,Integer>() ;
for (X_C_Currency currency : currencyList) {
currencyMap.put(currency.getISO_Code(), currency.get_ID()) ;
}
// Initialize the Loader // Initialize the Loader
if (!m_loader.init(this)) if (!m_loader.init(this))
{ {
@ -263,6 +284,23 @@ import org.compiere.impexp.BankStatementLoaderInterface;
imp.setChargeName(m_loader.getChargeName()); imp.setChargeName(m_loader.getChargeName());
if (log.isLoggable(Level.CONFIG))log.config( "MBankStatementLoader.importLine Charge Amount=" + m_loader.getChargeAmt()); if (log.isLoggable(Level.CONFIG))log.config( "MBankStatementLoader.importLine Charge Amount=" + m_loader.getChargeAmt());
imp.setChargeAmt(m_loader.getChargeAmt()); imp.setChargeAmt(m_loader.getChargeAmt());
// Lookup Bank Account
for (X_C_BankAccount bankAccount : bankAccountList) {
if ((!Util.isEmpty(imp.getIBAN()) && imp.getIBAN().equalsIgnoreCase(bankAccount.getIBAN()))
|| (!Util.isEmpty(imp.getBankAccountNo()) && !Util.isEmpty(imp.getRoutingNo())
&& imp.getBankAccountNo().equalsIgnoreCase(bankAccount.getAccountNo())
&& imp.getRoutingNo().equalsIgnoreCase(bankAccount.getC_Bank().getRoutingNo()))) {
imp.setC_BankAccount_ID(bankAccount.get_ID());
break;
}
}
// Lookup Currency
if (!Util.isEmpty(imp.getEftCurrency())) {
imp.setC_Currency_ID(currencyMap.get(imp.getEftCurrency()));
}
imp.setProcessed(false); imp.setProcessed(false);
imp.setI_IsImported(false); imp.setI_IsImported(false);