Merge 180e26518e5f

migration/i1.0a-release/oracle/201302191525_IDEMPIERE-602.sql

@@ -0,0 +1,19 @@
+-- Feb 19, 2013 2:59:58 PM SGT
+-- IDEMPIERE-602 Remove Furniture/Fertilizer Internal Shipper from System
+DELETE FROM X_Shipper WHERE X_Shipper_ID=200000
+;
+
+-- Feb 19, 2013 3:00:01 PM SGT
+-- IDEMPIERE-602 Remove Furniture/Fertilizer Internal Shipper from System
+DELETE FROM X_Shipper WHERE X_Shipper_ID=200001
+;
+
+-- Feb 19, 2013 3:00:04 PM SGT
+-- IDEMPIERE-602 Remove Furniture/Fertilizer Internal Shipper from System
+DELETE FROM X_Shipper WHERE X_Shipper_ID=200002
+;
+
+UPDATE M_Shipper SET X_Shipper_ID = NULL WHERE X_Shipper_ID NOT IN (SELECT X_Shipper_ID FROM X_Shipper);
+
+SELECT register_migration_script('201302191525_IDEMPIERE-602.sql') FROM dual
+;

migration/i1.0a-release/postgresql/201302191525_IDEMPIERE-602.sql

@@ -0,0 +1,19 @@
+-- Feb 19, 2013 2:59:58 PM SGT
+-- IDEMPIERE-602 Remove Furniture/Fertilizer Internal Shipper from System
+DELETE FROM X_Shipper WHERE X_Shipper_ID=200000
+;
+
+-- Feb 19, 2013 3:00:01 PM SGT
+-- IDEMPIERE-602 Remove Furniture/Fertilizer Internal Shipper from System
+DELETE FROM X_Shipper WHERE X_Shipper_ID=200001
+;
+
+-- Feb 19, 2013 3:00:04 PM SGT
+-- IDEMPIERE-602 Remove Furniture/Fertilizer Internal Shipper from System
+DELETE FROM X_Shipper WHERE X_Shipper_ID=200002
+;
+
+UPDATE M_Shipper SET X_Shipper_ID = NULL WHERE X_Shipper_ID NOT IN (SELECT X_Shipper_ID FROM X_Shipper);
+
+SELECT register_migration_script('201302191525_IDEMPIERE-602.sql') FROM dual
+;

org.adempiere.base/src/org/compiere/model/I_AD_CtxHelp.java

@@ -67,36 +67,6 @@ public interface I_AD_CtxHelp
 	/** Get AD_CtxHelp_UU	  */
 	public String getAD_CtxHelp_UU();
 
-    /** Column name AD_Form_ID */
-    public static final String COLUMNNAME_AD_Form_ID = "AD_Form_ID";
-
-	/** Set Special Form.
-	  * Special Form
-	  */
-	public void setAD_Form_ID (int AD_Form_ID);
-
-	/** Get Special Form.
-	  * Special Form
-	  */
-	public int getAD_Form_ID();
-
-	public org.compiere.model.I_AD_Form getAD_Form() throws RuntimeException;
-
-    /** Column name AD_InfoWindow_ID */
-    public static final String COLUMNNAME_AD_InfoWindow_ID = "AD_InfoWindow_ID";
-
-	/** Set Info Window.
-	  * Info and search/select Window
-	  */
-	public void setAD_InfoWindow_ID (int AD_InfoWindow_ID);
-
-	/** Get Info Window.
-	  * Info and search/select Window
-	  */
-	public int getAD_InfoWindow_ID();
-
-	public org.compiere.model.I_AD_InfoWindow getAD_InfoWindow() throws RuntimeException;
-
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
@@ -110,66 +80,6 @@ public interface I_AD_CtxHelp
 	  */
 	public int getAD_Org_ID();
 
-    /** Column name AD_Process_ID */
-    public static final String COLUMNNAME_AD_Process_ID = "AD_Process_ID";
-
-	/** Set Process.
-	  * Process or Report
-	  */
-	public void setAD_Process_ID (int AD_Process_ID);
-
-	/** Get Process.
-	  * Process or Report
-	  */
-	public int getAD_Process_ID();
-
-	public org.compiere.model.I_AD_Process getAD_Process() throws RuntimeException;
-
-    /** Column name AD_Tab_ID */
-    public static final String COLUMNNAME_AD_Tab_ID = "AD_Tab_ID";
-
-	/** Set Tab.
-	  * Tab within a Window
-	  */
-	public void setAD_Tab_ID (int AD_Tab_ID);
-
-	/** Get Tab.
-	  * Tab within a Window
-	  */
-	public int getAD_Tab_ID();
-
-	public org.compiere.model.I_AD_Tab getAD_Tab() throws RuntimeException;
-
-    /** Column name AD_Task_ID */
-    public static final String COLUMNNAME_AD_Task_ID = "AD_Task_ID";
-
-	/** Set OS Task.
-	  * Operation System Task
-	  */
-	public void setAD_Task_ID (int AD_Task_ID);
-
-	/** Get OS Task.
-	  * Operation System Task
-	  */
-	public int getAD_Task_ID();
-
-	public org.compiere.model.I_AD_Task getAD_Task() throws RuntimeException;
-
-    /** Column name AD_Workflow_ID */
-    public static final String COLUMNNAME_AD_Workflow_ID = "AD_Workflow_ID";
-
-	/** Set Workflow.
-	  * Workflow or combination of tasks
-	  */
-	public void setAD_Workflow_ID (int AD_Workflow_ID);
-
-	/** Get Workflow.
-	  * Workflow or combination of tasks
-	  */
-	public int getAD_Workflow_ID();
-
-	public org.compiere.model.I_AD_Workflow getAD_Workflow() throws RuntimeException;
-
     /** Column name Created */
     public static final String COLUMNNAME_Created = "Created";
 
