From 79a3cd8c5286961d0dd884383963c977770ee42d Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 9 Feb 2021 20:11:00 +0100 Subject: [PATCH] IDEMPIERE-4698 Load/Import Bank Statement issues (#573) --- .../src/org/compiere/process/ImportBankStatement.java | 4 ++-- .../src/org/compiere/process/LoadBankStatement.java | 4 +++- .../src/org/compiere/model/MBankStatementLoader.java | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base.process/src/org/compiere/process/ImportBankStatement.java b/org.adempiere.base.process/src/org/compiere/process/ImportBankStatement.java index ab458cf325..c2b138b185 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ImportBankStatement.java +++ b/org.adempiere.base.process/src/org/compiere/process/ImportBankStatement.java @@ -101,8 +101,8 @@ public class ImportBankStatement extends SvrProcess // Set Client, Org, IsActive, Created/Updated sql = new StringBuilder ("UPDATE I_BankStatement ") - .append("SET AD_Client_ID = COALESCE (AD_Client_ID,").append (p_AD_Client_ID).append ("),") - .append(" AD_Org_ID = COALESCE (AD_Org_ID,").append (p_AD_Org_ID).append ("),"); + .append("SET AD_Client_ID = CASE WHEN COALESCE(AD_Client_ID,0) = 0 THEN ").append (p_AD_Client_ID).append (" ELSE AD_Client_ID END,") + .append(" AD_Org_ID = CASE WHEN COALESCE(AD_Org_ID,0) = 0 THEN ").append (p_AD_Org_ID).append (" ELSE AD_Org_ID END,"); sql.append(" IsActive = COALESCE (IsActive, 'Y'),") .append(" Created = COALESCE (Created, getDate()),") .append(" CreatedBy = COALESCE (CreatedBy, 0),") diff --git a/org.adempiere.base.process/src/org/compiere/process/LoadBankStatement.java b/org.adempiere.base.process/src/org/compiere/process/LoadBankStatement.java index 7ddcd7538f..01ab356379 100644 --- a/org.adempiere.base.process/src/org/compiere/process/LoadBankStatement.java +++ b/org.adempiere.base.process/src/org/compiere/process/LoadBankStatement.java @@ -102,8 +102,10 @@ public class LoadBankStatement extends SvrProcess log.log(Level.SEVERE, "Invalid Loader"); // Start loading bank statement lines - else if (!m_controller.loadLines()) + else if (!m_controller.loadLines()) { + message += m_controller.getErrorMessage() + " - " + m_controller.getErrorDescription(); log.log(Level.SEVERE, m_controller.getErrorMessage() + " - " + m_controller.getErrorDescription()); + } else { diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java index c66d00d7b5..0d2dcd6bbb 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java +++ b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java @@ -257,7 +257,6 @@ import org.compiere.util.Util; imp.setEftTrxID(m_loader.getTrxID()); if (log.isLoggable(Level.CONFIG))log.config( "MBankStatementLoader.importLine Statement Line Date=" + m_loader.getStatementLineDate()); imp.setStatementLineDate(m_loader.getStatementLineDate()); - imp.setStatementLineDate(m_loader.getStatementLineDate()); imp.setEftStatementLineDate(m_loader.getStatementLineDate()); if (log.isLoggable(Level.CONFIG))log.config( "MBankStatementLoader.importLine Valuta Date=" + m_loader.getValutaDate()); imp.setValutaDate(m_loader.getValutaDate());