diff --git a/base/src/org/compiere/model/MAdvertisement.java b/base/src/org/compiere/model/MAdvertisement.java index 106e285039..67ba1edaec 100644 --- a/base/src/org/compiere/model/MAdvertisement.java +++ b/base/src/org/compiere/model/MAdvertisement.java @@ -155,7 +155,7 @@ public class MAdvertisement extends X_W_Advertisement if (m_SalesRep_ID == 0) m_SalesRep_ID = DB.getSQLValue(null, "SELECT AD_User_ID FROM AD_User " - + "WHERE C_BPartner_ID=? AND IsActive='Y' ORDER BY 1", getC_BPartner_ID()); + + "WHERE C_BPartner_ID=? AND IsActive='Y' ORDER BY AD_User_ID", getC_BPartner_ID()); } return m_SalesRep_ID; } // getSalesRep_ID diff --git a/base/src/org/compiere/model/MLanguage.java b/base/src/org/compiere/model/MLanguage.java index b16cc6de49..5904b5a4d0 100644 --- a/base/src/org/compiere/model/MLanguage.java +++ b/base/src/org/compiere/model/MLanguage.java @@ -330,7 +330,7 @@ public class MLanguage extends X_AD_Language */ public int maintain (boolean add) { - String sql = "SELECT TableName FROM AD_Table WHERE TableName LIKE '%_Trl' ORDER BY 1"; + String sql = "SELECT TableName FROM AD_Table WHERE TableName LIKE '%_Trl' ORDER BY TableName"; PreparedStatement pstmt = null; ResultSet rs = null; int retNo = 0; @@ -384,7 +384,7 @@ public class MLanguage extends X_AD_Language + " INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) " + "WHERE t.TableName=?" + " AND c.IsTranslated='Y' AND c.IsActive='Y' " - + "ORDER BY 1"; + + "ORDER BY c.ColumnName"; ArrayList columns = new ArrayList(5); PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/base/src/org/compiere/model/MRoleTest.java b/base/src/org/compiere/model/MRoleTest.java index f0b6a14941..21cd21833a 100644 --- a/base/src/org/compiere/model/MRoleTest.java +++ b/base/src/org/compiere/model/MRoleTest.java @@ -72,11 +72,11 @@ public class MRoleTest extends TestCase // add test code here String sql = m_role.addAccessSQL( "SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS " - + "(SELECT AD_Column c WHERE c.a=c.b) ORDER BY 1", + + "(SELECT AD_Column c WHERE c.a=c.b) ORDER BY r.a", "r", MRole.SQL_FULLYQUALIFIED, MRole.SQL_RO); System.out.println(sql); - assertEquals(sql, "SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS (SELECT AD_Column c WHERE c.a=c.b) AND r.AD_Client_ID=0 AND r.AD_Org_ID=0 ORDER BY 1"); + assertEquals(sql, "SELECT r.a,r.b,r.c FROM AD_Role r WHERE EXISTS (SELECT AD_Column c WHERE c.a=c.b) AND r.AD_Client_ID=0 AND r.AD_Org_ID=0 ORDER BY r.a"); } diff --git a/base/src/org/compiere/model/PO.java b/base/src/org/compiere/model/PO.java index ac8240d183..1e75858fee 100644 --- a/base/src/org/compiere/model/PO.java +++ b/base/src/org/compiere/model/PO.java @@ -3233,7 +3233,7 @@ public abstract class PO s_acctColumns = new ArrayList(); String sql = "SELECT c.ColumnName " + "FROM AD_Column c INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) " - + "WHERE t.TableName=? AND c.IsActive='Y' AND c.AD_Reference_ID=25 ORDER BY 1"; + + "WHERE t.TableName=? AND c.IsActive='Y' AND c.AD_Reference_ID=25 ORDER BY c.ColumnName"; PreparedStatement pstmt = null; ResultSet rs = null; try diff --git a/base/src/org/compiere/model/PO_Record.java b/base/src/org/compiere/model/PO_Record.java index fcbb74413e..4c8fdf1843 100644 --- a/base/src/org/compiere/model/PO_Record.java +++ b/base/src/org/compiere/model/PO_Record.java @@ -177,7 +177,7 @@ public class PO_Record */ static void validate () { - String sql = "SELECT AD_Table_ID, TableName FROM AD_Table WHERE IsView='N' ORDER BY 2"; + String sql = "SELECT AD_Table_ID, TableName FROM AD_Table WHERE IsView='N' ORDER BY TableName"; PreparedStatement pstmt = null; ResultSet rs = null; try diff --git a/base/src/org/compiere/print/PrintFormatUtil.java b/base/src/org/compiere/print/PrintFormatUtil.java index f292bf28ed..146a851edd 100644 --- a/base/src/org/compiere/print/PrintFormatUtil.java +++ b/base/src/org/compiere/print/PrintFormatUtil.java @@ -108,7 +108,7 @@ public class PrintFormatUtil + " AND pfi.AD_Column_ID=c.AD_Column_ID" + " AND pfi.AD_PrintFormat_ID=?)" // 1 + " AND c.AD_Table_ID=? " // 2 - + "ORDER BY 1"; + + "ORDER BY c.AD_Column_ID"; PreparedStatement pstmt = null; ResultSet rs = null; int counter = 0; diff --git a/client/src/org/compiere/install/TranslationDialog.java b/client/src/org/compiere/install/TranslationDialog.java index c55f559df5..8458702191 100644 --- a/client/src/org/compiere/install/TranslationDialog.java +++ b/client/src/org/compiere/install/TranslationDialog.java @@ -136,7 +136,7 @@ public class TranslationDialog extends CPanel String sql = "SELECT Name, AD_Client_ID " + "FROM AD_Client " + "WHERE IsActive='Y' " - + "ORDER BY 2"; + + "ORDER BY AD_Client_ID"; try { PreparedStatement pstmt = DB.prepareStatement(sql, null); @@ -158,7 +158,7 @@ public class TranslationDialog extends CPanel sql = "SELECT Name, AD_Language " + "FROM AD_Language " + "WHERE IsActive='Y' AND (IsSystemLanguage='Y' OR IsBaseLanguage='Y')" - + "ORDER BY 1"; + + "ORDER BY Name"; try { PreparedStatement pstmt = DB.prepareStatement(sql, null); @@ -181,7 +181,7 @@ public class TranslationDialog extends CPanel sql = "SELECT Name, TableName " + "FROM AD_Table " + "WHERE TableName LIKE '%_Trl' AND TableName<>'AD_Column_Trl' " - + "ORDER BY 1"; + + "ORDER BY Name"; try { PreparedStatement pstmt = DB.prepareStatement(sql, null);