@@ -189,10 +99,14 @@ public interface I_AD_CtxHelp
     /** Column name CtxType */
     public static final String COLUMNNAME_CtxType = "CtxType";
 
-	/** Set Content Type	  */
+	/** Set Context Type.
+	  * Type of Context Help
+	  */
 	public void setCtxType (String CtxType);
 
-	/** Get Content Type	  */
+	/** Get Context Type.
+	  * Type of Context Help
+	  */
 	public String getCtxType();
 
     /** Column name Description */

org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpMsg.java

@@ -120,19 +120,6 @@ public interface I_AD_CtxHelpMsg
 	  */
 	public boolean isActive();
 
-    /** Column name Line */
-    public static final String COLUMNNAME_Line = "Line";
-
-	/** Set Line No.
-	  * Unique line for this document
-	  */
-	public void setLine (int Line);
-
-	/** Get Line No.
-	  * Unique line for this document
-	  */
-	public int getLine();
-
     /** Column name MsgText */
     public static final String COLUMNNAME_MsgText = "MsgText";
 

org.adempiere.base/src/org/compiere/model/I_AD_Form.java

@@ -62,6 +62,17 @@ public interface I_AD_Form
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name AD_CtxHelp_ID */
+    public static final String COLUMNNAME_AD_CtxHelp_ID = "AD_CtxHelp_ID";
+
+	/** Set Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID);
+
+	/** Get Context Help	  */
+	public int getAD_CtxHelp_ID();
+
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException;
+
     /** Column name AD_Form_ID */
     public static final String COLUMNNAME_AD_Form_ID = "AD_Form_ID";
 

org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java

@@ -49,6 +49,17 @@ public interface I_AD_InfoWindow
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name AD_CtxHelp_ID */
+    public static final String COLUMNNAME_AD_CtxHelp_ID = "AD_CtxHelp_ID";
+
+	/** Set Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID);
+
+	/** Get Context Help	  */
+	public int getAD_CtxHelp_ID();
+
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException;
+
     /** Column name AD_InfoWindow_ID */
     public static final String COLUMNNAME_AD_InfoWindow_ID = "AD_InfoWindow_ID";
 

org.adempiere.base/src/org/compiere/model/I_AD_Process.java

@@ -62,6 +62,17 @@ public interface I_AD_Process
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name AD_CtxHelp_ID */
+    public static final String COLUMNNAME_AD_CtxHelp_ID = "AD_CtxHelp_ID";
+
+	/** Set Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID);
+
+	/** Get Context Help	  */
+	public int getAD_CtxHelp_ID();
+
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException;
+
     /** Column name AD_Form_ID */
     public static final String COLUMNNAME_AD_Form_ID = "AD_Form_ID";
 

org.adempiere.base/src/org/compiere/model/I_AD_Tab.java

@@ -94,6 +94,17 @@ public interface I_AD_Tab
 
 	public org.compiere.model.I_AD_Column getAD_ColumnSortYesNo() throws RuntimeException;
 
+    /** Column name AD_CtxHelp_ID */
+    public static final String COLUMNNAME_AD_CtxHelp_ID = "AD_CtxHelp_ID";
+
+	/** Set Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID);
+
+	/** Get Context Help	  */
+	public int getAD_CtxHelp_ID();
+
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException;
+
     /** Column name AD_Image_ID */
     public static final String COLUMNNAME_AD_Image_ID = "AD_Image_ID";
 
@@ -150,6 +161,15 @@ public interface I_AD_Tab
 	  */
 	public int getAD_Tab_ID();
 
+    /** Column name AD_Tab_UU */
+    public static final String COLUMNNAME_AD_Tab_UU = "AD_Tab_UU";
+
+	/** Set AD_Tab_UU	  */
+	public void setAD_Tab_UU (String AD_Tab_UU);
+
+	/** Get AD_Tab_UU	  */
+	public String getAD_Tab_UU();
+
     /** Column name AD_Table_ID */
     public static final String COLUMNNAME_AD_Table_ID = "AD_Table_ID";
 
@@ -165,15 +185,6 @@ public interface I_AD_Tab
 
 	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException;
 
-    /** Column name AD_Tab_UU */
-    public static final String COLUMNNAME_AD_Tab_UU = "AD_Tab_UU";
-
-	/** Set AD_Tab_UU	  */
-	public void setAD_Tab_UU (String AD_Tab_UU);
-
-	/** Get AD_Tab_UU	  */
-	public String getAD_Tab_UU();
-
     /** Column name AD_Window_ID */
     public static final String COLUMNNAME_AD_Window_ID = "AD_Window_ID";
 

org.adempiere.base/src/org/compiere/model/I_AD_Task.java

