diff --git a/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java b/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java index 354f9f2909..deac453f5d 100644 --- a/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java +++ b/base/src/org/adempiere/pipo/handler/CommonTranslationHandler.java @@ -278,7 +278,8 @@ public class CommonTranslationHandler extends AbstractElementHandler implements ArrayList new_PIPO_Columns = new ArrayList(); String sql = "select * from ad_column where ad_table_id = " + "(select ad_table_id from ad_table where tableName = ?)" + - "and isTranslated='Y'"; + "and isTranslated='Y'" + +" ORDER BY AD_Column_ID"; PreparedStatement pstm = DB.prepareStatement(sql, null); try { diff --git a/base/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java b/base/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java index f55a73cf56..03a0860416 100644 --- a/base/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/ImpFormatElementHandler.java @@ -115,8 +115,8 @@ public class ImpFormatElementHandler extends AbstractElementHandler { atts = createImpFormatBinding(atts, m_ImpFormat); document.startElement("", "", "impformat", atts); - String sql = "SELECT * FROM AD_ImpFormat_Row WHERE AD_ImpFormat_ID= " - + import_id; + String sql = "SELECT * FROM AD_ImpFormat_Row WHERE AD_ImpFormat_ID= " + import_id + +" ORDER BY "+X_AD_ImpFormat_Row.COLUMNNAME_AD_ImpFormat_Row_ID; PreparedStatement pstmt = null; pstmt = DB.prepareStatement(sql, getTrxName(ctx)); diff --git a/base/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java b/base/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java index 5a9d8f5218..6d33bb93cc 100644 --- a/base/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/PrintFormatElementHandler.java @@ -214,7 +214,7 @@ public class PrintFormatElementHandler extends AbstractElementHandler { String sql2 = "SELECT * FROM AD_PrintFormatItem WHERE AD_PrintFormat_ID= " + m_Printformat.getAD_PrintFormat_ID() - + " ORDER BY "+X_AD_PrintFormatItem.COLUMNNAME_SeqNo; + + " ORDER BY "+X_AD_PrintFormatItem.COLUMNNAME_SeqNo+","+X_AD_PrintFormatItem.COLUMNNAME_AD_PrintFormatItem_ID; PreparedStatement pstmt2 = null; pstmt2 = DB.prepareStatement(sql2, getTrxName(ctx)); try { diff --git a/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java b/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java index f5b0fed498..43d3a3c579 100644 --- a/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java @@ -200,8 +200,8 @@ public class ProcessElementHandler extends AbstractElementHandler { createProcessBinding(atts, m_Process); document.startElement("", "", "process", atts); // processpara tags - String sqlP = "SELECT * FROM AD_PROCESS_PARA WHERE AD_PROCESS_ID = " - + AD_Process_ID; + String sqlP = "SELECT * FROM AD_PROCESS_PARA WHERE AD_PROCESS_ID = "+ AD_Process_ID + +" ORDER BY "+X_AD_Process_Para.COLUMNNAME_SeqNo+","+X_AD_Process_Para.COLUMNNAME_AD_Process_Para_ID; PreparedStatement pstmtP = null; pstmtP = DB.prepareStatement(sqlP, getTrxName(ctx)); try { diff --git a/base/src/org/adempiere/pipo/handler/ReferenceElementHandler.java b/base/src/org/adempiere/pipo/handler/ReferenceElementHandler.java index 9673e4f53a..f41a8153d8 100644 --- a/base/src/org/adempiere/pipo/handler/ReferenceElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/ReferenceElementHandler.java @@ -137,8 +137,8 @@ public class ReferenceElementHandler extends AbstractElementHandler { document.startElement("", "", "reference", atts); if (m_Reference.getValidationType().compareTo("L") == 0) { - String sql1 = "SELECT * FROM AD_Ref_List WHERE AD_Reference_ID= " - + Reference_id; + String sql1 = "SELECT * FROM AD_Ref_List WHERE AD_Reference_ID= " + Reference_id + + " ORDER BY Value, AD_Ref_List_ID"; PreparedStatement pstmt1 = null; pstmt1 = DB.prepareStatement(sql1, getTrxName(ctx)); diff --git a/base/src/org/adempiere/pipo/handler/ReportViewElementHandler.java b/base/src/org/adempiere/pipo/handler/ReportViewElementHandler.java index bc98c913a8..b2b2212920 100644 --- a/base/src/org/adempiere/pipo/handler/ReportViewElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/ReportViewElementHandler.java @@ -32,6 +32,7 @@ import org.adempiere.pipo.PackOut; import org.adempiere.pipo.exception.DatabaseAccessException; import org.adempiere.pipo.exception.POSaveFailedException; import org.compiere.model.MTable; +import org.compiere.model.X_AD_PrintFormat; import org.compiere.model.X_AD_ReportView; import org.compiere.model.X_AD_ReportView_Col; import org.compiere.util.DB; @@ -124,8 +125,7 @@ public class ReportViewElementHandler extends AbstractElementHandler { return; views.add(AD_ReportView_ID); - String sql = "SELECT * FROM AD_ReportView WHERE AD_ReportView_ID= " - + AD_ReportView_ID; + String sql = "SELECT * FROM AD_ReportView WHERE AD_ReportView_ID= " + AD_ReportView_ID; PreparedStatement pstmt = null; pstmt = DB.prepareStatement(sql, getTrxName(ctx)); AttributesImpl atts = new AttributesImpl(); @@ -139,7 +139,9 @@ public class ReportViewElementHandler extends AbstractElementHandler { document.endElement("", "", "reportview"); String sql1 = "SELECT * FROM AD_Printformat WHERE AD_Reportview_ID="+AD_ReportView_ID - +" AND AD_Client_ID="+Env.getAD_Client_ID(ctx); + +" AND AD_Client_ID="+Env.getAD_Client_ID(ctx) + +" ORDER BY "+X_AD_PrintFormat.COLUMNNAME_AD_PrintFormat_ID + ; PreparedStatement pstmt1 = null; pstmt1 = DB.prepareStatement(sql1, getTrxName(ctx)); try { diff --git a/base/src/org/adempiere/pipo/handler/TabElementHandler.java b/base/src/org/adempiere/pipo/handler/TabElementHandler.java index f6dd5e4574..61fd8771be 100644 --- a/base/src/org/adempiere/pipo/handler/TabElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/TabElementHandler.java @@ -186,8 +186,8 @@ public class TabElementHandler extends AbstractElementHandler { public void endElement(Properties ctx, Element element) throws SAXException { } - public void create(Properties ctx, TransformerHandler document) - throws SAXException { + public void create(Properties ctx, TransformerHandler document) throws SAXException + { PackOut packOut = (PackOut)ctx.get("PackOutProcess"); int AD_Tab_ID = Env.getContextAsInt(ctx, X_AD_Tab.COLUMNNAME_AD_Tab_ID); X_AD_Tab m_Tab = new X_AD_Tab (ctx, AD_Tab_ID, getTrxName(ctx)); @@ -196,7 +196,7 @@ public class TabElementHandler extends AbstractElementHandler { document.startElement("","","tab",atts); //Fields tags. String sql = "SELECT * FROM AD_FIELD WHERE AD_TAB_ID = " + AD_Tab_ID - + "ORDER BY SEQNO asc"; + + "ORDER BY SEQNO asc, "+X_AD_Field.COLUMNNAME_AD_Field_ID; PreparedStatement pstmt = null; pstmt = DB.prepareStatement (sql, getTrxName(ctx)); try { diff --git a/base/src/org/adempiere/pipo/handler/WindowElementHandler.java b/base/src/org/adempiere/pipo/handler/WindowElementHandler.java index 31f7edc12e..fff1a5855e 100644 --- a/base/src/org/adempiere/pipo/handler/WindowElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/WindowElementHandler.java @@ -153,7 +153,9 @@ public class WindowElementHandler extends AbstractElementHandler { document.startElement("", "", "window", atts); // Tab Tag String sql = "SELECT * FROM AD_TAB WHERE AD_WINDOW_ID = " - + AD_Window_ID; + + AD_Window_ID + +" ORDER BY "+X_AD_Tab.COLUMNNAME_SeqNo+","+X_AD_Tab.COLUMNNAME_AD_Tab_ID + ; PreparedStatement pstmt = null; pstmt = DB.prepareStatement(sql, getTrxName(ctx)); try { @@ -190,8 +192,8 @@ public class WindowElementHandler extends AbstractElementHandler { document.endElement("", "", "window"); // Preference Tag - sql = "SELECT * FROM AD_PREFERENCE WHERE AD_WINDOW_ID = " - + AD_Window_ID; + sql = "SELECT * FROM AD_PREFERENCE WHERE AD_WINDOW_ID = " + AD_Window_ID + +" ORDER BY "+X_AD_Preference.COLUMNNAME_AD_Preference_ID; pstmt = null; pstmt = DB.prepareStatement(sql, getTrxName(ctx)); try { diff --git a/base/src/org/adempiere/pipo/handler/WorkflowElementHandler.java b/base/src/org/adempiere/pipo/handler/WorkflowElementHandler.java index 434f77d69d..f3ba720c12 100644 --- a/base/src/org/adempiere/pipo/handler/WorkflowElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/WorkflowElementHandler.java @@ -238,7 +238,9 @@ public class WorkflowElementHandler extends AbstractElementHandler { createWorkflowBinding(atts, m_Workflow); document.startElement("", "", "workflow", atts); String sql1 = "SELECT AD_WF_Node_ID FROM AD_WF_Node WHERE AD_Workflow_ID = " - + AD_Workflow_ID; + + AD_Workflow_ID + + " ORDER BY "+X_AD_WF_Node.COLUMNNAME_AD_WF_Node_ID + ; PreparedStatement pstmt1 = null; ResultSet rs1 = null; @@ -254,7 +256,8 @@ public class WorkflowElementHandler extends AbstractElementHandler { ad_wf_nodenext_id = 0; - String sqlnn = "SELECT AD_WF_NodeNext_ID FROM AD_WF_NodeNext WHERE AD_WF_Node_ID = ?"; + String sqlnn = "SELECT AD_WF_NodeNext_ID FROM AD_WF_NodeNext WHERE AD_WF_Node_ID = ?" + + " ORDER BY "+X_AD_WF_NodeNext.COLUMNNAME_AD_WF_NodeNext_ID; PreparedStatement pstmtnn = null; ResultSet rsnn = null; try { @@ -268,7 +271,8 @@ public class WorkflowElementHandler extends AbstractElementHandler { ad_wf_nodenextcondition_id = 0; - String sqlnnc = "SELECT AD_WF_NextCondition_ID FROM AD_WF_NextCondition WHERE AD_WF_NodeNext_ID = ?"; + String sqlnnc = "SELECT AD_WF_NextCondition_ID FROM AD_WF_NextCondition WHERE AD_WF_NodeNext_ID = ?" + + " ORDER BY "+X_AD_WF_NextCondition.COLUMNNAME_AD_WF_NextCondition_ID; PreparedStatement pstmtnnc = null; ResultSet rsnnc = null; try {