diff --git a/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Csv.java b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Csv.java
new file mode 100644
index 0000000..c1cdecc
--- /dev/null
+++ b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Csv.java
@@ -0,0 +1,222 @@
+/*************************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution *
+ * Copyright (C) 2012-2018 E.R.P. Consultores y Asociados, C.A. *
+ * Contributor(s): Yamel Senih ysenih@erpya.com *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see . *
+ ************************************************************************************/
+package org.erpya.lve.bank.imp;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+import org.compiere.util.Env;
+import org.compiere.util.Util;
+import org.spin.util.impexp.BankTransactionAbstract;
+
+/**
+ * Custom format for Tesoro Bank Transaction
+ * Comma Separed Value
+ * @author Yamel Senih, ysenih@erpya.com , http://www.erpya.com
+ * FR [ 1701 ] Add support to MT940 format
+ * @see https://github.com/adempiere/adempiere/issues/1701
+ */
+public class Tesoro_Csv extends BankTransactionAbstract {
+ /** Value Date [dddMMyyyy] */
+ private static final String LINE_TRANSACTION_Date = "TrxDate";
+ /** Transaction type Transaction type (description) */
+ private static final String LINE_TRANSACTION_Type = "Type";
+ /** Memo of transaction */
+ private static final String LINE_TRANSACTION_Memo = "Memo";
+ /** Concept of transaction */
+ private static final String LINE_TRANSACTION_Concept = "Concept";
+ /** Sequence number [35x] Sequential number of transaction on account */
+ private static final String LINE_TRANSACTION_ReferenceNo = "ReferenceNo";
+ /** Amount */
+ private static final String LINE_TRANSACTION_Amount = "Amount";
+ /** Start Column Index */
+ private static final String SEPARATOR = ",";
+ /** Is a transaction */
+ private boolean isTransaction = false;
+ /** Maximum columns */
+ private final int COLUMN_SIZE = 7;
+ /** Date Column */
+ private final int COLUMN_DATE = 1;
+ /** Reference Column */
+ private final int COLUMN_REFERENCE = 2;
+ /** Type Column */
+ private final int COLUMN_TYPE = 3;
+ /** Concept Column */
+ private final int COLUMN_CONCEPT = 4;
+ /** Debit Column */
+ private final int COLUMN_DEBIT = 5;
+ /** Credit Column */
+ private final int COLUMN_CREDIT = 6;
+
+
+ private boolean isValidLine(String[] columns) {
+ if(columns == null
+ || columns.length != COLUMN_SIZE) {
+ return false;
+ }
+ try {
+ Integer.parseInt(columns[0]);
+ } catch (Exception e) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Parse Line
+ * @param line
+ */
+ public void parseLine(String line) throws Exception {
+ if(Util.isEmpty(line)) {
+ return;
+ }
+ // Validate
+ line = processValue(line);
+ if(Util.isEmpty(line)) {
+ return;
+ }
+ // Replace bad characters
+ line = line.replaceAll("\"", "");
+ String[] columns = line.split(SEPARATOR);
+ if(!isValidLine(columns)) {
+ isTransaction = false;
+ return;
+ }
+ //
+ addValue(LINE_TRANSACTION_Date, getDate("dd/MM/yy", columns[COLUMN_DATE]));
+ String transactionType = columns[COLUMN_TYPE].replaceAll(",", "").trim();
+ addValue(LINE_TRANSACTION_Type, transactionType);
+ addValue(LINE_TRANSACTION_ReferenceNo, getNumber('.', "#,###,###,###,###,###.##", columns[COLUMN_REFERENCE].replaceAll(",", "").trim()));
+ addValue(LINE_TRANSACTION_Memo, columns[COLUMN_CONCEPT].replaceAll(",", "").trim());
+ BigDecimal debit = getNumber('.', "#,###,###,###,###,###.##", columns[COLUMN_DEBIT].trim());
+ if(debit != null
+ && debit.compareTo(Env.ZERO) > 0) {
+ addValue(LINE_TRANSACTION_Amount, debit.negate());
+ addValue(LINE_TRANSACTION_Type, transactionType);
+ }
+ BigDecimal credit = getNumber('.', "#,###,###,###,###,###.##", columns[COLUMN_CREDIT].trim());
+ if(credit != null
+ && credit.compareTo(Env.ZERO) > 0) {
+ addValue(LINE_TRANSACTION_Amount, credit);
+ addValue(LINE_TRANSACTION_Type, transactionType);
+ }
+ // fine
+ isTransaction = true;
+ }
+
+ /**
+ * Get Bank Transaction Date
+ * @return
+ */
+ public Timestamp getTrxDate() {
+ return getDate(LINE_TRANSACTION_Date);
+ }
+
+ /**
+ * Get Amount of transaction
+ * @return
+ */
+ public BigDecimal getAmount() {
+ return getNumber(LINE_TRANSACTION_Amount);
+ }
+
+ /**
+ * Get Payee Account
+ * @return
+ */
+ public String getPayeeAccountNo() {
+ return null;
+ }
+
+ /**
+ * Get Memo of Transaction
+ * @return
+ */
+ public String getMemo() {
+ return getString(LINE_TRANSACTION_Memo);
+ }
+
+ /**
+ * Get Category
+ * @return
+ */
+ public String getTrxType() {
+ return getString(LINE_TRANSACTION_Type);
+ }
+
+ /**
+ * Get Check Numbers
+ * @return
+ */
+ public String getCheckNo() {
+ return getString(LINE_TRANSACTION_ReferenceNo);
+ }
+
+ /**
+ * Process or change value for import
+ * you can implement it method for replace special characters
+ * @param value
+ * @return
+ */
+ protected String processValue(String value) {
+ return value;
+ }
+
+ @Override
+ public boolean isEndTransactionLine(String line) {
+ return true;
+ }
+
+ @Override
+ public boolean isCompleteData() {
+ return isTransaction;
+ }
+
+ @Override
+ public String getCurrency() {
+ return null;
+ }
+
+ @Override
+ public Timestamp getValueDate() {
+ return getDate(LINE_TRANSACTION_Date);
+ }
+
+ @Override
+ public Timestamp getStatementDate() {
+ return getDate(LINE_TRANSACTION_Date);
+ }
+
+ @Override
+ public String getReferenceNo() {
+ return getString(LINE_TRANSACTION_ReferenceNo);
+ }
+
+ @Override
+ public String getTrxCode() {
+ return null;
+ }
+
+ @Override
+ public String getPayeeName() {
+ return null;
+ }
+
+ @Override
+ public String getPayeeDescription() {
+ return getString(LINE_TRANSACTION_Concept);
+ }
+}
diff --git a/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Loader_Csv.java b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Loader_Csv.java
new file mode 100644
index 0000000..1a72243
--- /dev/null
+++ b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Loader_Csv.java
@@ -0,0 +1,32 @@
+/*************************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution *
+ * Copyright (C) 2012-2018 E.R.P. Consultores y Asociados, C.A. *
+ * Contributor(s): Yamel Senih ysenih@erpya.com *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see . *
+ ************************************************************************************/
+package org.erpya.lve.bank.imp;
+
+import org.spin.util.impexp.BankStatementHandler;
+import org.spin.util.impexp.BankTransactionAbstract;
+
+/**
+ * File of Tesoro Bank support
+ * @author Yamel Senih, ysenih@erpya.com , http://www.erpya.com
+ * FR [ 1701 ] Add support to MT940 format
+ * @see https://github.com/adempiere/adempiere/issues/1701
+ */
+public final class Tesoro_Loader_Csv extends BankStatementHandler {
+ @Override
+ protected BankTransactionAbstract getBankTransactionInstance() {
+ return new Tesoro_Csv();
+ }
+}
diff --git a/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Loader_Tsv.java b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Loader_Tsv.java
new file mode 100644
index 0000000..b77fc4c
--- /dev/null
+++ b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Loader_Tsv.java
@@ -0,0 +1,32 @@
+/*************************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution *
+ * Copyright (C) 2012-2018 E.R.P. Consultores y Asociados, C.A. *
+ * Contributor(s): Yamel Senih ysenih@erpya.com *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see . *
+ ************************************************************************************/
+package org.erpya.lve.bank.imp;
+
+import org.spin.util.impexp.BankStatementHandler;
+import org.spin.util.impexp.BankTransactionAbstract;
+
+/**
+ * File of Tesoro Bank support
+ * @author Yamel Senih, ysenih@erpya.com , http://www.erpya.com
+ * FR [ 1701 ] Add support to MT940 format
+ * @see https://github.com/adempiere/adempiere/issues/1701
+ */
+public final class Tesoro_Loader_Tsv extends BankStatementHandler {
+ @Override
+ protected BankTransactionAbstract getBankTransactionInstance() {
+ return new Tesoro_Tsv();
+ }
+}
diff --git a/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Tsv.java b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Tsv.java
new file mode 100644
index 0000000..02f911c
--- /dev/null
+++ b/financial/src/main/java/base/org/erpya/lve/bank/imp/Tesoro_Tsv.java
@@ -0,0 +1,222 @@
+/*************************************************************************************
+ * Product: Adempiere ERP & CRM Smart Business Solution *
+ * Copyright (C) 2012-2018 E.R.P. Consultores y Asociados, C.A. *
+ * Contributor(s): Yamel Senih ysenih@erpya.com *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or *
+ * (at your option) any later version. *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see . *
+ ************************************************************************************/
+package org.erpya.lve.bank.imp;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+import org.compiere.util.Env;
+import org.compiere.util.Util;
+import org.spin.util.impexp.BankTransactionAbstract;
+
+/**
+ * Custom format for Tesoro Bank Transaction
+ * Tab Separed Value
+ * @author Yamel Senih, ysenih@erpya.com , http://www.erpya.com
+ * FR [ 1701 ] Add support to MT940 format
+ * @see https://github.com/adempiere/adempiere/issues/1701
+ */
+public class Tesoro_Tsv extends BankTransactionAbstract {
+ /** Value Date [dddMMyyyy] */
+ private static final String LINE_TRANSACTION_Date = "TrxDate";
+ /** Transaction type Transaction type (description) */
+ private static final String LINE_TRANSACTION_Type = "Type";
+ /** Memo of transaction */
+ private static final String LINE_TRANSACTION_Memo = "Memo";
+ /** Concept of transaction */
+ private static final String LINE_TRANSACTION_Concept = "Concept";
+ /** Sequence number [35x] Sequential number of transaction on account */
+ private static final String LINE_TRANSACTION_ReferenceNo = "ReferenceNo";
+ /** Amount */
+ private static final String LINE_TRANSACTION_Amount = "Amount";
+ /** Start Column Index */
+ private static final String SEPARATOR = "\\|";
+ /** Is a transaction */
+ private boolean isTransaction = false;
+ /** Maximum columns */
+ private final int COLUMN_SIZE = 7;
+ /** Date Column */
+ private final int COLUMN_DATE = 1;
+ /** Reference Column */
+ private final int COLUMN_REFERENCE = 2;
+ /** Type Column */
+ private final int COLUMN_TYPE = 3;
+ /** Concept Column */
+ private final int COLUMN_CONCEPT = 4;
+ /** Debit Column */
+ private final int COLUMN_DEBIT = 5;
+ /** Credit Column */
+ private final int COLUMN_CREDIT = 6;
+
+
+ private boolean isValidLine(String[] columns) {
+ if(columns == null
+ || columns.length != COLUMN_SIZE) {
+ return false;
+ }
+ try {
+ Integer.parseInt(columns[0]);
+ } catch (Exception e) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Parse Line
+ * @param line
+ */
+ public void parseLine(String line) throws Exception {
+ if(Util.isEmpty(line)) {
+ return;
+ }
+ // Validate
+ line = processValue(line);
+ if(Util.isEmpty(line)) {
+ return;
+ }
+ // Replace bad characters
+ line = line.replaceAll("\"", "");
+ String[] columns = line.split(SEPARATOR);
+ if(!isValidLine(columns)) {
+ isTransaction = false;
+ return;
+ }
+ //
+ addValue(LINE_TRANSACTION_Date, getDate("dd/MM/yy", columns[COLUMN_DATE]));
+ String transactionType = columns[COLUMN_TYPE].replaceAll(",", "").trim();
+ addValue(LINE_TRANSACTION_Type, transactionType);
+ addValue(LINE_TRANSACTION_ReferenceNo, getNumber('.', "#,###,###,###,###,###.##", columns[COLUMN_REFERENCE].replaceAll(",", "").trim()));
+ addValue(LINE_TRANSACTION_Memo, columns[COLUMN_CONCEPT].replaceAll(",", "").trim());
+ BigDecimal debit = getNumber('.', "#,###,###,###,###,###.##", columns[COLUMN_DEBIT].trim());
+ if(debit != null
+ && debit.compareTo(Env.ZERO) > 0) {
+ addValue(LINE_TRANSACTION_Amount, debit.negate());
+ addValue(LINE_TRANSACTION_Type, transactionType);
+ }
+ BigDecimal credit = getNumber('.', "#,###,###,###,###,###.##", columns[COLUMN_CREDIT].trim());
+ if(credit != null
+ && credit.compareTo(Env.ZERO) > 0) {
+ addValue(LINE_TRANSACTION_Amount, credit);
+ addValue(LINE_TRANSACTION_Type, transactionType);
+ }
+ // fine
+ isTransaction = true;
+ }
+
+ /**
+ * Get Bank Transaction Date
+ * @return
+ */
+ public Timestamp getTrxDate() {
+ return getDate(LINE_TRANSACTION_Date);
+ }
+
+ /**
+ * Get Amount of transaction
+ * @return
+ */
+ public BigDecimal getAmount() {
+ return getNumber(LINE_TRANSACTION_Amount);
+ }
+
+ /**
+ * Get Payee Account
+ * @return
+ */
+ public String getPayeeAccountNo() {
+ return null;
+ }
+
+ /**
+ * Get Memo of Transaction
+ * @return
+ */
+ public String getMemo() {
+ return getString(LINE_TRANSACTION_Memo);
+ }
+
+ /**
+ * Get Category
+ * @return
+ */
+ public String getTrxType() {
+ return getString(LINE_TRANSACTION_Type);
+ }
+
+ /**
+ * Get Check Numbers
+ * @return
+ */
+ public String getCheckNo() {
+ return getString(LINE_TRANSACTION_ReferenceNo);
+ }
+
+ /**
+ * Process or change value for import
+ * you can implement it method for replace special characters
+ * @param value
+ * @return
+ */
+ protected String processValue(String value) {
+ return value;
+ }
+
+ @Override
+ public boolean isEndTransactionLine(String line) {
+ return true;
+ }
+
+ @Override
+ public boolean isCompleteData() {
+ return isTransaction;
+ }
+
+ @Override
+ public String getCurrency() {
+ return null;
+ }
+
+ @Override
+ public Timestamp getValueDate() {
+ return getDate(LINE_TRANSACTION_Date);
+ }
+
+ @Override
+ public Timestamp getStatementDate() {
+ return getDate(LINE_TRANSACTION_Date);
+ }
+
+ @Override
+ public String getReferenceNo() {
+ return getString(LINE_TRANSACTION_ReferenceNo);
+ }
+
+ @Override
+ public String getTrxCode() {
+ return null;
+ }
+
+ @Override
+ public String getPayeeName() {
+ return null;
+ }
+
+ @Override
+ public String getPayeeDescription() {
+ return getString(LINE_TRANSACTION_Concept);
+ }
+}