@@ -62,6 +62,17 @@ public interface I_AD_Task
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name AD_CtxHelp_ID */
+    public static final String COLUMNNAME_AD_CtxHelp_ID = "AD_CtxHelp_ID";
+
+	/** Set Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID);
+
+	/** Get Context Help	  */
+	public int getAD_CtxHelp_ID();
+
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException;
+
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 

org.adempiere.base/src/org/compiere/model/I_AD_Workflow.java

@@ -62,6 +62,17 @@ public interface I_AD_Workflow
 	  */
 	public int getAD_Client_ID();
 
+    /** Column name AD_CtxHelp_ID */
+    public static final String COLUMNNAME_AD_CtxHelp_ID = "AD_CtxHelp_ID";
+
+	/** Set Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID);
+
+	/** Get Context Help	  */
+	public int getAD_CtxHelp_ID();
+
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException;
+
     /** Column name AD_Org_ID */
     public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
 
@@ -133,6 +144,15 @@ public interface I_AD_Workflow
 	  */
 	public int getAD_Workflow_ID();
 
+    /** Column name AD_Workflow_UU */
+    public static final String COLUMNNAME_AD_Workflow_UU = "AD_Workflow_UU";
+
+	/** Set AD_Workflow_UU	  */
+	public void setAD_Workflow_UU (String AD_Workflow_UU);
+
+	/** Get AD_Workflow_UU	  */
+	public String getAD_Workflow_UU();
+
     /** Column name AD_WorkflowProcessor_ID */
     public static final String COLUMNNAME_AD_WorkflowProcessor_ID = "AD_WorkflowProcessor_ID";
 
@@ -148,15 +168,6 @@ public interface I_AD_Workflow
 
 	public org.compiere.model.I_AD_WorkflowProcessor getAD_WorkflowProcessor() throws RuntimeException;
 
-    /** Column name AD_Workflow_UU */
-    public static final String COLUMNNAME_AD_Workflow_UU = "AD_Workflow_UU";
-
-	/** Set AD_Workflow_UU	  */
-	public void setAD_Workflow_UU (String AD_Workflow_UU);
-
-	/** Get AD_Workflow_UU	  */
-	public String getAD_Workflow_UU();
-
     /** Column name Author */
     public static final String COLUMNNAME_Author = "Author";
 
@@ -449,19 +460,6 @@ public interface I_AD_Workflow
 	  */
 	public int getQueuingTime();
 
-    /** Column name SetupTime */
-    public static final String COLUMNNAME_SetupTime = "SetupTime";
-
-	/** Set Setup Time.
-	  * Setup time before starting Production
-	  */
-	public void setSetupTime (int SetupTime);
-
-	/** Get Setup Time.
-	  * Setup time before starting Production
-	  */
-	public int getSetupTime();
-
     /** Column name S_Resource_ID */
     public static final String COLUMNNAME_S_Resource_ID = "S_Resource_ID";
 
@@ -477,6 +475,19 @@ public interface I_AD_Workflow
 
 	public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException;
 
+    /** Column name SetupTime */
+    public static final String COLUMNNAME_SetupTime = "SetupTime";
+
+	/** Set Setup Time.
+	  * Setup time before starting Production
+	  */
+	public void setSetupTime (int SetupTime);
+
+	/** Get Setup Time.
+	  * Setup time before starting Production
+	  */
+	public int getSetupTime();
+
     /** Column name UnitsCycles */
     public static final String COLUMNNAME_UnitsCycles = "UnitsCycles";
 

org.adempiere.base/src/org/compiere/model/X_AD_CtxHelp.java

@@ -29,7 +29,7 @@ public class X_AD_CtxHelp extends PO implements I_AD_CtxHelp, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20130207L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_CtxHelp (Properties ctx, int AD_CtxHelp_ID, String trxName)
@@ -38,7 +38,6 @@ public class X_AD_CtxHelp extends PO implements I_AD_CtxHelp, I_Persistent
       /** if (AD_CtxHelp_ID == 0)
         {
 			setAD_CtxHelp_ID (0);
-			setCtxType (null);
 			setName (null);
         } */
     }
@@ -105,174 +104,6 @@ public class X_AD_CtxHelp extends PO implements I_AD_CtxHelp, I_Persistent
 		return (String)get_Value(COLUMNNAME_AD_CtxHelp_UU);
 	}
 
