From d9b22ee7eda0f69a2d53bd9d0e49dce8c0d0baec Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 3 Mar 2010 21:13:05 +0000 Subject: [PATCH] peer review for 11539 FR: [ 2214883 ] Remove SQL code and Replace for Query Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883 --- base/src/org/adempiere/process/InOutGenerateRMA.java | 2 +- base/src/org/compiere/model/MAccount.java | 6 ++---- base/src/org/compiere/model/MAccountLookup.java | 2 +- base/src/org/compiere/process/InvoiceNGL.java | 3 --- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/base/src/org/adempiere/process/InOutGenerateRMA.java b/base/src/org/adempiere/process/InOutGenerateRMA.java index 89ee0b41fc..bb686c2fa6 100644 --- a/base/src/org/adempiere/process/InOutGenerateRMA.java +++ b/base/src/org/adempiere/process/InOutGenerateRMA.java @@ -205,7 +205,7 @@ public class InOutGenerateRMA extends SvrProcess // // Link to corresponding Invoice Line (if any) - teo_sarca [ 2818523 ] // The MMatchInv records will be automatically generated on MInOut.completeIt() - final MInvoiceLine invoiceLine = new Query(shipment.getCtx(), I_C_InvoiceLine.Table_Name, + MInvoiceLine invoiceLine = new Query(shipment.getCtx(), I_C_InvoiceLine.Table_Name, I_C_InvoiceLine.COLUMNNAME_M_RMALine_ID+"=?", shipment.get_TrxName()) .setParameters(rmaLine.getM_RMALine_ID()) diff --git a/base/src/org/compiere/model/MAccount.java b/base/src/org/compiere/model/MAccount.java index 5204580ba0..173adc77ec 100644 --- a/base/src/org/compiere/model/MAccount.java +++ b/base/src/org/compiere/model/MAccount.java @@ -41,9 +41,7 @@ public class MAccount extends X_C_ValidCombination /** * */ - private static final long serialVersionUID = -8887316767838767993L; - - + private static final long serialVersionUID = -1936396369349550834L; /** * Get existing Account or create it @@ -243,7 +241,7 @@ public class MAccount extends X_C_ValidCombination public static MAccount get (Properties ctx, int C_AcctSchema_ID, String alias) { final String whereClause = "C_AcctSchema_ID=? AND Alias=?"; - MAccount retValue = new Query(ctx,I_C_ValidCombination.Table_Name,whereClause.toString(),null) + MAccount retValue = new Query(ctx,I_C_ValidCombination.Table_Name,whereClause,null) .setParameters(C_AcctSchema_ID,alias) .firstOnly(); return retValue; diff --git a/base/src/org/compiere/model/MAccountLookup.java b/base/src/org/compiere/model/MAccountLookup.java index 8d04c03d0f..af7169b88e 100644 --- a/base/src/org/compiere/model/MAccountLookup.java +++ b/base/src/org/compiere/model/MAccountLookup.java @@ -138,7 +138,7 @@ public final class MAccountLookup extends Lookup implements Serializable if (ID == C_ValidCombination_ID) // already loaded return true; - String whereClause = "C_ValidCombination_ID=?"; + final String whereClause = "C_ValidCombination_ID=?"; MAccount account = new Query(Env.getCtx(),I_C_ValidCombination.Table_Name,whereClause,null) .setParameters(ID) .firstOnly(); diff --git a/base/src/org/compiere/process/InvoiceNGL.java b/base/src/org/compiere/process/InvoiceNGL.java index c8dc64b95c..5002da56b9 100644 --- a/base/src/org/compiere/process/InvoiceNGL.java +++ b/base/src/org/compiere/process/InvoiceNGL.java @@ -17,10 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.List; import java.util.logging.Level;