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

--Pritesh Shah 

JIRA ticket - IDEMPIERE-2887
Added Parenthesis in the OR condition between "i.I_IsImported<>'Y' OR i.I_IsImported IS NULL"
Also added client check in query to get the I_Payment
This commit is contained in:
Pritesh Shah 2015-10-16 13:55:12 +05:30
parent b331ea70bc
commit 15102da10d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.adempiere.base.process/src/org/compiere/process/ImportPayment.java
View File

@ -143,8 +143,8 @@ public class ImportPayment extends SvrProcess
.append(" OR b.SwiftCode=i.RoutingNo ")
.append(") ")
.append("WHERE i.C_BankAccount_ID IS NULL ")
.append("AND i.I_IsImported<>'Y' ")
.append("OR i.I_IsImported IS NULL").append(clientCheck);
.append("AND (i.I_IsImported<>'Y' ")
.append("OR i.I_IsImported IS NULL)").append(clientCheck);
no = DB.executeUpdate(sql.toString(), get_TrxName());
if (no != 0)
if (log.isLoggable(Level.INFO)) log.info("Bank Account (With Routing No)=" + no);
@ -160,8 +160,8 @@ public class ImportPayment extends SvrProcess
.append(" AND a.AD_Client_ID=i.AD_Client_ID ")
.append(") ")
.append("WHERE i.C_BankAccount_ID IS NULL ")
.append("AND i.I_isImported<>'Y' ")
.append("OR i.I_isImported IS NULL").append(clientCheck);
.append("AND (i.I_isImported<>'Y' ")
.append("OR i.I_isImported IS NULL)").append(clientCheck);
no = DB.executeUpdate(sql.toString(), get_TrxName());
if (no != 0)
if (log.isLoggable(Level.INFO)) log.info("Bank Account (Without Routing No)=" + no);
@ -171,8 +171,8 @@ public class ImportPayment extends SvrProcess
sql.append(" and a.AD_Client_ID=i.AD_Client_ID) ")
.append("WHERE i.C_BankAccount_ID IS NULL ")
.append("AND i.BankAccountNo IS NULL ")
.append("AND i.I_isImported<>'Y' ")
.append("OR i.I_isImported IS NULL").append(clientCheck);
.append("AND (i.I_isImported<>'Y' ")
.append("OR i.I_isImported IS NULL)").append(clientCheck);
no = DB.executeUpdate(sql.toString(), get_TrxName());
if (no != 0)
if (log.isLoggable(Level.INFO)) log.info("Bank Account=" + no);
@ -180,8 +180,8 @@ public class ImportPayment extends SvrProcess
sql = new StringBuilder("UPDATE I_Payment ")
.append("SET I_isImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Bank Account, ' ")
.append("WHERE C_BankAccount_ID IS NULL ")
.append("AND I_isImported<>'Y' ")
.append("OR I_isImported IS NULL").append(clientCheck);
.append("AND (I_isImported<>'Y' ")
.append("OR I_isImported IS NULL)").append(clientCheck);
no = DB.executeUpdate(sql.toString(), get_TrxName());
if (no != 0)
log.warning("Invalid Bank Account=" + no);
@ -408,7 +408,7 @@ public class ImportPayment extends SvrProcess
//Import Bank Statement
sql = new StringBuilder("SELECT * FROM I_Payment")
.append(" WHERE I_IsImported='N'")
.append(" WHERE I_IsImported='N'").append(clientCheck)
.append(" ORDER BY C_BankAccount_ID, CheckNo, DateTrx, R_AuthCode");
MBankAccount account = null;