-	public org.compiere.model.I_AD_Form getAD_Form() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_Form)MTable.get(getCtx(), org.compiere.model.I_AD_Form.Table_Name)
-			.getPO(getAD_Form_ID(), get_TrxName());	}
-
-	/** Set Special Form.
-		@param AD_Form_ID 
-		Special Form
-	  */
-	public void setAD_Form_ID (int AD_Form_ID)
-	{
-		if (AD_Form_ID < 1) 
-			set_Value (COLUMNNAME_AD_Form_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_Form_ID, Integer.valueOf(AD_Form_ID));
-	}
-
-	/** Get Special Form.
-		@return Special Form
-	  */
-	public int getAD_Form_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Form_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public org.compiere.model.I_AD_InfoWindow getAD_InfoWindow() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_InfoWindow)MTable.get(getCtx(), org.compiere.model.I_AD_InfoWindow.Table_Name)
-			.getPO(getAD_InfoWindow_ID(), get_TrxName());	}
-
-	/** Set Info Window.
-		@param AD_InfoWindow_ID 
-		Info and search/select Window
-	  */
-	public void setAD_InfoWindow_ID (int AD_InfoWindow_ID)
-	{
-		if (AD_InfoWindow_ID < 1) 
-			set_Value (COLUMNNAME_AD_InfoWindow_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_InfoWindow_ID, Integer.valueOf(AD_InfoWindow_ID));
-	}
-
-	/** Get Info Window.
-		@return Info and search/select Window
-	  */
-	public int getAD_InfoWindow_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_InfoWindow_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public org.compiere.model.I_AD_Process getAD_Process() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_Process)MTable.get(getCtx(), org.compiere.model.I_AD_Process.Table_Name)
-			.getPO(getAD_Process_ID(), get_TrxName());	}
-
-	/** Set Process.
-		@param AD_Process_ID 
-		Process or Report
-	  */
-	public void setAD_Process_ID (int AD_Process_ID)
-	{
-		if (AD_Process_ID < 1) 
-			set_Value (COLUMNNAME_AD_Process_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_Process_ID, Integer.valueOf(AD_Process_ID));
-	}
-
-	/** Get Process.
-		@return Process or Report
-	  */
-	public int getAD_Process_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Process_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public org.compiere.model.I_AD_Tab getAD_Tab() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_Tab)MTable.get(getCtx(), org.compiere.model.I_AD_Tab.Table_Name)
-			.getPO(getAD_Tab_ID(), get_TrxName());	}
-
-	/** Set Tab.
-		@param AD_Tab_ID 
-		Tab within a Window
-	  */
-	public void setAD_Tab_ID (int AD_Tab_ID)
-	{
-		if (AD_Tab_ID < 1) 
-			set_Value (COLUMNNAME_AD_Tab_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_Tab_ID, Integer.valueOf(AD_Tab_ID));
-	}
-
-	/** Get Tab.
-		@return Tab within a Window
-	  */
-	public int getAD_Tab_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Tab_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public org.compiere.model.I_AD_Task getAD_Task() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_Task)MTable.get(getCtx(), org.compiere.model.I_AD_Task.Table_Name)
-			.getPO(getAD_Task_ID(), get_TrxName());	}
-
-	/** Set OS Task.
-		@param AD_Task_ID 
-		Operation System Task
-	  */
-	public void setAD_Task_ID (int AD_Task_ID)
-	{
-		if (AD_Task_ID < 1) 
-			set_Value (COLUMNNAME_AD_Task_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_Task_ID, Integer.valueOf(AD_Task_ID));
-	}
-
-	/** Get OS Task.
-		@return Operation System Task
-	  */
-	public int getAD_Task_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Task_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
-	public org.compiere.model.I_AD_Workflow getAD_Workflow() throws RuntimeException
-    {
-		return (org.compiere.model.I_AD_Workflow)MTable.get(getCtx(), org.compiere.model.I_AD_Workflow.Table_Name)
-			.getPO(getAD_Workflow_ID(), get_TrxName());	}
-
-	/** Set Workflow.
-		@param AD_Workflow_ID 
-		Workflow or combination of tasks
-	  */
-	public void setAD_Workflow_ID (int AD_Workflow_ID)
-	{
-		if (AD_Workflow_ID < 1) 
-			set_Value (COLUMNNAME_AD_Workflow_ID, null);
-		else 
-			set_Value (COLUMNNAME_AD_Workflow_ID, Integer.valueOf(AD_Workflow_ID));
-	}
-
-	/** Get Workflow.
-		@return Workflow or combination of tasks
-	  */
-	public int getAD_Workflow_ID () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_AD_Workflow_ID);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** CtxType AD_Reference_ID=200064 */
 	public static final int CTXTYPE_AD_Reference_ID=200064;
 	/** Tab = T */
@@ -289,16 +120,19 @@ public class X_AD_CtxHelp extends PO implements I_AD_CtxHelp, I_Persistent
 	public static final String CTXTYPE_Task = "K";
 	/** Home = H */
 	public static final String CTXTYPE_Home = "H";
-	/** Set Content Type.
+	/** Set Context Type.
-		@param CtxType Content Type	  */
+		@param CtxType 
+		Type of Context Help
+	  */
 	public void setCtxType (String CtxType)
 	{
 
 		set_Value (COLUMNNAME_CtxType, CtxType);
 	}
 
-	/** Get Content Type.
+	/** Get Context Type.
-		@return Content Type	  */
+		@return Type of Context Help
+	  */
 	public String getCtxType () 
 	{
 		return (String)get_Value(COLUMNNAME_CtxType);

org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpMsg.java

@@ -29,7 +29,7 @@ public class X_AD_CtxHelpMsg extends PO implements I_AD_CtxHelpMsg, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20130207L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_CtxHelpMsg (Properties ctx, int AD_CtxHelpMsg_ID, String trxName)
@@ -39,8 +39,6 @@ public class X_AD_CtxHelpMsg extends PO implements I_AD_CtxHelpMsg, I_Persistent
         {
 			setAD_CtxHelp_ID (0);
 			setAD_CtxHelpMsg_ID (0);
-			setLine (0);
-// @SQL=SELECT COALESCE(MAX(Line),0)+10 AS DefaultValue FROM AD_CtxHelpMsg WHERE AD_CtxHelp_ID=@AD_CtxHelp_ID@
 			setMsgText (null);
         } */
     }
