From f4f2cb9555b2fd894e91dfb77ddf39d8084a5147 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 11 Aug 2014 09:16:53 +0200 Subject: [PATCH] IDEMPIERE-462 Ticket #1001503: Credit Cards Online - fix credit card online processing - make forms safer - they can fail if AccountNo or IsDefault column is added to the bank --- org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java | 4 ++-- org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java index 579ea67100..544a6b43ec 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java @@ -109,10 +109,10 @@ public abstract class PaymentFormCash extends PaymentForm { * Load Bank Accounts */ String SQL = MRole.getDefault().addAccessSQL( - "SELECT C_BankAccount_ID, ba.Name || ' ' || AccountNo, IsDefault " + "SELECT C_BankAccount_ID, ba.Name || ' ' || ba.AccountNo, ba.IsDefault " + "FROM C_BankAccount ba" + " INNER JOIN C_Bank b ON (ba.C_Bank_ID=b.C_Bank_ID) " - + "WHERE b.IsActive='Y'", + + "WHERE b.IsActive='Y' AND ba.IsActive='Y'", "ba", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java index 8c6cdc0780..ae994ea303 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java @@ -85,10 +85,10 @@ public abstract class PaymentFormCheck extends PaymentForm { * Load Bank Accounts */ String SQL = MRole.getDefault().addAccessSQL( - "SELECT C_BankAccount_ID, ba.Name || ' ' || AccountNo, IsDefault " + "SELECT C_BankAccount_ID, ba.Name || ' ' || ba.AccountNo, ba.IsDefault " + "FROM C_BankAccount ba" + " INNER JOIN C_Bank b ON (ba.C_Bank_ID=b.C_Bank_ID) " - + "WHERE b.IsActive='Y'", + + "WHERE b.IsActive='Y' AND ba.IsActive='Y'", "ba", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); PreparedStatement pstmt = null; ResultSet rs = null;