@@ -132,26 +130,6 @@ public class X_AD_CtxHelpMsg extends PO implements I_AD_CtxHelpMsg, I_Persistent
 		return (String)get_Value(COLUMNNAME_AD_CtxHelpMsg_UU);
 	}
 
-	/** Set Line No.
-		@param Line 
-		Unique line for this document
-	  */
-	public void setLine (int Line)
-	{
-		set_Value (COLUMNNAME_Line, Integer.valueOf(Line));
-	}
-
-	/** Get Line No.
-		@return Unique line for this document
-	  */
-	public int getLine () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_Line);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	/** Set Message Text.
 		@param MsgText 
 		Textual Informational, Menu or Error Message

org.adempiere.base/src/org/compiere/model/X_AD_Form.java

@@ -30,7 +30,7 @@ public class X_AD_Form extends PO implements I_AD_Form, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_Form (Properties ctx, int AD_Form_ID, String trxName)
@@ -107,6 +107,31 @@ public class X_AD_Form extends PO implements I_AD_Form, I_Persistent
 		return (String)get_Value(COLUMNNAME_AccessLevel);
 	}
 
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelp)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelp.Table_Name)
+			.getPO(getAD_CtxHelp_ID(), get_TrxName());	}
+
+	/** Set Context Help.
+		@param AD_CtxHelp_ID Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID)
+	{
+		if (AD_CtxHelp_ID < 1) 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, Integer.valueOf(AD_CtxHelp_ID));
+	}
+
+	/** Get Context Help.
+		@return Context Help	  */
+	public int getAD_CtxHelp_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelp_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Special Form.
 		@param AD_Form_ID 
 		Special Form

org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java

@@ -30,7 +30,7 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20130108L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_InfoWindow (Properties ctx, int AD_InfoWindow_ID, String trxName)
@@ -81,6 +81,31 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent
       return sb.toString();
     }
 
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelp)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelp.Table_Name)
+			.getPO(getAD_CtxHelp_ID(), get_TrxName());	}
+
+	/** Set Context Help.
+		@param AD_CtxHelp_ID Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID)
+	{
+		if (AD_CtxHelp_ID < 1) 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, Integer.valueOf(AD_CtxHelp_ID));
+	}
+
+	/** Get Context Help.
+		@return Context Help	  */
+	public int getAD_CtxHelp_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelp_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Info Window.
 		@param AD_InfoWindow_ID 
 		Info and search/select Window

org.adempiere.base/src/org/compiere/model/X_AD_Process.java

@@ -30,7 +30,7 @@ public class X_AD_Process extends PO implements I_AD_Process, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_Process (Properties ctx, int AD_Process_ID, String trxName)
@@ -110,6 +110,31 @@ public class X_AD_Process extends PO implements I_AD_Process, I_Persistent
 		return (String)get_Value(COLUMNNAME_AccessLevel);
 	}
 
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelp)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelp.Table_Name)
+			.getPO(getAD_CtxHelp_ID(), get_TrxName());	}
+
+	/** Set Context Help.
+		@param AD_CtxHelp_ID Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID)
+	{
+		if (AD_CtxHelp_ID < 1) 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, Integer.valueOf(AD_CtxHelp_ID));
+	}
+
+	/** Get Context Help.
+		@return Context Help	  */
+	public int getAD_CtxHelp_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelp_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.compiere.model.I_AD_Form getAD_Form() throws RuntimeException
     {
 		return (org.compiere.model.I_AD_Form)MTable.get(getCtx(), org.compiere.model.I_AD_Form.Table_Name)

org.adempiere.base/src/org/compiere/model/X_AD_Tab.java

@@ -30,7 +30,7 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_Tab (Properties ctx, int AD_Tab_ID, String trxName)
@@ -172,6 +172,31 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
 		return ii.intValue();
 	}
 
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelp)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelp.Table_Name)
+			.getPO(getAD_CtxHelp_ID(), get_TrxName());	}
+
+	/** Set Context Help.
+		@param AD_CtxHelp_ID Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID)
+	{
+		if (AD_CtxHelp_ID < 1) 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, Integer.valueOf(AD_CtxHelp_ID));
+	}
+
+	/** Get Context Help.
+		@return Context Help	  */
+	public int getAD_CtxHelp_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelp_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.compiere.model.I_AD_Image getAD_Image() throws RuntimeException
     {
 		return (org.compiere.model.I_AD_Image)MTable.get(getCtx(), org.compiere.model.I_AD_Image.Table_Name)
@@ -251,6 +276,20 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set AD_Tab_UU.
+		@param AD_Tab_UU AD_Tab_UU	  */
+	public void setAD_Tab_UU (String AD_Tab_UU)
+	{
+		set_Value (COLUMNNAME_AD_Tab_UU, AD_Tab_UU);
+	}
+
+	/** Get AD_Tab_UU.
+		@return AD_Tab_UU	  */
+	public String getAD_Tab_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_AD_Tab_UU);
+	}
+
 	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException
     {
 		return (org.compiere.model.I_AD_Table)MTable.get(getCtx(), org.compiere.model.I_AD_Table.Table_Name)
@@ -279,20 +318,6 @@ public class X_AD_Tab extends PO implements I_AD_Tab, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set AD_Tab_UU.
-		@param AD_Tab_UU AD_Tab_UU	  */
-	public void setAD_Tab_UU (String AD_Tab_UU)
-	{
-		set_Value (COLUMNNAME_AD_Tab_UU, AD_Tab_UU);
-	}
-
-	/** Get AD_Tab_UU.
-		@return AD_Tab_UU	  */
-	public String getAD_Tab_UU () 
-	{
-		return (String)get_Value(COLUMNNAME_AD_Tab_UU);
-	}
-
 	public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException
     {
 		return (org.compiere.model.I_AD_Window)MTable.get(getCtx(), org.compiere.model.I_AD_Window.Table_Name)

org.adempiere.base/src/org/compiere/model/X_AD_Task.java

@@ -30,7 +30,7 @@ public class X_AD_Task extends PO implements I_AD_Task, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_Task (Properties ctx, int AD_Task_ID, String trxName)
@@ -109,6 +109,31 @@ public class X_AD_Task extends PO implements I_AD_Task, I_Persistent
 		return (String)get_Value(COLUMNNAME_AccessLevel);
 	}
 
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelp)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelp.Table_Name)
+			.getPO(getAD_CtxHelp_ID(), get_TrxName());	}
+
+	/** Set Context Help.
+		@param AD_CtxHelp_ID Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID)
+	{
+		if (AD_CtxHelp_ID < 1) 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, Integer.valueOf(AD_CtxHelp_ID));
+	}
+
+	/** Get Context Help.
+		@return Context Help	  */
+	public int getAD_CtxHelp_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelp_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set OS Task.
 		@param AD_Task_ID 
 		Operation System Task

org.adempiere.base/src/org/compiere/model/X_AD_Workflow.java

@@ -33,7 +33,7 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20130219L;
 
     /** Standard Constructor */
     public X_AD_Workflow (Properties ctx, int AD_Workflow_ID, String trxName)
@@ -124,6 +124,31 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return (String)get_Value(COLUMNNAME_AccessLevel);
 	}
 
+	public org.compiere.model.I_AD_CtxHelp getAD_CtxHelp() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelp)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelp.Table_Name)
+			.getPO(getAD_CtxHelp_ID(), get_TrxName());	}
+
+	/** Set Context Help.
+		@param AD_CtxHelp_ID Context Help	  */
+	public void setAD_CtxHelp_ID (int AD_CtxHelp_ID)
+	{
+		if (AD_CtxHelp_ID < 1) 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_Value (COLUMNNAME_AD_CtxHelp_ID, Integer.valueOf(AD_CtxHelp_ID));
+	}
+
+	/** Get Context Help.
+		@return Context Help	  */
+	public int getAD_CtxHelp_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelp_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException
     {
 		return (org.compiere.model.I_AD_Table)MTable.get(getCtx(), org.compiere.model.I_AD_Table.Table_Name)
@@ -231,6 +256,20 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set AD_Workflow_UU.
+		@param AD_Workflow_UU AD_Workflow_UU	  */
+	public void setAD_Workflow_UU (String AD_Workflow_UU)
+	{
+		set_Value (COLUMNNAME_AD_Workflow_UU, AD_Workflow_UU);
+	}
+
+	/** Get AD_Workflow_UU.
+		@return AD_Workflow_UU	  */
+	public String getAD_Workflow_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_AD_Workflow_UU);
+	}
+
 	public org.compiere.model.I_AD_WorkflowProcessor getAD_WorkflowProcessor() throws RuntimeException
     {
 		return (org.compiere.model.I_AD_WorkflowProcessor)MTable.get(getCtx(), org.compiere.model.I_AD_WorkflowProcessor.Table_Name)
@@ -259,20 +298,6 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set AD_Workflow_UU.
-		@param AD_Workflow_UU AD_Workflow_UU	  */
-	public void setAD_Workflow_UU (String AD_Workflow_UU)
-	{
-		set_Value (COLUMNNAME_AD_Workflow_UU, AD_Workflow_UU);
-	}
-
-	/** Get AD_Workflow_UU.
-		@return AD_Workflow_UU	  */
-	public String getAD_Workflow_UU () 
-	{
-		return (String)get_Value(COLUMNNAME_AD_Workflow_UU);
-	}
-
 	/** Set Author.
 		@param Author 
 		Author/Creator of the Entity
@@ -718,26 +743,6 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return ii.intValue();
 	}
 
-	/** Set Setup Time.
-		@param SetupTime 
-		Setup time before starting Production
-	  */
-	public void setSetupTime (int SetupTime)
-	{
-		set_Value (COLUMNNAME_SetupTime, Integer.valueOf(SetupTime));
-	}
-
-	/** Get Setup Time.
-		@return Setup time before starting Production
-	  */
-	public int getSetupTime () 
-	{
-		Integer ii = (Integer)get_Value(COLUMNNAME_SetupTime);
-		if (ii == null)
-			 return 0;
-		return ii.intValue();
-	}
-
 	public org.compiere.model.I_S_Resource getS_Resource() throws RuntimeException
     {
 		return (org.compiere.model.I_S_Resource)MTable.get(getCtx(), org.compiere.model.I_S_Resource.Table_Name)
@@ -766,6 +771,26 @@ public class X_AD_Workflow extends PO implements I_AD_Workflow, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set Setup Time.
+		@param SetupTime 
+		Setup time before starting Production
+	  */
+	public void setSetupTime (int SetupTime)
+	{
+		set_Value (COLUMNNAME_SetupTime, Integer.valueOf(SetupTime));
+	}
+
+	/** Get Setup Time.
+		@return Setup time before starting Production
+	  */
+	public int getSetupTime () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_SetupTime);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
 	/** Set Units by Cycles.
 		@param UnitsCycles 
 		The Units by Cycles are defined for process type  Flow Repetitive Dedicated and  indicated the product to be manufactured on a production line for duration unit.

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java

@@ -16,8 +16,6 @@ package org.adempiere.webui.panel;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 import org.adempiere.exceptions.AdempiereException;
@@ -30,6 +28,12 @@ import org.compiere.model.MTab;
 import org.compiere.model.MTask;
 import org.compiere.model.X_AD_CtxHelp;
 import org.compiere.model.X_AD_CtxHelpMsg;
+import org.compiere.model.X_AD_Form;
+import org.compiere.model.X_AD_InfoWindow;
+import org.compiere.model.X_AD_Process;
+import org.compiere.model.X_AD_Tab;
+import org.compiere.model.X_AD_Task;
+import org.compiere.model.X_AD_Workflow;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
@@ -144,12 +148,9 @@ public class HelpController
     	StringBuilder sb = new StringBuilder();
     	sb.append("<html>\n<body>\n<div class=\"content\">\n");
     	    	
-    	String[] ctxHelpMsgList = getCtxHelpMsgList(ctxType, recordId);
+    	String ctxHelpMsg = getCtxHelpMsgList(ctxType, recordId);
-    	if (ctxHelpMsgList.length > 0)
+    	if (ctxHelpMsg.length() > 0)
-    	{
+	    	sb.append(stripHtml(ctxHelpMsg, false) + "<br>\n");
-	    	for (String ctxHelpMsg : ctxHelpMsgList)
-	    		sb.append(stripHtml(ctxHelpMsg, false) + "<br>\n");
-    	}
     	else
     	{
         	sb.append("<i>(" + Msg.getMsg(Env.getCtx(), "NotAvailable") + ")</i>");
@@ -267,36 +268,74 @@ public class HelpController
     	Properties ctx = Env.getCtx();
     	
     	StringBuilder sql = new StringBuilder();
-    	sql.append("SELECT AD_CtxHelp_ID ");
+    	sql.append("SELECT t.");
-    	sql.append("FROM AD_CtxHelp ");
-    	sql.append("WHERE IsActive = 'Y' ");
-    	sql.append("AND AD_Client_ID IN (0, ?) ");
-    	sql.append("AND AD_Org_ID IN (0, ?) ");
-    	sql.append("AND CtxType = ? ");
-    	
     	if (ctxType == X_AD_CtxHelp.CTXTYPE_Tab)
-    		sql.append("AND " + X_AD_CtxHelp.COLUMNNAME_AD_Tab_ID + " = ? ");
+    		sql.append(X_AD_Tab.COLUMNNAME_AD_CtxHelp_ID);
     	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Process)
-    		sql.append("AND " + X_AD_CtxHelp.COLUMNNAME_AD_Process_ID + " = ? ");
+    		sql.append(X_AD_Process.COLUMNNAME_AD_CtxHelp_ID);
     	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Form)
-    		sql.append("AND " + X_AD_CtxHelp.COLUMNNAME_AD_Form_ID + " = ? ");
+    		sql.append(X_AD_Form.COLUMNNAME_AD_CtxHelp_ID);
     	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Info)
-    		sql.append("AND " + X_AD_CtxHelp.COLUMNNAME_AD_InfoWindow_ID + " = ? ");
+    		sql.append(X_AD_InfoWindow.COLUMNNAME_AD_CtxHelp_ID);
     	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Workflow)
-    		sql.append("AND " + X_AD_CtxHelp.COLUMNNAME_AD_Workflow_ID + " = ? ");
+    		sql.append(X_AD_Workflow.COLUMNNAME_AD_CtxHelp_ID);
     	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Task)
-    		sql.append("AND " + X_AD_CtxHelp.COLUMNNAME_AD_Task_ID + " = ? ");
+    		sql.append(X_AD_Task.COLUMNNAME_AD_CtxHelp_ID);
     	else
-    		sql.append("AND 0 = ? ");
+    		sql.append(X_AD_CtxHelp.COLUMNNAME_AD_CtxHelp_ID);
     	
-    	sql.append("ORDER BY AD_Client_ID DESC, AD_Org_ID DESC");
+    	sql.append(" FROM ");
+    	if (ctxType == X_AD_CtxHelp.CTXTYPE_Tab)
+    		sql.append(X_AD_Tab.Table_Name);
+    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Process)
+    		sql.append(X_AD_Process.Table_Name);
+    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Form)
+    		sql.append(X_AD_Form.Table_Name);
+    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Info)
+    		sql.append(X_AD_InfoWindow.Table_Name);
+    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Workflow)
+    		sql.append(X_AD_Workflow.Table_Name);
+    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Task)
+    		sql.append(X_AD_Task.Table_Name);
+    	else
+    		sql.append(X_AD_CtxHelp.Table_Name);
+    	sql.append(" t, AD_CtxHelp h ");
     	
-    	return DB.getSQLValue(null, sql.toString(), Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), ctxType, recordId);
+    	sql.append("WHERE t.AD_CtxHelp_ID = h.AD_CtxHelp_ID ");
+    	sql.append("AND t.IsActive = 'Y' ");
+    	sql.append("AND h.IsActive = 'Y' ");
+    	sql.append("AND h.AD_Client_ID IN (0, ?) ");
+    	sql.append("AND h.AD_Org_ID IN (0, ?) ");
+    	
+    	if (ctxType == X_AD_CtxHelp.CTXTYPE_Home)
+    		sql.append("AND h." + X_AD_CtxHelp.COLUMNNAME_CtxType);    		
+    	else
+    	{
+	    	sql.append("AND t.");
+	    	if (ctxType == X_AD_CtxHelp.CTXTYPE_Tab)
+	    		sql.append(X_AD_Tab.COLUMNNAME_AD_Tab_ID);
+	    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Process)
+	    		sql.append(X_AD_Process.COLUMNNAME_AD_Process_ID);
+	    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Form)
+	    		sql.append(X_AD_Form.COLUMNNAME_AD_Form_ID);
+	    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Info)
+	    		sql.append(X_AD_InfoWindow.COLUMNNAME_AD_InfoWindow_ID);
+	    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Workflow)
+	    		sql.append(X_AD_Workflow.COLUMNNAME_AD_Workflow_ID);
+	    	else if (ctxType == X_AD_CtxHelp.CTXTYPE_Task)
+	    		sql.append(X_AD_Task.COLUMNNAME_AD_Task_ID);
+	    	else
+	    		sql.append("0");
+    	}
+    	sql.append(" = ? ");
+    	sql.append("ORDER BY h.AD_Client_ID DESC, h.AD_Org_ID DESC, h.AD_CtxHelp_ID DESC");    	
+    	return DB.getSQLValue(null, sql.toString(), Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), ctxType == X_AD_CtxHelp.CTXTYPE_Home ? ctxType : recordId);
     }
     
-    private String[] getCtxHelpMsgList(String ctxType, int recordId)
+    private String getCtxHelpMsgList(String ctxType, int recordId)
 	{
-    	List<String> list = new ArrayList<String>();
+    	Properties ctx = Env.getCtx();
+    	
     	int AD_CtxHelp_ID = getCtxHelpID(ctxType, recordId);
     	if (AD_CtxHelp_ID > 0)
     	{
@@ -306,8 +345,10 @@ public class HelpController
         		sql.append("SELECT MsgText ");    		
             	sql.append("FROM AD_CtxHelpMsg ");
             	sql.append("WHERE IsActive = 'Y' ");
+            	sql.append("AND AD_Client_ID IN (0, ?) ");
+            	sql.append("AND AD_Org_ID IN (0, ?) ");
             	sql.append("AND AD_CtxHelp_ID = ? ");
-            	sql.append("ORDER BY Line ");
+            	sql.append("ORDER BY AD_Client_ID DESC, AD_Org_ID DESC, AD_CtxHelpMsg_ID DESC");
         	}
         	else
         	{
@@ -315,8 +356,10 @@ public class HelpController
             	sql.append("FROM AD_CtxHelpMsg m ");
             	sql.append("LEFT JOIN AD_CtxHelpMsg_Trl mt ON (mt.AD_CtxHelpMsg_ID = m.AD_CtxHelpMsg_ID AND mt.AD_Language = ?) ");
             	sql.append("WHERE mt.IsActive = 'Y' ");
+            	sql.append("AND m.AD_Client_ID IN (0, ?) ");
+            	sql.append("AND m.AD_Org_ID IN (0, ?) ");
             	sql.append("AND m.AD_CtxHelp_ID = ? ");
-            	sql.append("ORDER BY m.Line ");
+            	sql.append("ORDER BY m.AD_Client_ID DESC, m.AD_Org_ID DESC, m.AD_CtxHelpMsg_ID DESC");
         	}
         	
         	PreparedStatement pstmt = null;
@@ -328,12 +371,12 @@ public class HelpController
     			int count = 1;
             	if (!Env.isBaseLanguage(Env.getCtx(), X_AD_CtxHelpMsg.Table_Name))
             		pstmt.setString(count++, Env.getAD_Language(Env.getCtx()));
+            	pstmt.setInt(count++, Env.getAD_Client_ID(ctx));
+            	pstmt.setInt(count++, Env.getAD_Org_ID(ctx));
     			pstmt.setInt(count++, AD_CtxHelp_ID);
     			rs = pstmt.executeQuery();
-    			while (rs.next())
+    			if (rs.next())
-    			{
+    				return rs.getString(X_AD_CtxHelpMsg.COLUMNNAME_MsgText);
-    				list.add(rs.getString("MsgText"));
-    			}
     		}
     		catch (Exception e)
     		{
@@ -345,6 +388,6 @@ public class HelpController
     		}
     	}
     	
-    	return list.toArray(new String[list.size()]);
+    	return "";
 	}
 }