diff --git a/migration/i4.1z/oracle/201607051800_Ticket_1006079.sql b/migration/i4.1z/oracle/201607051800_Ticket_1006079.sql
new file mode 100644
index 0000000000..0c830fc443
--- /dev/null
+++ b/migration/i4.1z/oracle/201607051800_Ticket_1006079.sql
@@ -0,0 +1,354 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Jul 5, 2016 8:48:54 PM MYT
+-- 1006079 Ease edit of OnLine Context Help
+INSERT INTO AD_Form (AD_Form_ID,Updated,Classname,Created,IsBetaFunctionality,AD_Client_ID,EntityType,Description,Name,AD_Org_ID,UpdatedBy,AccessLevel,CreatedBy,IsActive,AD_Form_UU) VALUES (200010,TO_DATE('2016-07-05 20:48:53','YYYY-MM-DD HH24:MI:SS'),'org.adempiere.webui.apps.form.CompareCtxHelpSuggestion',TO_DATE('2016-07-05 20:48:53','YYYY-MM-DD HH24:MI:SS'),'N',0,'D','Review changes for context help','Compare Context Help Suggestion',0,100,'4',100,'Y','09e0322d-5eb9-4dc8-a332-7534fac86de0')
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_Menu (AD_Menu_ID,AD_Client_ID,Updated,Created,AD_Menu_UU,IsSummary,Action,IsSOTrx,IsReadOnly,AD_Org_ID,UpdatedBy,CreatedBy,IsCentrallyMaintained,Name,IsActive,AD_Window_ID,EntityType) VALUES (200143,0,TO_DATE('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),'05a76d62-2448-4629-92fd-5b17d76e7f8f','N','W','N','N',0,100,100,'Y','Context Help Suggestion','Y',200088,'D')
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_TreeNode (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNode_UU) SELECT t.AD_Client_ID, 0, 'Y', SysDate, 100, SysDate, 100,t.AD_Tree_ID, 200143, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='TL' AND t.AD_Table_ID=116 AND NOT EXISTS (SELECT * FROM AD_TreeNode e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200143)
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_TREENODEMM(AD_Client_ID, AD_Org_ID, CreatedBy, UpdatedBy, Parent_ID, SeqNo, AD_Tree_ID, Node_ID)VALUES(0, 0, 0, 0, 153,28, 10, 200143)
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_Window (AD_Window_ID,AD_Client_ID,AD_Org_ID,Updated,Processing,WindowType,IsSOTrx,IsDefault,IsBetaFunctionality,Created,WinHeight,WinWidth,EntityType,Name,UpdatedBy,CreatedBy,Description,AD_Window_UU,IsActive) VALUES (200088,0,0,TO_DATE('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),'N','M','N','N','N',TO_DATE('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),0,0,'D','Context Help Suggestion',100,100,'Review context help suggestion from tenant','09616484-7415-4b61-94f5-19ec432650a6','Y')
+;
+
+-- Jul 5, 2016 8:49:07 PM MYT
+INSERT INTO AD_Table (AD_Table_ID,AD_Client_ID,ImportTable,CopyColumnsFromTable,AccessLevel,IsHighVolume,IsDeleteable,IsView,AD_Org_ID,IsChangeLog,Created,Updated,ReplicationType,EntityType,UpdatedBy,CreatedBy,IsCentrallyMaintained,TableName,Description,Name,IsSecurityEnabled,IsActive,AD_Table_UU,IsUseLuceneIndex,Processing,DatabaseViewDrop,LoadSeq) VALUES (200210,0,'N','N','4','N','N','N',0,'N',TO_DATE('2016-07-05 20:49:07','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:07','YYYY-MM-DD HH24:MI:SS'),'L','D',100,100,'Y','AD_CtxHelpSuggestion','Suggestion for context help content','Context Help Suggestion','N','Y','5da7de59-f193-4b03-afe7-f53f381fbe3a','N','N','N',0)
+;
+
+-- Jul 5, 2016 8:49:08 PM MYT
+INSERT INTO AD_Sequence (AD_Sequence_ID,AD_Org_ID,Updated,UpdatedBy,CreatedBy,IsTableID,CurrentNext,IsAutoSequence,StartNo,IsAudited,CurrentNextSys,AD_Client_ID,Created,Name,Description,IncrementNo,StartNewYear,AD_Sequence_UU,IsActive) VALUES (1000525,0,TO_DATE('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),100,100,'Y',1000000,'Y',1000000,'N',200000,0,TO_DATE('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),'AD_CtxHelpSuggestion','Table AD_CtxHelpSuggestion',1,'N','bdbdb075-36e3-4046-89ad-e15a84fe6502','Y')
+;
+
+-- Jul 5, 2016 8:49:08 PM MYT
+CREATE SEQUENCE AD_CTXHELPSUGGESTION_SQ INCREMENT BY 1 MINVALUE 1000000 MAXVALUE 2147483647 START WITH 1000000
+;
+
+-- Jul 5, 2016 8:49:09 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203026,TO_DATE('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),0,'Context Help Suggestion','Context Help Suggestion','AD_CtxHelpSuggestion_ID','f06b6b92-3e7f-42f6-90ed-65b80dfd6fa5',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:09 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212800,'N','Y',0,0,TO_DATE('2016-07-05 20:49:09','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,22,'Y','N',TO_DATE('2016-07-05 20:49:09','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','AD_CtxHelpSuggestion_ID','Context Help Suggestion','N','bbffa49b-d465-4013-8ee4-af498c5c9350',100,'Y','N','N','N',203026,13,200210)
+;
+
+-- Jul 5, 2016 8:49:09 PM MYT
+CREATE TABLE AD_CtxHelpSuggestion (AD_CtxHelpSuggestion_ID NUMBER(10) NOT NULL, CONSTRAINT AD_CtxHelpSuggestion_Key PRIMARY KEY (AD_CtxHelpSuggestion_ID))
+;
+
+-- Jul 5, 2016 8:49:10 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,AD_Val_Rule_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212797,'N','Y',0,0,TO_DATE('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.',0,22,'N','N',129,TO_DATE('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','Client/Tenant for this installation.','AD_Client_ID','Client','@#AD_Client_ID@','N','7b636940-4f00-4786-933a-cb1eb80d93f1',100,'Y','N','N','D',102,19,200210)
+;
+
+-- Jul 5, 2016 8:49:10 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_Client_ID NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:10 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Val_Rule_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212798,'N','Y',0,0,TO_DATE('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,10,'N','N',200030,TO_DATE('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','AD_CtxHelp_ID','Context Help','Y','f8ca41fa-783b-4a5d-9e25-efa8059f5dfe',100,'Y','N','N','N','ADCtxHelp_ADCtxHelpSuggestion',202212,19,200210)
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_CtxHelp_ID NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212799,'N','Y',0,0,TO_DATE('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,22,'N','N',TO_DATE('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','AD_CtxHelpMsg_ID','Context Help Message','N','5a7abfbc-fd0b-40b7-9265-fea9511d705d',100,'Y','N','N','N','ADCtxHelpMsg_ADCtxHelpSuggesti',202215,19,200210)
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_CtxHelpMsg_ID NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203027,TO_DATE('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),0,'Context Help Suggestion UUID','Context Help Suggestion UUID','AD_CtxHelpSuggestion_UU','9d382e5d-4478-40d7-b65f-9b30f78fd224',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212801,'N','Y',0,0,TO_DATE('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,36,'N','N',TO_DATE('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','AD_CtxHelpSuggestion_UU','Context Help Suggestion UUID','N','b99875c8-9475-4fc6-b850-9e870ddbbb0b',100,'Y','N','N','N',203027,10,200210)
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_CtxHelpSuggestion_UU VARCHAR2(36) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT AD_CtxHelpSuggestion_UU_idx UNIQUE (AD_CtxHelpSuggestion_UU)
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212802,'N','Y',0,0,TO_DATE('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Language identifies the language to use for display and formatting',0,6,'N','N',TO_DATE('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'Y','Language for this entity','AD_Language','Language','N','99787bb4-ac50-447a-905a-85cc98c2dc72',100,'Y','N','N','N','ADLanguage_ADCtxHelpSuggestion',109,18,106,200210)
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_Language VARCHAR2(6) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,AD_Val_Rule_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212803,'N','Y',0,0,TO_DATE('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.',0,22,'N','N',104,TO_DATE('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','Organizational entity within client','AD_Org_ID','Organization','@#AD_Org_ID@','N','2dcae5cd-6fdb-436d-afeb-ae8098ab0b7f',100,'Y','N','N','D',113,19,200210)
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_Org_ID NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203019,TO_DATE('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),0,'Tenant of User','Tenant of User','AD_UserClient_ID','fddba35b-0026-4aaf-8550-386fca53dc3d',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212804,'N','Y',0,0,TO_DATE('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,10,'N','N',TO_DATE('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','AD_UserClient_ID','Tenant of User','N','6c813190-2366-445e-a57e-c07d8ad0b039',100,'Y','N','N','N','ADUserClient_ADCtxHelpSuggesti',203019,18,129,200210)
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_UserClient_ID NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212805,'N','Y',0,0,TO_DATE('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The User identifies a unique user in the system. This could be an internal user or a business partner contact',0,10,'N','N',TO_DATE('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','User within the system - Internal or Business Partner Contact','AD_User_ID','User/Contact','N','17f91d87-08bd-4922-ad15-e5e53f47b955',100,'Y','N','N','N','ADUser_ADCtxHelpSuggestion',138,19,200210)
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AD_User_ID NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212806,'N','Y',0,0,TO_DATE('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Created field indicates the date that this record was created.',0,7,'N','N',TO_DATE('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','Date this record was created','Created','Created','SYSDATE','N','9b44d677-9e7a-4773-895a-5de84574cbe1',100,'Y','N','N','N',245,16,200210)
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD Created DATE DEFAULT SYSDATE NOT NULL
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212807,'N','Y',0,0,TO_DATE('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Created By field indicates the user who created this record.',0,22,'N','N',TO_DATE('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','User who created this records','CreatedBy','Created By','N','023f197c-3fd7-4838-825b-4da2c1629e47',100,'Y','N','N','D',246,18,110,200210)
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CreatedBy NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212808,'N','Y',0,0,TO_DATE('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Message Text indicates the message that will display ',0,2000,'N','N',TO_DATE('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'Y','Textual Informational, Menu or Error Message','MsgText','Message Text','N','34f589b2-f0bd-4c2f-96be-a48bd7ecfbbd',100,'Y','N','N','N',463,14,200210)
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD MsgText VARCHAR2(2000) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:16 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212809,'N','Y',0,0,TO_DATE('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reports.
+There are two reasons for de-activating and not deleting records:
+(1) The system requires the record for audit purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are invoices for this partner record existing. You de-activate the Business Partner and prevent that this record is used for future entries.',0,1,'N','N',TO_DATE('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','The record is active in the system','IsActive','Active','Y','N','e86dd94b-8edd-4dc3-91c5-01e4fb268140',100,'Y','N','N','N',348,20,200210)
+;
+
+-- Jul 5, 2016 8:49:16 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:16 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212810,'N','Y',0,0,TO_DATE('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Approved checkbox indicates if this document requires approval before it can be processed.',0,1,'N','N',TO_DATE('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','Indicates if this document requires approval','IsApproved','Approved','N','N','6ef2b833-9691-4353-ad1b-d2b09ab90803',100,'Y','N','N','N',351,20,200210)
+;
+
+-- Jul 5, 2016 8:49:17 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD IsApproved CHAR(1) DEFAULT 'N' CHECK (IsApproved IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:17 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212811,'N','Y',0,0,TO_DATE('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Processed checkbox indicates that a document has been processed.',0,1,'N','N',TO_DATE('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','The document has been processed','Processed','Processed','N','N','0c0cde02-0b0e-4ff3-95e7-df230cc96d0a',100,'Y','N','N','N',1047,20,200210)
+;
+
+-- Jul 5, 2016 8:49:17 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD Processed CHAR(1) DEFAULT 'N' CHECK (Processed IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212812,'N','Y',0,0,TO_DATE('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Updated field indicates the date that this record was updated.',0,7,'N','N',TO_DATE('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','Date this record was updated','Updated','Updated','SYSDATE','N','e52797cb-9333-4ade-b80f-d58594f31a17',100,'Y','N','N','N',607,16,200210)
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD Updated DATE DEFAULT SYSDATE NOT NULL
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212813,'N','Y',0,0,TO_DATE('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Updated By field indicates the user who updated this record.',0,22,'N','N',TO_DATE('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','User who updated this records','UpdatedBy','Updated By','N','3927ef9f-a095-4589-ab18-4fa7494ca478',100,'Y','N','N','D',608,18,110,200210)
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD UpdatedBy NUMBER(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:19 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203023,TO_DATE('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),0,'Accept suggested changes','Accept','Accept','AcceptSuggestion','1105db44-6e5d-4ca3-b999-b6862b636e38',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:19 PM MYT
+INSERT INTO AD_Process (AD_Process_ID,Classname,Created,CreatedBy,Value,CopyFromProcess,AD_Process_UU,IsReport,AccessLevel,IsDirectPrint,IsBetaFunctionality,Updated,IsServerProcess,AD_Client_ID,ShowHelp,EntityType,Name,Statistic_Seconds,Statistic_Count,UpdatedBy,Description,IsActive,AD_Org_ID) VALUES (200096,'org.adempiere.base.process.AcceptCtxHelpSuggestion',TO_DATE('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),100,'AcceptCtxHelpSuggestion','N','dbabdf46-c3bc-4e02-ab0a-f61f6ae60b4b','N','4','N','N',TO_DATE('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),'N',0,'Y','D','Accept Context Help Suggestion',4,4,100,'Accept suggested changes for context help','Y',0)
+;
+
+-- Jul 5, 2016 8:49:19 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Help,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203028,TO_DATE('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),'Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system',TO_DATE('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),0,'Apply changes as tenant customization','Save As Tenant Customization','Save As Tenant Customization','IsSaveAsTenantCustomization','d41d4789-83ca-4fc6-aa4b-75889746bf81',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:20 PM MYT
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,Updated,IsEncrypted,Help,AD_Reference_ID,SeqNo,FieldLength,IsRange,IsCentrallyMaintained,IsMandatory,Created,AD_Client_ID,EntityType,Name,Description,ColumnName,UpdatedBy,AD_Org_ID,CreatedBy,DefaultValue,IsActive,AD_Process_Para_UU,AD_Element_ID,AD_Process_ID) VALUES (200178,TO_DATE('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),'N','Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system',20,10,1,'N','Y','Y',TO_DATE('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),0,'D','Save As Tenant Customization','Apply changes as tenant customization','IsSaveAsTenantCustomization',100,0,100,'N','Y','b6836b0b-6d3a-4f4a-8344-05fd04ee1ffa',203028,200096)
+;
+
+-- Jul 5, 2016 8:49:20 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Process_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212814,'N','Y',0,0,TO_DATE('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','N','N',0,0,1,'N','N',200096,TO_DATE('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),'Y','N','N',100,'N','Accept suggested changes','AcceptSuggestion','Accept','N','6523b5b2-7f9e-4595-9976-1a0550ec9b35',100,'Y','N','N','N',203023,28,200210)
+;
+
+-- Jul 5, 2016 8:49:20 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD AcceptSuggestion CHAR(1) DEFAULT NULL 
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203022,TO_DATE('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),0,'Reject suggested changes','Reject','Reject','RejectSuggestion','8b1c3a36-511a-4506-9d3b-cd8932034fab',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+INSERT INTO AD_Process (AD_Process_ID,Classname,Created,CreatedBy,Value,CopyFromProcess,AD_Process_UU,IsReport,AccessLevel,IsDirectPrint,IsBetaFunctionality,Updated,IsServerProcess,AD_Client_ID,ShowHelp,EntityType,Name,Statistic_Seconds,Statistic_Count,UpdatedBy,Description,IsActive,AD_Org_ID) VALUES (200097,'org.adempiere.base.process.RejectCtxHelpSuggestion',TO_DATE('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),100,'RejectCtxHelpSuggestion','N','9e375e8d-dfff-446d-be92-8a6104c76717','N','4','N','N',TO_DATE('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),'N',0,'Y','D','Reject Context Help Suggestion',1,1,100,'Reject suggested changes for context help','Y',0)
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Process_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212815,'N','Y',0,0,TO_DATE('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','N','N',0,0,1,'N','N',200097,TO_DATE('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),'Y','N','N',100,'N','Reject suggested changes','RejectSuggestion','Reject','N','0cd1e13e-0b60-4d46-9e1e-dc01ca5243b3',100,'Y','N','N','N',203022,28,200210)
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD RejectSuggestion CHAR(1) DEFAULT NULL 
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203024,TO_DATE('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),0,'Compare suggested text with original text','Compare','Compare','CompareSuggestion','aea1e79d-ca75-48ef-b806-a6290a1de6fe',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+INSERT INTO AD_Process (AD_Process_ID,Created,CreatedBy,Value,CopyFromProcess,AD_Process_UU,IsReport,AccessLevel,IsDirectPrint,IsBetaFunctionality,Updated,IsServerProcess,AD_Client_ID,ShowHelp,EntityType,Name,Statistic_Seconds,Statistic_Count,UpdatedBy,IsActive,AD_Org_ID,AD_Form_ID) VALUES (200098,TO_DATE('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),100,'CompareCtxHelpSuggestion','N','830ac0f4-128c-4e61-9cb7-f2bb6bdcb7d0','N','4','N','N',TO_DATE('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),'N',0,'N','D','Compare Context Help Suggestion',0,0,100,'Y',0,200010)
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Process_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212816,'N','Y',0,0,TO_DATE('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','N','N',0,0,1,'N','N',200098,TO_DATE('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),'Y','N','N',100,'N','Compare suggested text with original text','CompareSuggestion','Compare','N','b995f823-f29c-43e7-8d27-8a7f072ed83e',100,'Y','N','N','N',203024,28,200210)
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CompareSuggestion CHAR(1) DEFAULT NULL 
+;
+
+-- Jul 5, 2016 8:49:23 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212817,'N','Y',0,0,TO_DATE('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system',0,1,'N','N',TO_DATE('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','Apply changes as tenant customization','IsSaveAsTenantCustomization','Save As Tenant Customization','N','N','54b65699-0feb-4537-bdb3-cd20c0b1c24d',100,'Y','N','N','N',203028,20,200210)
+;
+
+-- Jul 5, 2016 8:49:23 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD IsSaveAsTenantCustomization CHAR(1) DEFAULT 'N' CHECK (IsSaveAsTenantCustomization IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:24 PM MYT
+INSERT INTO AD_Tab (ImportFields,Processing,AD_Client_ID,AD_Org_ID,Updated,EntityType,WhereClause,IsSingleRow,SeqNo,HasTree,AD_Tab_ID,IsReadOnly,IsSortTab,TabLevel,Created,IsInsertRecord,IsAdvancedTab,CreatedBy,Name,UpdatedBy,IsTranslationTab,IsInfoTab,IsActive,AD_Tab_UU,AD_Table_ID,TreeDisplayedOn,AD_Window_ID) VALUES ('N','N',0,0,TO_DATE('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'D','Processed=''N''','Y',10,'N',200216,'N','N',0,TO_DATE('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'Y','N',100,'Suggestion',100,'N','N','Y','335fe0e0-5044-4262-9e4b-0fdfe35a38fd',200210,'M',200088)
+;
+
+-- Jul 5, 2016 8:49:24 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204252,'N',0,0,TO_DATE('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'N','N','N','N','N',0,'N','Y',TO_DATE('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help Suggestion','N',22,'7a65e820-9743-4835-b97b-c6c1e80766a6','Y',1,'N','N',212800,200216)
+;
+
+-- Jul 5, 2016 8:49:24 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204253,'N',0,0,TO_DATE('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'N','N','N','N','Y',0,'N','Y',TO_DATE('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help Suggestion UUID','N',36,'2f9a21c3-5a52-42e2-a03c-169c6165f885','Y',1,'N','N',212801,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204258,'N',0,0,TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','The Approved checkbox indicates if this document requires approval before it can be processed.','N','N','N','Y',0,'N','Y',TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Approved','Indicates if this document requires approval','N',1,'e7670815-650e-4169-a0a8-102c07fe7318','Y',1,'N','N',212810,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204259,'N',0,0,TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','The Processed checkbox indicates that a document has been processed.','N','N','N','Y',0,'N','Y',TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Processed','The document has been processed','N',1,'6bb39c69-3ce1-4ed4-93d9-5f45692e28d3','Y',1,'N','N',212811,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204263,'N',0,0,TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system','N','N','N','Y',0,'N','Y',TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Save As Tenant Customization','Apply changes as tenant customization','N',1,'9fefd083-93e6-4c26-b059-0f9c781e9879','Y',1,'N','N',212817,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204251,'N',0,0,TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','N','N','N','Y',0,'N','Y',TO_DATE('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help Message','N',22,'b090049b-8417-489f-88bc-18571ec62b60','Y',1,'N','N',212799,200216)
+;
+
+-- Jul 5, 2016 8:49:26 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204248,'N',0,0,TO_DATE('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'N','A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.','Y','N','N','N',10,'N','Y',TO_DATE('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Client','Client/Tenant for this installation.','N',22,'1a29ddcf-ff2c-4834-8119-6c7b35fcfa78','Y',1,'N','N',212797,200216)
+;
+
+-- Jul 5, 2016 8:49:26 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsAllowCopy,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204249,'N',0,0,TO_DATE('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'N','Y','An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.','Y','N','N','N',20,'N','Y',TO_DATE('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Organization','Organizational entity within client','N',22,'d7fa999d-4130-4b8c-b5aa-a8c1df846a29','Y',4,'N','N',212803,200216)
+;
+
+-- Jul 5, 2016 8:49:26 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204250,'N',0,0,TO_DATE('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',30,'Y','Y',TO_DATE('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help','N',10,'f3ca9572-0e9c-486e-8f2b-0b5f8413048e','Y',1,'N','N',212798,200216)
+;
+
+-- Jul 5, 2016 8:49:27 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204254,'N',0,0,TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','The Language identifies the language to use for display and formatting','Y','N','N','Y',40,'Y','Y',TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Language','Language for this entity','N',6,'e019e08d-63d0-411f-8812-e5a9120f2caa','Y',4,'N','N',212802,200216)
+;
+
+-- Jul 5, 2016 8:49:27 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204256,'N',0,0,TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','The User identifies a unique user in the system. This could be an internal user or a business partner contact','Y','N','N','Y',50,'Y','Y',TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'User/Contact','User within the system - Internal or Business Partner Contact','N',10,'6cdb0b43-9888-48ef-bfec-58965b0a3789','Y',1,'N','N',212805,200216)
+;
+
+-- Jul 5, 2016 8:49:27 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204255,'N',0,0,TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',60,'Y','Y',TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Tenant of User','N',10,'3cf3f5e9-180a-4023-8c89-c299d393fc72','Y',4,'N','N',212804,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204264,'N',0,0,TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reports.
+There are two reasons for de-activating and not deleting records:
+(1) The system requires the record for audit purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are invoices for this partner record existing. You de-activate the Business Partner and prevent that this record is used for future entries.','Y','N','N','Y',70,'N','Y',TO_DATE('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Active','The record is active in the system','N',1,'6e82ce54-836f-4ef7-8d90-3b4624deb3c6','Y',2,'N','N',212809,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (5,8,204257,'N',0,0,TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','The Message Text indicates the message that will display ','Y','N','N','Y',80,'N','Y',TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Message Text','Textual Informational, Menu or Error Message','N',2000,'cb0bef2e-0e8c-4f8b-8d5a-da88453eca18','Y',1,'N','N',212808,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204262,'N',0,0,TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',90,'N','Y',TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Compare','Compare suggested text with original text','N',1,'58fd277a-85e0-48e8-b15d-77ceccfec563','Y',2,'N','N',212816,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204261,'N',0,0,TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',100,'N','Y',TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Reject','Reject suggested changes','N',1,'f5e8615b-43ef-4681-9a3f-e84cda031a7d','Y',2,'N','N',212815,200216)
+;
+
+-- Jul 5, 2016 8:49:29 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204260,'N',0,0,TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',110,'N','Y',TO_DATE('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Accept','Accept suggested changes','N',1,'c0c7dcde-67ee-4b93-8587-1396dd215355','Y',5,'N','N',212814,200216)
+;
+
+
+-- Jul 5, 2016 8:49:30 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADCtxHelp_ADCtxHelpSuggestion FOREIGN KEY (AD_CtxHelp_ID) REFERENCES ad_ctxhelp(ad_ctxhelp_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADCtxHelpMsg_ADCtxHelpSuggesti FOREIGN KEY (AD_CtxHelpMsg_ID) REFERENCES ad_ctxhelpmsg(ad_ctxhelpmsg_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADLanguage_ADCtxHelpSuggestion FOREIGN KEY (AD_Language) REFERENCES ad_language(ad_language) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADUserClient_ADCtxHelpSuggesti FOREIGN KEY (AD_UserClient_ID) REFERENCES ad_client(ad_client_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADUser_ADCtxHelpSuggestion FOREIGN KEY (AD_User_ID) REFERENCES ad_user(ad_user_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+SELECT register_migration_script('201607051800_Ticket_1006079.sql') FROM dual
+;
+
diff --git a/migration/i4.1z/postgresql/201607051800_Ticket_1006079.sql b/migration/i4.1z/postgresql/201607051800_Ticket_1006079.sql
new file mode 100644
index 0000000000..a429e95dc4
--- /dev/null
+++ b/migration/i4.1z/postgresql/201607051800_Ticket_1006079.sql
@@ -0,0 +1,350 @@
+-- Jul 5, 2016 8:48:54 PM MYT
+-- 1006079 Ease edit of OnLine Context Help
+INSERT INTO AD_Form (AD_Form_ID,Updated,Classname,Created,IsBetaFunctionality,AD_Client_ID,EntityType,Description,Name,AD_Org_ID,UpdatedBy,AccessLevel,CreatedBy,IsActive,AD_Form_UU) VALUES (200010,TO_TIMESTAMP('2016-07-05 20:48:53','YYYY-MM-DD HH24:MI:SS'),'org.adempiere.webui.apps.form.CompareCtxHelpSuggestion',TO_TIMESTAMP('2016-07-05 20:48:53','YYYY-MM-DD HH24:MI:SS'),'N',0,'D','Review changes for context help','Compare Context Help Suggestion',0,100,'4',100,'Y','09e0322d-5eb9-4dc8-a332-7534fac86de0')
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_Menu (AD_Menu_ID,AD_Client_ID,Updated,Created,AD_Menu_UU,IsSummary,"action",IsSOTrx,IsReadOnly,AD_Org_ID,UpdatedBy,CreatedBy,IsCentrallyMaintained,Name,IsActive,AD_Window_ID,EntityType) VALUES (200143,0,TO_TIMESTAMP('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),'05a76d62-2448-4629-92fd-5b17d76e7f8f','N','W','N','N',0,100,100,'Y','Context Help Suggestion','Y',200088,'D')
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_TreeNode (AD_Client_ID,AD_Org_ID, IsActive,Created,CreatedBy,Updated,UpdatedBy, AD_Tree_ID, Node_ID, Parent_ID, SeqNo, AD_TreeNode_UU) SELECT t.AD_Client_ID, 0, 'Y', statement_timestamp(), 100, statement_timestamp(), 100,t.AD_Tree_ID, 200143, 0, 999, Generate_UUID() FROM AD_Tree t WHERE t.AD_Client_ID=0 AND t.IsActive='Y' AND t.IsAllNodes='Y' AND t.TreeType='TL' AND t.AD_Table_ID=116 AND NOT EXISTS (SELECT * FROM AD_TreeNode e WHERE e.AD_Tree_ID=t.AD_Tree_ID AND Node_ID=200143)
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_TREENODEMM(AD_Client_ID, AD_Org_ID, CreatedBy, UpdatedBy, Parent_ID, SeqNo, AD_Tree_ID, Node_ID)VALUES(0, 0, 0, 0, 153,28, 10, 200143)
+;
+
+-- Jul 5, 2016 8:48:55 PM MYT
+INSERT INTO AD_Window (AD_Window_ID,AD_Client_ID,AD_Org_ID,Updated,Processing,WindowType,IsSOTrx,IsDefault,IsBetaFunctionality,Created,WinHeight,WinWidth,EntityType,Name,UpdatedBy,CreatedBy,Description,AD_Window_UU,IsActive) VALUES (200088,0,0,TO_TIMESTAMP('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),'N','M','N','N','N',TO_TIMESTAMP('2016-07-05 20:48:55','YYYY-MM-DD HH24:MI:SS'),0,0,'D','Context Help Suggestion',100,100,'Review context help suggestion from tenant','09616484-7415-4b61-94f5-19ec432650a6','Y')
+;
+
+-- Jul 5, 2016 8:49:07 PM MYT
+INSERT INTO AD_Table (AD_Table_ID,AD_Client_ID,ImportTable,CopyColumnsFromTable,AccessLevel,IsHighVolume,IsDeleteable,IsView,AD_Org_ID,IsChangeLog,Created,Updated,ReplicationType,EntityType,UpdatedBy,CreatedBy,IsCentrallyMaintained,TableName,Description,Name,IsSecurityEnabled,IsActive,AD_Table_UU,IsUseLuceneIndex,Processing,DatabaseViewDrop,LoadSeq) VALUES (200210,0,'N','N','4','N','N','N',0,'N',TO_TIMESTAMP('2016-07-05 20:49:07','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:07','YYYY-MM-DD HH24:MI:SS'),'L','D',100,100,'Y','AD_CtxHelpSuggestion','Suggestion for context help content','Context Help Suggestion','N','Y','5da7de59-f193-4b03-afe7-f53f381fbe3a','N','N','N',0)
+;
+
+-- Jul 5, 2016 8:49:08 PM MYT
+INSERT INTO AD_Sequence (AD_Sequence_ID,AD_Org_ID,Updated,UpdatedBy,CreatedBy,IsTableID,CurrentNext,IsAutoSequence,StartNo,IsAudited,CurrentNextSys,AD_Client_ID,Created,Name,Description,IncrementNo,StartNewYear,AD_Sequence_UU,IsActive) VALUES (1000525,0,TO_TIMESTAMP('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),100,100,'Y',1000000,'Y',1000000,'N',200000,0,TO_TIMESTAMP('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),'AD_CtxHelpSuggestion','Table AD_CtxHelpSuggestion',1,'N','bdbdb075-36e3-4046-89ad-e15a84fe6502','Y')
+;
+
+-- Jul 5, 2016 8:49:08 PM MYT
+CREATE SEQUENCE AD_CTXHELPSUGGESTION_SQ INCREMENT 1 MINVALUE 1000000 MAXVALUE 2147483647 START 1000000
+;
+
+-- Jul 5, 2016 8:49:09 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203026,TO_TIMESTAMP('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:08','YYYY-MM-DD HH24:MI:SS'),0,'Context Help Suggestion','Context Help Suggestion','AD_CtxHelpSuggestion_ID','f06b6b92-3e7f-42f6-90ed-65b80dfd6fa5',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:09 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212800,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:09','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,22,'Y','N',TO_TIMESTAMP('2016-07-05 20:49:09','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','AD_CtxHelpSuggestion_ID','Context Help Suggestion','N','bbffa49b-d465-4013-8ee4-af498c5c9350',100,'Y','N','N','N',203026,13,200210)
+;
+
+-- Jul 5, 2016 8:49:09 PM MYT
+CREATE TABLE AD_CtxHelpSuggestion (AD_CtxHelpSuggestion_ID NUMERIC(10) NOT NULL, CONSTRAINT AD_CtxHelpSuggestion_Key PRIMARY KEY (AD_CtxHelpSuggestion_ID))
+;
+
+-- Jul 5, 2016 8:49:10 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,AD_Val_Rule_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212797,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.',0,22,'N','N',129,TO_TIMESTAMP('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','Client/Tenant for this installation.','AD_Client_ID','Client','@#AD_Client_ID@','N','7b636940-4f00-4786-933a-cb1eb80d93f1',100,'Y','N','N','D',102,19,200210)
+;
+
+-- Jul 5, 2016 8:49:10 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_Client_ID NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:10 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Val_Rule_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212798,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,10,'N','N',200030,TO_TIMESTAMP('2016-07-05 20:49:10','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','AD_CtxHelp_ID','Context Help','Y','f8ca41fa-783b-4a5d-9e25-efa8059f5dfe',100,'Y','N','N','N','ADCtxHelp_ADCtxHelpSuggestion',202212,19,200210)
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_CtxHelp_ID NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212799,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,22,'N','N',TO_TIMESTAMP('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','AD_CtxHelpMsg_ID','Context Help Message','N','5a7abfbc-fd0b-40b7-9265-fea9511d705d',100,'Y','N','N','N','ADCtxHelpMsg_ADCtxHelpSuggesti',202215,19,200210)
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_CtxHelpMsg_ID NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:11 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203027,TO_TIMESTAMP('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),0,'Context Help Suggestion UUID','Context Help Suggestion UUID','AD_CtxHelpSuggestion_UU','9d382e5d-4478-40d7-b65f-9b30f78fd224',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212801,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,36,'N','N',TO_TIMESTAMP('2016-07-05 20:49:11','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','AD_CtxHelpSuggestion_UU','Context Help Suggestion UUID','N','b99875c8-9475-4fc6-b850-9e870ddbbb0b',100,'Y','N','N','N',203027,10,200210)
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_CtxHelpSuggestion_UU VARCHAR(36) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT AD_CtxHelpSuggestion_UU_idx UNIQUE (AD_CtxHelpSuggestion_UU)
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212802,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Language identifies the language to use for display and formatting',0,6,'N','N',TO_TIMESTAMP('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'Y','Language for this entity','AD_Language','Language','N','99787bb4-ac50-447a-905a-85cc98c2dc72',100,'Y','N','N','N','ADLanguage_ADCtxHelpSuggestion',109,18,106,200210)
+;
+
+-- Jul 5, 2016 8:49:12 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_Language VARCHAR(6) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,AD_Val_Rule_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212803,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.',0,22,'N','N',104,TO_TIMESTAMP('2016-07-05 20:49:12','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','Organizational entity within client','AD_Org_ID','Organization','@#AD_Org_ID@','N','2dcae5cd-6fdb-436d-afeb-ae8098ab0b7f',100,'Y','N','N','D',113,19,200210)
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_Org_ID NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203019,TO_TIMESTAMP('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),0,'Tenant of User','Tenant of User','AD_UserClient_ID','fddba35b-0026-4aaf-8550-386fca53dc3d',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212804,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,0,10,'N','N',TO_TIMESTAMP('2016-07-05 20:49:13','YYYY-MM-DD HH24:MI:SS'),'N','N','Y',100,'N','AD_UserClient_ID','Tenant of User','N','6c813190-2366-445e-a57e-c07d8ad0b039',100,'Y','N','N','N','ADUserClient_ADCtxHelpSuggesti',203019,18,129,200210)
+;
+
+-- Jul 5, 2016 8:49:13 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_UserClient_ID NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,FKConstraintName,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212805,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The User identifies a unique user in the system. This could be an internal user or a business partner contact',0,10,'N','N',TO_TIMESTAMP('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','User within the system - Internal or Business Partner Contact','AD_User_ID','User/Contact','N','17f91d87-08bd-4922-ad15-e5e53f47b955',100,'Y','N','N','N','ADUser_ADCtxHelpSuggestion',138,19,200210)
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AD_User_ID NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212806,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Created field indicates the date that this record was created.',0,7,'N','N',TO_TIMESTAMP('2016-07-05 20:49:14','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','Date this record was created','Created','Created','SYSDATE','N','9b44d677-9e7a-4773-895a-5de84574cbe1',100,'Y','N','N','N',245,16,200210)
+;
+
+-- Jul 5, 2016 8:49:14 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN Created TIMESTAMP DEFAULT statement_timestamp() NOT NULL
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212807,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Created By field indicates the user who created this record.',0,22,'N','N',TO_TIMESTAMP('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'N','N','N',100,'N','User who created this records','CreatedBy','Created By','N','023f197c-3fd7-4838-825b-4da2c1629e47',100,'Y','N','N','D',246,18,110,200210)
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN CreatedBy NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212808,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Message Text indicates the message that will display ',0,2000,'N','N',TO_TIMESTAMP('2016-07-05 20:49:15','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'Y','Textual Informational, Menu or Error Message','MsgText','Message Text','N','34f589b2-f0bd-4c2f-96be-a48bd7ecfbbd',100,'Y','N','N','N',463,14,200210)
+;
+
+-- Jul 5, 2016 8:49:15 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN MsgText VARCHAR(2000) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:16 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212809,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reports.
+There are two reasons for de-activating and not deleting records:
+(1) The system requires the record for audit purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are invoices for this partner record existing. You de-activate the Business Partner and prevent that this record is used for future entries.',0,1,'N','N',TO_TIMESTAMP('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','The record is active in the system','IsActive','Active','Y','N','e86dd94b-8edd-4dc3-91c5-01e4fb268140',100,'Y','N','N','N',348,20,200210)
+;
+
+-- Jul 5, 2016 8:49:16 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:16 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212810,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Approved checkbox indicates if this document requires approval before it can be processed.',0,1,'N','N',TO_TIMESTAMP('2016-07-05 20:49:16','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','Indicates if this document requires approval','IsApproved','Approved','N','N','6ef2b833-9691-4353-ad1b-d2b09ab90803',100,'Y','N','N','N',351,20,200210)
+;
+
+-- Jul 5, 2016 8:49:17 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN IsApproved CHAR(1) DEFAULT 'N' CHECK (IsApproved IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:17 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212811,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Processed checkbox indicates that a document has been processed.',0,1,'N','N',TO_TIMESTAMP('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','The document has been processed','Processed','Processed','N','N','0c0cde02-0b0e-4ff3-95e7-df230cc96d0a',100,'Y','N','N','N',1047,20,200210)
+;
+
+-- Jul 5, 2016 8:49:17 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN Processed CHAR(1) DEFAULT 'N' CHECK (Processed IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212812,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Updated field indicates the date that this record was updated.',0,7,'N','N',TO_TIMESTAMP('2016-07-05 20:49:17','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','Date this record was updated','Updated','Updated','SYSDATE','N','e52797cb-9333-4ade-b80f-d58594f31a17',100,'Y','N','N','N',607,16,200210)
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN Updated TIMESTAMP DEFAULT statement_timestamp() NOT NULL
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,212813,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'The Updated By field indicates the user who updated this record.',0,22,'N','N',TO_TIMESTAMP('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','User who updated this records','UpdatedBy','Updated By','N','3927ef9f-a095-4589-ab18-4fa7494ca478',100,'Y','N','N','D',608,18,110,200210)
+;
+
+-- Jul 5, 2016 8:49:18 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN UpdatedBy NUMERIC(10) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:19 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203023,TO_TIMESTAMP('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:18','YYYY-MM-DD HH24:MI:SS'),0,'Accept suggested changes','Accept','Accept','AcceptSuggestion','1105db44-6e5d-4ca3-b999-b6862b636e38',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:19 PM MYT
+INSERT INTO AD_Process (AD_Process_ID,Classname,Created,CreatedBy,Value,CopyFromProcess,AD_Process_UU,IsReport,AccessLevel,IsDirectPrint,IsBetaFunctionality,Updated,IsServerProcess,AD_Client_ID,ShowHelp,EntityType,Name,Statistic_Seconds,Statistic_Count,UpdatedBy,Description,IsActive,AD_Org_ID) VALUES (200096,'org.adempiere.base.process.AcceptCtxHelpSuggestion',TO_TIMESTAMP('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),100,'AcceptCtxHelpSuggestion','N','dbabdf46-c3bc-4e02-ab0a-f61f6ae60b4b','N','4','N','N',TO_TIMESTAMP('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),'N',0,'Y','D','Accept Context Help Suggestion',4,4,100,'Accept suggested changes for context help','Y',0)
+;
+
+-- Jul 5, 2016 8:49:19 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Help,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203028,TO_TIMESTAMP('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),'Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system',TO_TIMESTAMP('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),0,'Apply changes as tenant customization','Save As Tenant Customization','Save As Tenant Customization','IsSaveAsTenantCustomization','d41d4789-83ca-4fc6-aa4b-75889746bf81',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:20 PM MYT
+INSERT INTO AD_Process_Para (AD_Process_Para_ID,Updated,IsEncrypted,Help,AD_Reference_ID,SeqNo,FieldLength,IsRange,IsCentrallyMaintained,IsMandatory,Created,AD_Client_ID,EntityType,Name,Description,ColumnName,UpdatedBy,AD_Org_ID,CreatedBy,DefaultValue,IsActive,AD_Process_Para_UU,AD_Element_ID,AD_Process_ID) VALUES (200178,TO_TIMESTAMP('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),'N','Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system',20,10,1,'N','Y','Y',TO_TIMESTAMP('2016-07-05 20:49:19','YYYY-MM-DD HH24:MI:SS'),0,'D','Save As Tenant Customization','Apply changes as tenant customization','IsSaveAsTenantCustomization',100,0,100,'N','Y','b6836b0b-6d3a-4f4a-8344-05fd04ee1ffa',203028,200096)
+;
+
+-- Jul 5, 2016 8:49:20 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Process_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212814,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','N','N',0,0,1,'N','N',200096,TO_TIMESTAMP('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),'Y','N','N',100,'N','Accept suggested changes','AcceptSuggestion','Accept','N','6523b5b2-7f9e-4595-9976-1a0550ec9b35',100,'Y','N','N','N',203023,28,200210)
+;
+
+-- Jul 5, 2016 8:49:20 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN AcceptSuggestion CHAR(1) DEFAULT NULL 
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203022,TO_TIMESTAMP('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:20','YYYY-MM-DD HH24:MI:SS'),0,'Reject suggested changes','Reject','Reject','RejectSuggestion','8b1c3a36-511a-4506-9d3b-cd8932034fab',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+INSERT INTO AD_Process (AD_Process_ID,Classname,Created,CreatedBy,Value,CopyFromProcess,AD_Process_UU,IsReport,AccessLevel,IsDirectPrint,IsBetaFunctionality,Updated,IsServerProcess,AD_Client_ID,ShowHelp,EntityType,Name,Statistic_Seconds,Statistic_Count,UpdatedBy,Description,IsActive,AD_Org_ID) VALUES (200097,'org.adempiere.base.process.RejectCtxHelpSuggestion',TO_TIMESTAMP('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),100,'RejectCtxHelpSuggestion','N','9e375e8d-dfff-446d-be92-8a6104c76717','N','4','N','N',TO_TIMESTAMP('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),'N',0,'Y','D','Reject Context Help Suggestion',1,1,100,'Reject suggested changes for context help','Y',0)
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Process_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212815,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','N','N',0,0,1,'N','N',200097,TO_TIMESTAMP('2016-07-05 20:49:21','YYYY-MM-DD HH24:MI:SS'),'Y','N','N',100,'N','Reject suggested changes','RejectSuggestion','Reject','N','0cd1e13e-0b60-4d46-9e1e-dc01ca5243b3',100,'Y','N','N','N',203022,28,200210)
+;
+
+-- Jul 5, 2016 8:49:21 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN RejectSuggestion CHAR(1) DEFAULT NULL 
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+INSERT INTO AD_Element (AD_Element_ID,Updated,Created,AD_Client_ID,Description,Name,PrintName,ColumnName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType) VALUES (203024,TO_TIMESTAMP('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),0,'Compare suggested text with original text','Compare','Compare','CompareSuggestion','aea1e79d-ca75-48ef-b806-a6290a1de6fe',0,100,100,'Y','D')
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+INSERT INTO AD_Process (AD_Process_ID,Created,CreatedBy,Value,CopyFromProcess,AD_Process_UU,IsReport,AccessLevel,IsDirectPrint,IsBetaFunctionality,Updated,IsServerProcess,AD_Client_ID,ShowHelp,EntityType,Name,Statistic_Seconds,Statistic_Count,UpdatedBy,IsActive,AD_Org_ID,AD_Form_ID) VALUES (200098,TO_TIMESTAMP('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),100,'CompareCtxHelpSuggestion','N','830ac0f4-128c-4e61-9cb7-f2bb6bdcb7d0','N','4','N','N',TO_TIMESTAMP('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),'N',0,'N','D','Compare Context Help Suggestion',0,0,100,'Y',0,200010)
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Version,FieldLength,IsKey,IsTranslated,AD_Process_ID,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212816,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','N','N',0,0,1,'N','N',200098,TO_TIMESTAMP('2016-07-05 20:49:22','YYYY-MM-DD HH24:MI:SS'),'Y','N','N',100,'N','Compare suggested text with original text','CompareSuggestion','Compare','N','b995f823-f29c-43e7-8d27-8a7f072ed83e',100,'Y','N','N','N',203024,28,200210)
+;
+
+-- Jul 5, 2016 8:49:22 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN CompareSuggestion CHAR(1) DEFAULT NULL 
+;
+
+-- Jul 5, 2016 8:49:23 PM MYT
+INSERT INTO AD_Column (SeqNoSelection,AD_Column_ID,IsAlwaysUpdateable,IsSyncDatabase,AD_Client_ID,AD_Org_ID,Updated,EntityType,IsSecure,IsEncrypted,IsParent,IsMandatory,IsIdentifier,SeqNo,Help,Version,FieldLength,IsKey,IsTranslated,Created,IsUpdateable,IsAutocomplete,IsAllowLogging,CreatedBy,IsAllowCopy,Description,ColumnName,Name,DefaultValue,IsSelectionColumn,AD_Column_UU,UpdatedBy,IsActive,IsToolbarButton,IsUseLuceneIndex,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Table_ID) VALUES (0,212817,'N','Y',0,0,TO_TIMESTAMP('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'D','N','N','N','Y','N',0,'Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system',0,1,'N','N',TO_TIMESTAMP('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'Y','N','Y',100,'N','Apply changes as tenant customization','IsSaveAsTenantCustomization','Save As Tenant Customization','N','N','54b65699-0feb-4537-bdb3-cd20c0b1c24d',100,'Y','N','N','N',203028,20,200210)
+;
+
+-- Jul 5, 2016 8:49:23 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD COLUMN IsSaveAsTenantCustomization CHAR(1) DEFAULT 'N' CHECK (IsSaveAsTenantCustomization IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2016 8:49:24 PM MYT
+INSERT INTO AD_Tab (ImportFields,Processing,AD_Client_ID,AD_Org_ID,Updated,EntityType,WhereClause,IsSingleRow,SeqNo,HasTree,AD_Tab_ID,IsReadOnly,IsSortTab,TabLevel,Created,IsInsertRecord,IsAdvancedTab,CreatedBy,Name,UpdatedBy,IsTranslationTab,IsInfoTab,IsActive,AD_Tab_UU,AD_Table_ID,TreeDisplayedOn,AD_Window_ID) VALUES ('N','N',0,0,TO_TIMESTAMP('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'D','Processed=''N''','Y',10,'N',200216,'N','N',0,TO_TIMESTAMP('2016-07-05 20:49:23','YYYY-MM-DD HH24:MI:SS'),'Y','N',100,'Suggestion',100,'N','N','Y','335fe0e0-5044-4262-9e4b-0fdfe35a38fd',200210,'M',200088)
+;
+
+-- Jul 5, 2016 8:49:24 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204252,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'N','N','N','N','N',0,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help Suggestion','N',22,'7a65e820-9743-4835-b97b-c6c1e80766a6','Y',1,'N','N',212800,200216)
+;
+
+-- Jul 5, 2016 8:49:24 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204253,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'N','N','N','N','Y',0,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:24','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help Suggestion UUID','N',36,'2f9a21c3-5a52-42e2-a03c-169c6165f885','Y',1,'N','N',212801,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204258,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','The Approved checkbox indicates if this document requires approval before it can be processed.','N','N','N','Y',0,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Approved','Indicates if this document requires approval','N',1,'e7670815-650e-4169-a0a8-102c07fe7318','Y',1,'N','N',212810,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204259,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','The Processed checkbox indicates that a document has been processed.','N','N','N','Y',0,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Processed','The document has been processed','N',1,'6bb39c69-3ce1-4ed4-93d9-5f45692e28d3','Y',1,'N','N',212811,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204263,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','Changes is keep as tenant specific customization and wouldn''t effect other tenants in the system','N','N','N','Y',0,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Save As Tenant Customization','Apply changes as tenant customization','N',1,'9fefd083-93e6-4c26-b059-0f9c781e9879','Y',1,'N','N',212817,200216)
+;
+
+-- Jul 5, 2016 8:49:25 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204251,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'N','N','N','N','Y',0,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:25','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help Message','N',22,'b090049b-8417-489f-88bc-18571ec62b60','Y',1,'N','N',212799,200216)
+;
+
+-- Jul 5, 2016 8:49:26 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204248,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'N','A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.','Y','N','N','N',10,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Client','Client/Tenant for this installation.','N',22,'1a29ddcf-ff2c-4834-8119-6c7b35fcfa78','Y',1,'N','N',212797,200216)
+;
+
+-- Jul 5, 2016 8:49:26 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsAllowCopy,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204249,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'N','Y','An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.','Y','N','N','N',20,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Organization','Organizational entity within client','N',22,'d7fa999d-4130-4b8c-b5aa-a8c1df846a29','Y',4,'N','N',212803,200216)
+;
+
+-- Jul 5, 2016 8:49:26 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204250,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',30,'Y','Y',TO_TIMESTAMP('2016-07-05 20:49:26','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Context Help','N',10,'f3ca9572-0e9c-486e-8f2b-0b5f8413048e','Y',1,'N','N',212798,200216)
+;
+
+-- Jul 5, 2016 8:49:27 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204254,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','The Language identifies the language to use for display and formatting','Y','N','N','Y',40,'Y','Y',TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Language','Language for this entity','N',6,'e019e08d-63d0-411f-8812-e5a9120f2caa','Y',4,'N','N',212802,200216)
+;
+
+-- Jul 5, 2016 8:49:27 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204256,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','The User identifies a unique user in the system. This could be an internal user or a business partner contact','Y','N','N','Y',50,'Y','Y',TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'User/Contact','User within the system - Internal or Business Partner Contact','N',10,'6cdb0b43-9888-48ef-bfec-58965b0a3789','Y',1,'N','N',212805,200216)
+;
+
+-- Jul 5, 2016 8:49:27 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204255,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',60,'Y','Y',TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Tenant of User','N',10,'3cf3f5e9-180a-4023-8c89-c299d393fc72','Y',4,'N','N',212804,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204264,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'N','There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reports.
+There are two reasons for de-activating and not deleting records:
+(1) The system requires the record for audit purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are invoices for this partner record existing. You de-activate the Business Partner and prevent that this record is used for future entries.','Y','N','N','Y',70,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:27','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Active','The record is active in the system','N',1,'6e82ce54-836f-4ef7-8d90-3b4624deb3c6','Y',2,'N','N',212809,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,Help,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (5,8,204257,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','The Message Text indicates the message that will display ','Y','N','N','Y',80,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Message Text','Textual Informational, Menu or Error Message','N',2000,'cb0bef2e-0e8c-4f8b-8d5a-da88453eca18','Y',1,'N','N',212808,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204262,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',90,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Compare','Compare suggested text with original text','N',1,'58fd277a-85e0-48e8-b15d-77ceccfec563','Y',2,'N','N',212816,200216)
+;
+
+-- Jul 5, 2016 8:49:28 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204261,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',100,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Reject','Reject suggested changes','N',1,'f5e8615b-43ef-4681-9a3f-e84cda031a7d','Y',2,'N','N',212815,200216)
+;
+
+-- Jul 5, 2016 8:49:29 PM MYT
+INSERT INTO AD_Field (ColumnSpan,NumLines,AD_Field_ID,IsQuickEntry,AD_Client_ID,AD_Org_ID,Updated,IsHeading,IsDisplayed,IsFieldOnly,IsSameLine,IsDisplayedGrid,SeqNo,IsReadOnly,IsCentrallyMaintained,Created,EntityType,CreatedBy,UpdatedBy,Name,Description,IsEncrypted,DisplayLength,AD_Field_UU,IsActive,XPosition,IsAdvancedField,IsDefaultFocus,AD_Column_ID,AD_Tab_ID) VALUES (2,1,204260,'N',0,0,TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'N','Y','N','N','Y',110,'N','Y',TO_TIMESTAMP('2016-07-05 20:49:28','YYYY-MM-DD HH24:MI:SS'),'D',100,100,'Accept','Accept suggested changes','N',1,'c0c7dcde-67ee-4b93-8587-1396dd215355','Y',5,'N','N',212814,200216)
+;
+
+-- Jul 5, 2016 8:49:30 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADCtxHelp_ADCtxHelpSuggestion FOREIGN KEY (AD_CtxHelp_ID) REFERENCES ad_ctxhelp(ad_ctxhelp_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADCtxHelpMsg_ADCtxHelpSuggesti FOREIGN KEY (AD_CtxHelpMsg_ID) REFERENCES ad_ctxhelpmsg(ad_ctxhelpmsg_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADLanguage_ADCtxHelpSuggestion FOREIGN KEY (AD_Language) REFERENCES ad_language(ad_language) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADUserClient_ADCtxHelpSuggesti FOREIGN KEY (AD_UserClient_ID) REFERENCES ad_client(ad_client_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+-- Jul 5, 2016 8:49:32 PM MYT
+ALTER TABLE AD_CtxHelpSuggestion ADD CONSTRAINT ADUser_ADCtxHelpSuggestion FOREIGN KEY (AD_User_ID) REFERENCES ad_user(ad_user_id) DEFERRABLE INITIALLY DEFERRED
+;
+
+SELECT register_migration_script('201607051800_Ticket_1006079.sql') FROM dual
+;
+
diff --git a/org.adempiere.base.process/src/org/adempiere/base/process/AcceptCtxHelpSuggestion.java b/org.adempiere.base.process/src/org/adempiere/base/process/AcceptCtxHelpSuggestion.java
new file mode 100644
index 0000000000..f8095c47c5
--- /dev/null
+++ b/org.adempiere.base.process/src/org/adempiere/base/process/AcceptCtxHelpSuggestion.java
@@ -0,0 +1,154 @@
+/**
+ * 
+ */
+package org.adempiere.base.process;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+
+import org.compiere.model.I_AD_CtxHelpMsg;
+import org.compiere.model.MCtxHelpMsg;
+import org.compiere.model.Query;
+import org.compiere.model.X_AD_CtxHelpSuggestion;
+import org.compiere.process.ProcessInfoParameter;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Util;
+
+/**
+ * @author hengsin
+ *
+ */
+public class AcceptCtxHelpSuggestion extends SvrProcess {
+
+	private boolean p_isSaveAsTenantCustomization;
+
+	/**
+	 * 
+	 */
+	public AcceptCtxHelpSuggestion() {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.compiere.process.SvrProcess#prepare()
+	 */
+	@Override
+	protected void prepare() {
+		for (ProcessInfoParameter para : getParameter())
+		{
+			String name = para.getParameterName();
+			if (para.getParameter() == null)
+				;
+			else if (name.equals("IsSaveAsTenantCustomization"))
+				p_isSaveAsTenantCustomization = para.getParameterAsBoolean();
+			else
+				log.log(Level.WARNING, "Unknown Parameter: " + name);
+		}
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.compiere.process.SvrProcess#doIt()
+	 */
+	@Override
+	protected String doIt() throws Exception {
+		X_AD_CtxHelpSuggestion suggestion = new X_AD_CtxHelpSuggestion(Env.getCtx(), getRecord_ID(), get_TrxName());
+		if (p_isSaveAsTenantCustomization)
+		{
+			int AD_Client_ID = suggestion.getAD_UserClient_ID();
+			int AD_User_ID = suggestion.getAD_User_ID();
+			return updateOrInsert(suggestion, AD_Client_ID, AD_User_ID);
+		}
+		else 
+			return updateOrInsert(suggestion, 0, Env.getAD_User_ID(getCtx()));
+	}
+
+	private String updateOrInsert(X_AD_CtxHelpSuggestion suggestion, int AD_Client_ID, int AD_User_ID) {
+		boolean changed = false;
+		String AD_Language = suggestion.getAD_Language();
+		
+		int AD_CtxHelpMsg_ID = suggestion.getAD_CtxHelpMsg_ID();
+		if (Env.isBaseLanguage(AD_Language, I_AD_CtxHelpMsg.Table_Name)) {
+			Query query = new Query(Env.getCtx(), I_AD_CtxHelpMsg.Table_Name, "AD_CtxHelp_ID=? AND IsActive='Y' AND AD_Client_ID=?", get_TrxName());
+			MCtxHelpMsg msg = query.setParameters(suggestion.getAD_CtxHelp_ID(), AD_Client_ID).first();
+			if (msg != null) {
+				msg.setMsgText(suggestion.getMsgText());
+				if (msg.is_Changed()) {
+					msg.saveEx();
+					changed = true;
+				}
+				if (msg.getAD_CtxHelpMsg_ID() != AD_CtxHelpMsg_ID) {
+					AD_CtxHelpMsg_ID = msg.getAD_CtxHelpMsg_ID();
+				}
+			} else {
+				msg = new MCtxHelpMsg(Env.getCtx(), 0, get_TrxName());
+				msg.setAD_CtxHelp_ID(suggestion.getAD_CtxHelp_ID());
+				msg.setMsgText(suggestion.getMsgText());
+				msg.setClientOrg(AD_Client_ID, 0);
+				msg.saveEx();
+				AD_CtxHelpMsg_ID = msg.getAD_CtxHelpMsg_ID();
+				changed = true;
+			}
+		} else {
+			MCtxHelpMsg ctxHelpMsg = new MCtxHelpMsg(Env.getCtx(), AD_CtxHelpMsg_ID, get_TrxName());
+			if (ctxHelpMsg.getAD_Client_ID() != AD_Client_ID) {
+				MCtxHelpMsg newMsg = new MCtxHelpMsg(Env.getCtx(), 0, get_TrxName());
+				newMsg.setClientOrg(AD_Client_ID, 0);
+				newMsg.setAD_CtxHelp_ID(ctxHelpMsg.getAD_CtxHelp_ID());
+				newMsg.setMsgText(ctxHelpMsg.getMsgText());
+				newMsg.setIsActive(true);
+				newMsg.saveEx();
+				AD_CtxHelpMsg_ID = newMsg.getAD_CtxHelpMsg_ID();
+			}
+		}
+		
+		String original = DB.getSQLValueStringEx(get_TrxName(), "SELECT MsgText FROM AD_CtxHelpMsg_Trl WHERE AD_CtxHelpMsg_ID=? AND AD_Client_ID=? " +
+				"AND IsActive='Y' AND AD_Language=?", AD_CtxHelpMsg_ID, AD_Client_ID, suggestion.getAD_Language());
+		if (original != null) {
+			if (!original.equals(suggestion.getMsgText())) {
+				List<Object> params = new ArrayList<Object>();
+				StringBuilder update = new StringBuilder("UPDATE AD_CtxHelpMsg_Trl SET ");
+				if (!Util.isEmpty(suggestion.getMsgText())) {
+					update.append("MsgText=? ");
+					params.add(suggestion.getMsgText());
+				}
+				
+				if (!params.isEmpty()) {
+					update.append("WHERE AD_CtxHelpMsg_ID=? AND AD_Language=? AND AD_Client_ID=?");
+					params.add(AD_CtxHelpMsg_ID);
+					params.add(suggestion.getAD_Language());
+					params.add(AD_Client_ID);
+					DB.executeUpdateEx(update.toString(), params.toArray(), get_TrxName());
+					changed = true;
+				}			
+			}
+		} else {			
+			StringBuilder insert = new StringBuilder("Insert Into AD_CtxHelpMsg_Trl (AD_Client_ID, AD_Org_ID, AD_CtxHelpMsg_ID, IsActive, IsTranslated, AD_Language, MsgText,");
+			insert.append("Created, CreatedBy, Updated, UpdatedBy, AD_CtxHelpMsg_Trl_UU)")
+				.append(" Values (?, ?, ?, 'Y', 'N', ?, ?, now(), ?, now(), ?, generate_uuid()) ");
+			List<Object> params = new ArrayList<Object>();
+			params.add(AD_Client_ID);
+			params.add(0);
+			params.add(AD_CtxHelpMsg_ID);
+			params.add(AD_Language);
+			params.add(suggestion.getMsgText());
+			params.add(AD_User_ID);
+			params.add(AD_User_ID);
+			DB.executeUpdateEx(insert.toString(), params.toArray(), get_TrxName());
+			changed = true;
+		}
+		
+		suggestion.setIsApproved(true);
+		suggestion.setIsSaveAsTenantCustomization(AD_Client_ID > 0);
+		suggestion.setProcessed(true);
+		suggestion.saveEx();
+		
+		if (changed) {
+			return "Suggestion accepted and applied to context help";
+		} else {
+			return "No changes found";
+		}
+	}
+}
diff --git a/org.adempiere.base.process/src/org/adempiere/base/process/RejectCtxHelpSuggestion.java b/org.adempiere.base.process/src/org/adempiere/base/process/RejectCtxHelpSuggestion.java
new file mode 100644
index 0000000000..b89faec6e6
--- /dev/null
+++ b/org.adempiere.base.process/src/org/adempiere/base/process/RejectCtxHelpSuggestion.java
@@ -0,0 +1,36 @@
+/**
+ * 
+ */
+package org.adempiere.base.process;
+
+import org.compiere.model.X_AD_CtxHelpSuggestion;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.Env;
+
+/**
+ * @author hengsin
+ *
+ */
+public class RejectCtxHelpSuggestion extends SvrProcess {
+
+	/**
+	 * 
+	 */
+	public RejectCtxHelpSuggestion() {
+	}
+
+	@Override
+	protected void prepare() {
+	}
+
+	@Override
+	protected String doIt() throws Exception {
+		X_AD_CtxHelpSuggestion  suggestion = new X_AD_CtxHelpSuggestion(Env.getCtx(), getRecord_ID(),get_TrxName());
+		suggestion.setIsApproved(false);
+		suggestion.setProcessed(true);
+		suggestion.saveEx();
+		
+		return "Suggestion rejected";
+	}
+
+}
diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java
new file mode 100644
index 0000000000..d1f226025d
--- /dev/null
+++ b/org.adempiere.base/src/org/compiere/model/I_AD_CtxHelpSuggestion.java
@@ -0,0 +1,277 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+package org.compiere.model;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import org.compiere.util.KeyNamePair;
+
+/** Generated Interface for AD_CtxHelpSuggestion
+ *  @author iDempiere (generated) 
+ *  @version Release 2.0
+ */
+public interface I_AD_CtxHelpSuggestion 
+{
+
+    /** TableName=AD_CtxHelpSuggestion */
+    public static final String Table_Name = "AD_CtxHelpSuggestion";
+
+    /** AD_Table_ID=200210 */
+    public static final int Table_ID = 200210;
+
+    KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name);
+
+    /** AccessLevel = 4 - System 
+     */
+    BigDecimal accessLevel = BigDecimal.valueOf(4);
+
+    /** Load Meta Data */
+
+    /** Column name AcceptSuggestion */
+    public static final String COLUMNNAME_AcceptSuggestion = "AcceptSuggestion";
+
+	/** Set Accept.
+	  * Accept suggested changes
+	  */
+	public void setAcceptSuggestion (String AcceptSuggestion);
+
+	/** Get Accept.
+	  * Accept suggested changes
+	  */
+	public String getAcceptSuggestion();
+
+    /** Column name AD_Client_ID */
+    public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
+
+	/** Get Client.
+	  * Client/Tenant for this installation.
+	  */
+	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_CtxHelpMsg_ID */
+    public static final String COLUMNNAME_AD_CtxHelpMsg_ID = "AD_CtxHelpMsg_ID";
+
+	/** Set Context Help Message	  */
+	public void setAD_CtxHelpMsg_ID (int AD_CtxHelpMsg_ID);
+
+	/** Get Context Help Message	  */
+	public int getAD_CtxHelpMsg_ID();
+
+	public org.compiere.model.I_AD_CtxHelpMsg getAD_CtxHelpMsg() throws RuntimeException;
+
+    /** Column name AD_CtxHelpSuggestion_ID */
+    public static final String COLUMNNAME_AD_CtxHelpSuggestion_ID = "AD_CtxHelpSuggestion_ID";
+
+	/** Set Context Help Suggestion	  */
+	public void setAD_CtxHelpSuggestion_ID (int AD_CtxHelpSuggestion_ID);
+
+	/** Get Context Help Suggestion	  */
+	public int getAD_CtxHelpSuggestion_ID();
+
+    /** Column name AD_CtxHelpSuggestion_UU */
+    public static final String COLUMNNAME_AD_CtxHelpSuggestion_UU = "AD_CtxHelpSuggestion_UU";
+
+	/** Set Context Help Suggestion UUID	  */
+	public void setAD_CtxHelpSuggestion_UU (String AD_CtxHelpSuggestion_UU);
+
+	/** Get Context Help Suggestion UUID	  */
+	public String getAD_CtxHelpSuggestion_UU();
+
+    /** Column name AD_Language */
+    public static final String COLUMNNAME_AD_Language = "AD_Language";
+
+	/** Set Language.
+	  * Language for this entity
+	  */
+	public void setAD_Language (String AD_Language);
+
+	/** Get Language.
+	  * Language for this entity
+	  */
+	public String getAD_Language();
+
+    /** Column name AD_Org_ID */
+    public static final String COLUMNNAME_AD_Org_ID = "AD_Org_ID";
+
+	/** Set Organization.
+	  * Organizational entity within client
+	  */
+	public void setAD_Org_ID (int AD_Org_ID);
+
+	/** Get Organization.
+	  * Organizational entity within client
+	  */
+	public int getAD_Org_ID();
+
+    /** Column name AD_UserClient_ID */
+    public static final String COLUMNNAME_AD_UserClient_ID = "AD_UserClient_ID";
+
+	/** Set Tenant of User	  */
+	public void setAD_UserClient_ID (int AD_UserClient_ID);
+
+	/** Get Tenant of User	  */
+	public int getAD_UserClient_ID();
+
+    /** Column name AD_User_ID */
+    public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
+
+	/** Set User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID);
+
+	/** Get User/Contact.
+	  * User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID();
+
+	public org.compiere.model.I_AD_User getAD_User() throws RuntimeException;
+
+    /** Column name CompareSuggestion */
+    public static final String COLUMNNAME_CompareSuggestion = "CompareSuggestion";
+
+	/** Set Compare.
+	  * Compare suggested text with original text
+	  */
+	public void setCompareSuggestion (String CompareSuggestion);
+
+	/** Get Compare.
+	  * Compare suggested text with original text
+	  */
+	public String getCompareSuggestion();
+
+    /** Column name Created */
+    public static final String COLUMNNAME_Created = "Created";
+
+	/** Get Created.
+	  * Date this record was created
+	  */
+	public Timestamp getCreated();
+
+    /** Column name CreatedBy */
+    public static final String COLUMNNAME_CreatedBy = "CreatedBy";
+
+	/** Get Created By.
+	  * User who created this records
+	  */
+	public int getCreatedBy();
+
+    /** Column name IsActive */
+    public static final String COLUMNNAME_IsActive = "IsActive";
+
+	/** Set Active.
+	  * The record is active in the system
+	  */
+	public void setIsActive (boolean IsActive);
+
+	/** Get Active.
+	  * The record is active in the system
+	  */
+	public boolean isActive();
+
+    /** Column name IsApproved */
+    public static final String COLUMNNAME_IsApproved = "IsApproved";
+
+	/** Set Approved.
+	  * Indicates if this document requires approval
+	  */
+	public void setIsApproved (boolean IsApproved);
+
+	/** Get Approved.
+	  * Indicates if this document requires approval
+	  */
+	public boolean isApproved();
+
+    /** Column name IsSaveAsTenantCustomization */
+    public static final String COLUMNNAME_IsSaveAsTenantCustomization = "IsSaveAsTenantCustomization";
+
+	/** Set Save As Tenant Customization.
+	  * Apply changes as tenant customization
+	  */
+	public void setIsSaveAsTenantCustomization (boolean IsSaveAsTenantCustomization);
+
+	/** Get Save As Tenant Customization.
+	  * Apply changes as tenant customization
+	  */
+	public boolean isSaveAsTenantCustomization();
+
+    /** Column name MsgText */
+    public static final String COLUMNNAME_MsgText = "MsgText";
+
+	/** Set Message Text.
+	  * Textual Informational, Menu or Error Message
+	  */
+	public void setMsgText (String MsgText);
+
+	/** Get Message Text.
+	  * Textual Informational, Menu or Error Message
+	  */
+	public String getMsgText();
+
+    /** Column name Processed */
+    public static final String COLUMNNAME_Processed = "Processed";
+
+	/** Set Processed.
+	  * The document has been processed
+	  */
+	public void setProcessed (boolean Processed);
+
+	/** Get Processed.
+	  * The document has been processed
+	  */
+	public boolean isProcessed();
+
+    /** Column name RejectSuggestion */
+    public static final String COLUMNNAME_RejectSuggestion = "RejectSuggestion";
+
+	/** Set Reject.
+	  * Reject suggested changes
+	  */
+	public void setRejectSuggestion (String RejectSuggestion);
+
+	/** Get Reject.
+	  * Reject suggested changes
+	  */
+	public String getRejectSuggestion();
+
+    /** Column name Updated */
+    public static final String COLUMNNAME_Updated = "Updated";
+
+	/** Get Updated.
+	  * Date this record was updated
+	  */
+	public Timestamp getUpdated();
+
+    /** Column name UpdatedBy */
+    public static final String COLUMNNAME_UpdatedBy = "UpdatedBy";
+
+	/** Get Updated By.
+	  * User who updated this records
+	  */
+	public int getUpdatedBy();
+}
diff --git a/org.adempiere.base/src/org/compiere/model/MCtxHelpMsg.java b/org.adempiere.base/src/org/compiere/model/MCtxHelpMsg.java
index d3b48f32b7..584a6bf2b9 100644
--- a/org.adempiere.base/src/org/compiere/model/MCtxHelpMsg.java
+++ b/org.adempiere.base/src/org/compiere/model/MCtxHelpMsg.java
@@ -25,12 +25,10 @@
 
 package org.compiere.model;
 
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 import java.util.logging.Level;
 
-import org.adempiere.exceptions.AdempiereException;
 import org.compiere.util.CCache;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
@@ -50,7 +48,7 @@ public class MCtxHelpMsg extends X_AD_CtxHelpMsg {
 	/**	Logging								*/
 	private static CLogger		s_log = CLogger.getCLogger(MCtxHelpMsg.class);
 	/** Context Help Message Cache				*/
-	private static CCache<String, String> s_cache = new CCache<String, String>(Table_Name, 10);
+	private static CCache<String, MCtxHelpMsg> s_cache = new CCache<String, MCtxHelpMsg>(Table_Name, 10);
 
 	/**
 	 * 	Standard Constructor
@@ -73,20 +71,19 @@ public class MCtxHelpMsg extends X_AD_CtxHelpMsg {
 	}	//	MCtxHelpMsg
 
 	/**
-	 * Get the context help message defined for the type, recordid, language, client, org
+	 * Get the context help message defined for the type, recordid, client, org
 	 * @param ctx
 	 * @param ctxtype
 	 * @param recordId
-	 * @return the message translated
+	 * @return the context message record
 	 */
-	public static String get(Properties ctx, String ctxType, int recordId) {
+	public static MCtxHelpMsg get(Properties ctx, String ctxType, int recordId) {
 		StringBuilder key = new StringBuilder()
 			.append(ctxType).append("|")
 			.append(recordId).append("|")
 			.append(Env.getAD_Client_ID(ctx)).append("|")
-			.append(Env.getAD_Org_ID(ctx)).append("|")
-			.append(Env.getAD_Language(Env.getCtx()));
-		String retValue = null;
+			.append(Env.getAD_Org_ID(ctx));
+		MCtxHelpMsg retValue = null;
 		if (s_cache.containsKey(key.toString())) {
 			retValue = s_cache.get(key.toString());
 			if (s_log.isLoggable(Level.FINEST)) s_log.finest("Cache: " + retValue);
@@ -95,50 +92,11 @@ public class MCtxHelpMsg extends X_AD_CtxHelpMsg {
 
 		int AD_CtxHelp_ID = getCtxHelpID(ctxType, recordId);
 		if (AD_CtxHelp_ID > 0) {
-			StringBuilder sql = new StringBuilder();
-			if (Env.isBaseLanguage(Env.getCtx(), X_AD_CtxHelpMsg.Table_Name)) {
-				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 AD_Client_ID DESC, AD_Org_ID DESC, AD_CtxHelpMsg_ID DESC");
-			} else {
-				sql.append("SELECT mt.MsgText ");    		
-				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.AD_Client_ID DESC, m.AD_Org_ID DESC, m.AD_CtxHelpMsg_ID DESC");
-			}
-
-			PreparedStatement pstmt = null;
-			ResultSet rs = null;
-
-			try {
-				pstmt = DB.prepareStatement(sql.toString(), null);
-				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();
-				if (rs.next())
-					retValue = rs.getString(X_AD_CtxHelpMsg.COLUMNNAME_MsgText);
-			} catch (Exception e) {
-				throw new AdempiereException(e);
-			} finally {
-				DB.close(rs, pstmt);
-				rs=null; pstmt=null; 
-			}
+			Query query = new Query(ctx, I_AD_CtxHelpMsg.Table_Name, "IsActive = 'Y' AND AD_Client_ID IN (0, ?)  AND AD_Org_ID IN (0, ?)  AND AD_CtxHelp_ID = ? ", null);
+			retValue = query.setOrderBy("AD_Client_ID DESC, AD_Org_ID DESC, AD_CtxHelpMsg_ID DESC")
+					.setParameters(Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), AD_CtxHelp_ID)
+					.first();
 		}
-
-		if (retValue == null)
-			retValue = "";
 		s_cache.put(key.toString(), retValue);
 		return retValue;
 	}
@@ -193,4 +151,13 @@ public class MCtxHelpMsg extends X_AD_CtxHelpMsg {
 		return DB.getSQLValue(null, sql.toString(), Env.getAD_Client_ID(ctx), Env.getAD_Org_ID(ctx), ctxType == X_AD_CtxHelp.CTXTYPE_Home ? ctxType : recordId);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.compiere.model.PO#setClientOrg(int, int)
+	 */
+	@Override
+	public void setClientOrg(int AD_Client_ID, int AD_Org_ID) {
+		super.setClientOrg(AD_Client_ID, AD_Org_ID);
+	}
+
+	
 }	//	MCtxHelpMsg
diff --git a/org.adempiere.base/src/org/compiere/model/MCtxHelpSuggestion.java b/org.adempiere.base/src/org/compiere/model/MCtxHelpSuggestion.java
new file mode 100644
index 0000000000..7e8a8bbe82
--- /dev/null
+++ b/org.adempiere.base/src/org/compiere/model/MCtxHelpSuggestion.java
@@ -0,0 +1,46 @@
+/**
+ * 
+ */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/**
+ * @author hengsin
+ *
+ */
+public class MCtxHelpSuggestion extends X_AD_CtxHelpSuggestion {
+
+	/**
+	 * generated serial id
+	 */
+	private static final long serialVersionUID = 1940407803562658708L;
+
+	/**
+	 * @param ctx
+	 * @param AD_CtxHelpSuggestion_ID
+	 * @param trxName
+	 */
+	public MCtxHelpSuggestion(Properties ctx, int AD_CtxHelpSuggestion_ID,
+			String trxName) {
+		super(ctx, AD_CtxHelpSuggestion_ID, trxName);
+	}
+
+	/**
+	 * @param ctx
+	 * @param rs
+	 * @param trxName
+	 */
+	public MCtxHelpSuggestion(Properties ctx, ResultSet rs, String trxName) {
+		super(ctx, rs, trxName);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.compiere.model.PO#setClientOrg(int, int)
+	 */
+	@Override
+	public void setClientOrg(int AD_Client_ID, int AD_Org_ID) {
+		super.setClientOrg(AD_Client_ID, AD_Org_ID);
+	}
+}
diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
new file mode 100644
index 0000000000..87749a0cbe
--- /dev/null
+++ b/org.adempiere.base/src/org/compiere/model/X_AD_CtxHelpSuggestion.java
@@ -0,0 +1,376 @@
+/******************************************************************************
+ * Product: iDempiere ERP & CRM Smart Business Solution                       *
+ * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved.                *
+ * This program is free software, you can redistribute it and/or modify it    *
+ * under the terms version 2 of the GNU General Public License as published   *
+ * by the Free Software Foundation. This program is distributed in the hope   *
+ * that it will be useful, but WITHOUT ANY WARRANTY, without even the implied *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.           *
+ * See the GNU General Public License for more details.                       *
+ * You should have received a copy of the GNU General Public License along    *
+ * with this program, if not, write to the Free Software Foundation, Inc.,    *
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.                     *
+ * For the text or an alternative of this public license, you may reach us    *
+ * ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA        *
+ * or via info@compiere.org or http://www.compiere.org/license.html           *
+ *****************************************************************************/
+/** Generated Model - DO NOT CHANGE */
+package org.compiere.model;
+
+import java.sql.ResultSet;
+import java.util.Properties;
+
+/** Generated Model for AD_CtxHelpSuggestion
+ *  @author iDempiere (generated) 
+ *  @version Release 2.0 - $Id$ */
+public class X_AD_CtxHelpSuggestion extends PO implements I_AD_CtxHelpSuggestion, I_Persistent 
+{
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 20160704L;
+
+    /** Standard Constructor */
+    public X_AD_CtxHelpSuggestion (Properties ctx, int AD_CtxHelpSuggestion_ID, String trxName)
+    {
+      super (ctx, AD_CtxHelpSuggestion_ID, trxName);
+      /** if (AD_CtxHelpSuggestion_ID == 0)
+        {
+			setAD_CtxHelp_ID (0);
+			setAD_CtxHelpMsg_ID (0);
+			setAD_CtxHelpSuggestion_ID (0);
+			setAD_CtxHelpSuggestion_UU (null);
+			setAD_Language (null);
+			setAD_UserClient_ID (0);
+			setAD_User_ID (0);
+			setIsApproved (false);
+// N
+			setIsSaveAsTenantCustomization (false);
+// N
+			setMsgText (null);
+			setProcessed (false);
+// N
+        } */
+    }
+
+    /** Load Constructor */
+    public X_AD_CtxHelpSuggestion (Properties ctx, ResultSet rs, String trxName)
+    {
+      super (ctx, rs, trxName);
+    }
+
+    /** AccessLevel
+      * @return 4 - System 
+      */
+    protected int get_AccessLevel()
+    {
+      return accessLevel.intValue();
+    }
+
+    /** Load Meta Data */
+    protected POInfo initPO (Properties ctx)
+    {
+      POInfo poi = POInfo.getPOInfo (ctx, Table_ID, get_TrxName());
+      return poi;
+    }
+
+    public String toString()
+    {
+      StringBuffer sb = new StringBuffer ("X_AD_CtxHelpSuggestion[")
+        .append(get_ID()).append("]");
+      return sb.toString();
+    }
+
+	/** Set Accept.
+		@param AcceptSuggestion 
+		Accept suggested changes
+	  */
+	public void setAcceptSuggestion (String AcceptSuggestion)
+	{
+		set_Value (COLUMNNAME_AcceptSuggestion, AcceptSuggestion);
+	}
+
+	/** Get Accept.
+		@return Accept suggested changes
+	  */
+	public String getAcceptSuggestion () 
+	{
+		return (String)get_Value(COLUMNNAME_AcceptSuggestion);
+	}
+
+	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_ValueNoCheck (COLUMNNAME_AD_CtxHelp_ID, null);
+		else 
+			set_ValueNoCheck (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_CtxHelpMsg getAD_CtxHelpMsg() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_CtxHelpMsg)MTable.get(getCtx(), org.compiere.model.I_AD_CtxHelpMsg.Table_Name)
+			.getPO(getAD_CtxHelpMsg_ID(), get_TrxName());	}
+
+	/** Set Context Help Message.
+		@param AD_CtxHelpMsg_ID Context Help Message	  */
+	public void setAD_CtxHelpMsg_ID (int AD_CtxHelpMsg_ID)
+	{
+		if (AD_CtxHelpMsg_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_CtxHelpMsg_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_CtxHelpMsg_ID, Integer.valueOf(AD_CtxHelpMsg_ID));
+	}
+
+	/** Get Context Help Message.
+		@return Context Help Message	  */
+	public int getAD_CtxHelpMsg_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelpMsg_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Context Help Suggestion.
+		@param AD_CtxHelpSuggestion_ID Context Help Suggestion	  */
+	public void setAD_CtxHelpSuggestion_ID (int AD_CtxHelpSuggestion_ID)
+	{
+		if (AD_CtxHelpSuggestion_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_CtxHelpSuggestion_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_CtxHelpSuggestion_ID, Integer.valueOf(AD_CtxHelpSuggestion_ID));
+	}
+
+	/** Get Context Help Suggestion.
+		@return Context Help Suggestion	  */
+	public int getAD_CtxHelpSuggestion_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_CtxHelpSuggestion_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Context Help Suggestion UUID.
+		@param AD_CtxHelpSuggestion_UU Context Help Suggestion UUID	  */
+	public void setAD_CtxHelpSuggestion_UU (String AD_CtxHelpSuggestion_UU)
+	{
+		set_ValueNoCheck (COLUMNNAME_AD_CtxHelpSuggestion_UU, AD_CtxHelpSuggestion_UU);
+	}
+
+	/** Get Context Help Suggestion UUID.
+		@return Context Help Suggestion UUID	  */
+	public String getAD_CtxHelpSuggestion_UU () 
+	{
+		return (String)get_Value(COLUMNNAME_AD_CtxHelpSuggestion_UU);
+	}
+
+	/** AD_Language AD_Reference_ID=106 */
+	public static final int AD_LANGUAGE_AD_Reference_ID=106;
+	/** Set Language.
+		@param AD_Language 
+		Language for this entity
+	  */
+	public void setAD_Language (String AD_Language)
+	{
+
+		set_ValueNoCheck (COLUMNNAME_AD_Language, AD_Language);
+	}
+
+	/** Get Language.
+		@return Language for this entity
+	  */
+	public String getAD_Language () 
+	{
+		return (String)get_Value(COLUMNNAME_AD_Language);
+	}
+
+	/** Set Tenant of User.
+		@param AD_UserClient_ID Tenant of User	  */
+	public void setAD_UserClient_ID (int AD_UserClient_ID)
+	{
+		if (AD_UserClient_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_UserClient_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_UserClient_ID, Integer.valueOf(AD_UserClient_ID));
+	}
+
+	/** Get Tenant of User.
+		@return Tenant of User	  */
+	public int getAD_UserClient_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_UserClient_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	public org.compiere.model.I_AD_User getAD_User() throws RuntimeException
+    {
+		return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_Name)
+			.getPO(getAD_User_ID(), get_TrxName());	}
+
+	/** Set User/Contact.
+		@param AD_User_ID 
+		User within the system - Internal or Business Partner Contact
+	  */
+	public void setAD_User_ID (int AD_User_ID)
+	{
+		if (AD_User_ID < 1) 
+			set_ValueNoCheck (COLUMNNAME_AD_User_ID, null);
+		else 
+			set_ValueNoCheck (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
+	}
+
+	/** Get User/Contact.
+		@return User within the system - Internal or Business Partner Contact
+	  */
+	public int getAD_User_ID () 
+	{
+		Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
+		if (ii == null)
+			 return 0;
+		return ii.intValue();
+	}
+
+	/** Set Compare.
+		@param CompareSuggestion 
+		Compare suggested text with original text
+	  */
+	public void setCompareSuggestion (String CompareSuggestion)
+	{
+		set_Value (COLUMNNAME_CompareSuggestion, CompareSuggestion);
+	}
+
+	/** Get Compare.
+		@return Compare suggested text with original text
+	  */
+	public String getCompareSuggestion () 
+	{
+		return (String)get_Value(COLUMNNAME_CompareSuggestion);
+	}
+
+	/** Set Approved.
+		@param IsApproved 
+		Indicates if this document requires approval
+	  */
+	public void setIsApproved (boolean IsApproved)
+	{
+		set_Value (COLUMNNAME_IsApproved, Boolean.valueOf(IsApproved));
+	}
+
+	/** Get Approved.
+		@return Indicates if this document requires approval
+	  */
+	public boolean isApproved () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsApproved);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Save As Tenant Customization.
+		@param IsSaveAsTenantCustomization 
+		Apply changes as tenant customization
+	  */
+	public void setIsSaveAsTenantCustomization (boolean IsSaveAsTenantCustomization)
+	{
+		set_Value (COLUMNNAME_IsSaveAsTenantCustomization, Boolean.valueOf(IsSaveAsTenantCustomization));
+	}
+
+	/** Get Save As Tenant Customization.
+		@return Apply changes as tenant customization
+	  */
+	public boolean isSaveAsTenantCustomization () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsSaveAsTenantCustomization);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Message Text.
+		@param MsgText 
+		Textual Informational, Menu or Error Message
+	  */
+	public void setMsgText (String MsgText)
+	{
+		set_Value (COLUMNNAME_MsgText, MsgText);
+	}
+
+	/** Get Message Text.
+		@return Textual Informational, Menu or Error Message
+	  */
+	public String getMsgText () 
+	{
+		return (String)get_Value(COLUMNNAME_MsgText);
+	}
+
+	/** Set Processed.
+		@param Processed 
+		The document has been processed
+	  */
+	public void setProcessed (boolean Processed)
+	{
+		set_Value (COLUMNNAME_Processed, Boolean.valueOf(Processed));
+	}
+
+	/** Get Processed.
+		@return The document has been processed
+	  */
+	public boolean isProcessed () 
+	{
+		Object oo = get_Value(COLUMNNAME_Processed);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
+	/** Set Reject.
+		@param RejectSuggestion 
+		Reject suggested changes
+	  */
+	public void setRejectSuggestion (String RejectSuggestion)
+	{
+		set_Value (COLUMNNAME_RejectSuggestion, RejectSuggestion);
+	}
+
+	/** Get Reject.
+		@return Reject suggested changes
+	  */
+	public String getRejectSuggestion () 
+	{
+		return (String)get_Value(COLUMNNAME_RejectSuggestion);
+	}
+}
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index a8d48ff9d4..44533378a5 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/daisydiff-min.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 199ef6947b..2255c166e1 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -24,14 +24,17 @@ Import-Package: javax.activation,
  org.apache.tools.ant,
  org.apache.tools.ant.taskdefs,
  org.compiere.css,
+ org.eclipse.core.runtime;version="3.4.0",
  org.osgi.framework;version="1.7.0",
  org.osgi.service.event;version="1.3.0",
  org.osgi.util.tracker;version="1.5.0",
  org.slf4j;version="1.7.2",
  org.slf4j.helpers;version="1.7.2",
- org.slf4j.spi;version="1.7.2"
+ org.slf4j.spi;version="1.7.2",
+ org.springframework.web.util
 DynamicImport-Package: action.images
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ WEB-INF/lib/daisydiff-min.jar
 Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  metainfo.zk,
  org.adempiere.webui,
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/CompareCtxHelpSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/CompareCtxHelpSuggestion.java
new file mode 100644
index 0000000000..dbc49418ab
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/CompareCtxHelpSuggestion.java
@@ -0,0 +1,285 @@
+/**
+ * 
+ */
+package org.adempiere.webui.apps.form;
+
+import java.io.StringWriter;
+
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamResult;
+
+import org.adempiere.webui.adwindow.ADWindow;
+import org.adempiere.webui.component.Column;
+import org.adempiere.webui.component.Columns;
+import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Grid;
+import org.adempiere.webui.component.Row;
+import org.adempiere.webui.component.Rows;
+import org.adempiere.webui.panel.ADForm;
+import org.adempiere.webui.session.SessionManager;
+import org.compiere.model.GridTab;
+import org.compiere.model.X_AD_CtxHelpMsg;
+import org.compiere.util.Env;
+import org.outerj.daisy.diff.DaisyDiff;
+import org.springframework.web.util.HtmlUtils;
+import org.xml.sax.helpers.AttributesImpl;
+import org.zkforge.ckez.CKeditor;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.event.InputEvent;
+import org.zkoss.zul.Cell;
+import org.zkoss.zul.Div;
+import org.zkoss.zul.Html;
+import org.zkoss.zul.Timer;
+import org.zkoss.zul.Vlayout;
+
+/**
+ * @author hengsin
+ *
+ */
+public class CompareCtxHelpSuggestion extends ADForm {
+
+	private static final String NEW_VALUE = "newValue";
+	/**
+	 * generated serial id
+	 */
+	private static final long serialVersionUID = -100362034024824442L;
+	private Grid grid;
+	private ConfirmPanel confirmPanel;
+	private Cell helpDiff;
+	private CKeditor helpTextbox;
+	private X_AD_CtxHelpMsg ctxHelpMsg;
+	private String AD_Language;
+	private Timer helpTimer;
+
+	/**
+	 * 
+	 */
+	public CompareCtxHelpSuggestion() {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.adempiere.webui.panel.ADForm#initForm()
+	 */
+	@Override
+	protected void initForm() {
+		setWidth("90%");
+		setHeight("700px");
+		setSizable(true);
+		Vlayout layout = new Vlayout();
+		layout.setHflex("1");
+		layout.setVflex("1");
+		appendChild(layout);
+		
+		grid = new Grid();
+		grid.setVflex(true);
+		grid.setHflex("1");
+		layout.appendChild(grid);
+		
+		Div div = new Div();
+		div.setSclass("dialog-footer");
+		confirmPanel = new ConfirmPanel(true);
+		confirmPanel.setStyle("padding: 8px 16px;");
+		confirmPanel.setHflex("1");
+		confirmPanel.setVflex("min");
+		div.appendChild(confirmPanel);
+		layout.appendChild(div);
+		confirmPanel.addActionListener(this);
+		
+		helpTimer = new Timer();
+		helpTimer.setDelay(1000);
+		helpTimer.setRepeats(false);		
+		appendChild(helpTimer);
+		helpTimer.stop();
+		helpTimer.addEventListener(Events.ON_TIMER, this);
+		
+		renderGrid();
+	}
+
+	private void renderGrid() {
+		Component c = SessionManager.getAppDesktop().getActiveWindow();
+		ADWindow adwindow = ADWindow.findADWindow(c);
+		GridTab gridTab = adwindow.getADWindowContent().getActiveGridTab();
+		int AD_CtxHelpMsg_ID = (Integer) gridTab.getValue("AD_CtxHelpMsg_ID");
+		ctxHelpMsg = new X_AD_CtxHelpMsg(Env.getCtx(), AD_CtxHelpMsg_ID, null);
+		AD_Language = (String) gridTab.getValue("AD_Language");		
+		
+		Columns columns = new Columns();
+		grid.appendChild(columns);
+		
+		Column column = new Column();
+		column.setLabel("Original Text");
+		column.setValign("top");
+		columns.appendChild(column);
+		
+		column = new Column();
+		column.setLabel("Changed Text");
+		column.setValign("top");
+		columns.appendChild(column);
+		
+		column = new Column();
+		column.setLabel("Difference");
+		column.setValign("top");
+		columns.appendChild(column);
+		
+		Rows rows = grid.newRows();
+		Row row = rows.newRow();
+		
+		String original = ctxHelpMsg.get_Translation("MsgText", AD_Language);
+		if (original != null)
+			original = removeHeaderTag(original);
+		row.appendCellChild(new Html(original));
+		String changed = (String) gridTab.getValue("MsgText");
+		if (changed != null)
+			changed = removeHeaderTag(changed);
+		helpTextbox = new CKeditor();
+		helpTextbox.setCustomConfigurationsPath("/js/ckeditor/config-min.js");
+		helpTextbox.setToolbar("MyToolbar");
+		row.appendCellChild(helpTextbox);
+		helpTextbox.addEventListener(Events.ON_CHANGE, this);
+		helpTextbox.addEventListener(Events.ON_CHANGING, this);
+		helpTextbox.setHeight("400px");
+		helpTextbox.setHflex("1");
+		helpTextbox.setValue(changed);
+		
+		Html html = diff(original, changed);
+		helpDiff = new Cell();
+		helpDiff.appendChild(html);
+		row.appendChild(helpDiff);
+		
+		this.addEventListener(Events.ON_OK, this);
+	}
+
+	private Html diff(String original, String changed) {
+		if (original == null) 
+			original = "";
+		if (changed == null) 
+			changed = "";
+		String diff = htmlDiff(original, changed);
+		StringBuilder builder = new StringBuilder();
+		int i = 0;
+		int length = diff.length();
+		while (i < length) {
+			int start = diff.indexOf("<span class=\"diff-tag-html\">", i);
+			if (start >= 0) {
+				if (start > i) {
+					String s = diff.substring(i, start);
+					s = HtmlUtils.htmlUnescape(s);
+					builder.append(s);
+				}
+				i = start + "<span class=\"diff-tag-html\">".length();
+				int end = diff.indexOf("</span>", i);
+				if (end > i) {
+					String s = diff.substring(i, end);
+					s = HtmlUtils.htmlUnescape(s);
+					builder.append(s);
+					i = end + "</span>".length();
+				} else {
+					throw new RuntimeException("Missing </span> tag");
+				}
+			} else {
+				break;
+			}			
+		}
+		if (i < length) {
+			String s = diff.substring(i, length);
+			s = HtmlUtils.htmlUnescape(s);
+			builder.append(s);
+		}
+		String s = builder.toString();
+		s = s.replace("class=\"diff-tag-removed\"", "style=\"font-size: 100%;text-decoration: line-through;background-color: #fdc6c6;\"");
+		s = s.replace("class=\"diff-tag-added\"", "style=\"font-size: 100%;background-color: #ccffcc;\"");
+		Html html = new Html(s);
+		return html;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.adempiere.webui.panel.ADForm#onEvent(org.zkoss.zk.ui.event.Event)
+	 */
+	@Override
+	public void onEvent(Event event) throws Exception {
+		if (event.getTarget() == confirmPanel.getButton(ConfirmPanel.A_CANCEL)) {
+			this.detach();
+		} else if (event.getTarget() == confirmPanel.getButton(ConfirmPanel.A_OK)) {
+			applyChanges();
+			this.detach();
+		} else if (event.getTarget() == helpTextbox) {
+			if (event.getName().equals(Events.ON_CHANGING)) {
+				InputEvent inputEvent = (InputEvent) event;
+				helpTimer.setAttribute(NEW_VALUE, inputEvent.getValue());
+				if (helpTimer.isRunning()) {
+					return;
+				} else {
+					helpTimer.start();
+				}
+			} else {
+				onHelpChanged(helpTextbox.getValue());
+				if (helpTimer.isRunning())
+					helpTimer.stop();
+			}
+		} else if (event.getTarget() == helpTimer) {
+			onHelpChanged((String) helpTimer.removeAttribute(NEW_VALUE));
+		} else {
+			super.onEvent(event);
+		}
+	}
+
+	private void onHelpChanged(String text) {
+		helpDiff.getChildren().clear();
+		Html html = diff(ctxHelpMsg.get_Translation("MsgText", AD_Language), text);
+		helpDiff.appendChild(html);
+	}
+	private void applyChanges() {
+		Component c = SessionManager.getAppDesktop().getActiveWindow();
+		ADWindow adwindow = ADWindow.findADWindow(c);
+		GridTab gridTab = adwindow.getADWindowContent().getActiveGridTab();
+		String help = helpTextbox.getValue();
+		gridTab.setValue("MsgText", help);
+		gridTab.dataSave(false);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.adempiere.webui.panel.ADForm#getWindowMode()
+	 */
+	@Override
+	public Mode getWindowMode() {
+		return Mode.HIGHLIGHTED;
+	}
+	
+	private String removeHeaderTag(String htmlString) {
+		htmlString = htmlString
+				.replace("<html>", "")
+				.replace("</html>", "")
+				.replace("<body>", "")
+				.replace("</body>", "")
+				.replace("<head>", "")
+				.replace("</head>", "");
+		return htmlString;
+	}
+	
+	private String htmlDiff(String s1, String s2) {
+
+		try {
+			SAXTransformerFactory tf = (SAXTransformerFactory) TransformerFactory.newInstance();
+
+			TransformerHandler result = tf.newTransformerHandler();
+			StringWriter resultWriter = new StringWriter();
+			result.setResult(new StreamResult(resultWriter));
+
+			result.startDocument();
+			String tag = Long.toString(System.currentTimeMillis(), 3);
+			result.startElement("", tag, tag, new AttributesImpl());
+			DaisyDiff.diffTag(s1, s2, result);
+
+			result.endDocument();
+			result.endElement("", tag, tag);
+			String string = resultWriter.toString();
+			return string.substring(string.indexOf("<"+tag+">")+tag.length()+2, string.indexOf("</"+tag+">"));
+		} catch (Throwable e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
index bb0e74a0a3..8f68320a3e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
@@ -281,7 +281,7 @@ public class DashboardController implements EventListener<Event> {
 		boolean empty = true;
 		
 		// HTML content
-        String htmlContent = dc.get_Translation(MDashboardContent.COLUMNNAME_HTML);
+        String htmlContent = dc.get_ID() > 0 ? dc.get_Translation(MDashboardContent.COLUMNNAME_HTML) : null;
         if(htmlContent != null)
         {
             StringBuilder result = new StringBuilder("<html><head>");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDashboardContentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDashboardContentEditor.java
index f55364a552..cee555b076 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDashboardContentEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDashboardContentEditor.java
@@ -43,8 +43,10 @@ public class WDashboardContentEditor extends WEditor {
 		Panelchildren pc = new Panelchildren();
 		getComponent().appendChild(pc);		
 		
-		Caption caption = new Caption(content.get_Translation(MDashboardContent.COLUMNNAME_Name));
-    	getComponent().appendChild(caption);
+		if (content.get_ID() > 0) {
+			Caption caption = new Caption(content.get_Translation(MDashboardContent.COLUMNNAME_Name));
+			getComponent().appendChild(caption);
+		}
     	getComponent().addEventListener(ON_RENDER_CONTENT, this);
 	}
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
index 1991f727ca..d89cef3d84 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HelpController.java
@@ -16,10 +16,13 @@ package org.adempiere.webui.panel;
 
 import java.util.Properties;
 
+import org.adempiere.webui.component.Menupopup;
 import org.adempiere.webui.desktop.IDesktop;
 import org.adempiere.webui.util.ZKUpdateUtil;
+import org.adempiere.webui.window.WCtxHelpSuggestion;
 import org.compiere.model.GridField;
 import org.compiere.model.GridTab;
+import org.compiere.model.I_AD_CtxHelpMsg;
 import org.compiere.model.MCtxHelpMsg;
 import org.compiere.model.MForm;
 import org.compiere.model.MInfoWindow;
@@ -33,12 +36,17 @@ import org.compiere.wf.MWFNode;
 import org.compiere.wf.MWorkflow;
 import org.zkoss.zk.au.out.AuScript;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Anchorchildren;
 import org.zkoss.zul.Anchorlayout;
 import org.zkoss.zul.Html;
+import org.zkoss.zul.Menuitem;
 import org.zkoss.zul.Panel;
 import org.zkoss.zul.Panelchildren;
+import org.zkoss.zul.Popup;
 import org.zkoss.zul.Style;
 import org.zkoss.zul.Vlayout;
 
@@ -221,13 +229,23 @@ public class HelpController
     	StringBuilder sb = new StringBuilder();
     	sb.append("<html>\n<body>\n<div class=\"help-content\">\n");
     	    	
-    	String ctxHelpMsg = getCtxHelpMsgList(ctxType, recordId);
+    	MCtxHelpMsg ctxHelpMsg = getCtxHelpMsg(ctxType, recordId);
     	String helpMsg, nameMsg, descMsg;
     	
-    	if (ctxHelpMsg.length() > 0)
-	    	sb.append(stripHtml(ctxHelpMsg, false) + "<br>\n");
+    	if (ctxHelpMsg != null)
+    	{
+	    	sb.append(stripHtml(ctxHelpMsg.get_Translation(I_AD_CtxHelpMsg.COLUMNNAME_MsgText), false) + "<br>\n");
+	    	ContextHelpMenupopup popup = new ContextHelpMenupopup(ctxHelpMsg);
+	    	pnlContextHelp.setAttribute("contextMenu", popup);
+	    	pnlContextHelp.setContext(popup);
+	    	popup.setPage(pnlContextHelp.getPage());
+    	}
     	else
     	{
+    		Component popup = (Component) pnlContextHelp.removeAttribute("contextMenu");
+    		if (popup != null)
+    			popup.detach();
+    		pnlContextHelp.setContext((Popup)null);
         	sb.append("<i>(" + Msg.getMsg(Env.getCtx(), "NotAvailable") + ")</i>");
 
     		if (ctxType.equals(X_AD_CtxHelp.CTXTYPE_Tab))
@@ -491,10 +509,10 @@ public class HelpController
 		return htmlString;
 	}
 
-    private String getCtxHelpMsgList(String ctxType, int recordId)
+    private MCtxHelpMsg getCtxHelpMsg(String ctxType, int recordId)
     {
     	Properties ctx = Env.getCtx();
-    	String retValue = MCtxHelpMsg.get(ctx, ctxType, recordId);
+    	MCtxHelpMsg retValue = MCtxHelpMsg.get(ctx, ctxType, recordId);
     	return retValue;
     }
 
@@ -533,4 +551,30 @@ public class HelpController
 		out.append("';}");
 		return out.toString();
 	}	//	maskHTML
+	
+	private class ContextHelpMenupopup extends Menupopup implements EventListener<Event> {
+		/**
+		 * generated serial id
+		 */
+		private static final long serialVersionUID = 5957266862632509358L;
+		private MCtxHelpMsg ctxHelpMsg;
+		private ContextHelpMenupopup(MCtxHelpMsg ctxHelpMsg) {
+			super();
+			this.ctxHelpMsg = ctxHelpMsg;
+			Menuitem item = new Menuitem();
+			if (ctxHelpMsg.getAD_Client_ID() == Env.getAD_Client_ID(Env.getCtx())) {
+				item.setLabel(Msg.getMsg(Env.getCtx(), "edit"));
+			} else {
+				item.setLabel(Msg.getElement(Env.getCtx(), "AD_CtxHelpSuggestion_ID"));
+			}
+			appendChild(item);
+			item.addEventListener(Events.ON_CLICK, this);
+		}
+		@Override
+		public void onEvent(Event event) throws Exception {
+			WCtxHelpSuggestion suggestion = new WCtxHelpSuggestion(ctxHelpMsg);
+			suggestion.setPage(this.getPage());
+			suggestion.doHighlighted();
+		}
+	}
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java
new file mode 100644
index 0000000000..279e4252da
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WCtxHelpSuggestion.java
@@ -0,0 +1,182 @@
+/**
+ * 
+ */
+package org.adempiere.webui.window;
+
+import org.adempiere.webui.component.ConfirmPanel;
+import org.adempiere.webui.component.Window;
+import org.compiere.model.I_AD_CtxHelpMsg;
+import org.compiere.model.MCtxHelpMsg;
+import org.compiere.model.MCtxHelpSuggestion;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
+import org.zkforge.ckez.CKeditor;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zul.Borderlayout;
+import org.zkoss.zul.Cell;
+import org.zkoss.zul.Center;
+import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Label;
+import org.zkoss.zul.South;
+import org.zkoss.zul.Vbox;
+
+/**
+ * @author hengsin
+ *
+ */
+public class WCtxHelpSuggestion extends Window implements EventListener<Event> {
+
+	/**
+	 * generated serial id
+	 */
+	private static final long serialVersionUID = -8110247807841690907L;
+
+	private ConfirmPanel confirmPanel;
+
+	private MCtxHelpMsg ctxHelpMsg;
+
+	private CKeditor helpTextbox;
+
+	/**
+	 * default constructor
+	 */
+	public WCtxHelpSuggestion(MCtxHelpMsg ctxHelpMsg) {
+		this.ctxHelpMsg = ctxHelpMsg;
+		layout();
+	}
+
+	private void layout() {
+		Borderlayout borderlayout = new Borderlayout();
+		appendChild(borderlayout);
+		borderlayout.setHflex("1");
+		borderlayout.setVflex("1");
+		
+		Center center = new Center();
+		center.setVflex("1");
+		center.setHflex("1");
+		borderlayout.appendChild(center);
+		
+		Vbox vlayout = new Vbox();
+		vlayout.setStyle("padding: 8px 16px");
+		vlayout.setWidth("100%");
+		vlayout.setHeight("100%");
+		vlayout.setPack("stretch");
+		center.appendChild(vlayout);
+		Hbox hlayout = new Hbox();
+		hlayout.setVflex("min");
+		hlayout.setWidth("100%");
+		hlayout.setAlign("center");
+		Cell cell = new Cell();
+		cell.setWidth("15%");
+		cell.setStyle("padding-right: 8px;");
+		cell.setAlign("right");
+		cell.appendChild(new Label(Msg.getElement(Env.getCtx(), "AD_CtxHelp_ID") + " : "));
+		hlayout.appendChild(cell);
+		cell = new Cell();
+		cell.setWidth("85%");
+		cell.setAlign("left");
+		cell.appendChild(new Label(ctxHelpMsg.getAD_CtxHelp().getName()));
+		hlayout.appendChild(cell);
+		vlayout.appendChild(hlayout);
+				
+		hlayout = new Hbox();
+		hlayout.setVflex("1");
+		hlayout.setHflex("1");
+		hlayout.setAlign("stretch");
+		cell = new Cell();
+		cell.setWidth("15%");
+		cell.setStyle("padding-right: 8px;");
+		cell.setAlign("right");
+		cell.appendChild(new Label(Msg.getElement(Env.getCtx(), "MsgText") + " : "));
+		hlayout.appendChild(cell);
+		helpTextbox = new CKeditor();
+		helpTextbox.setCustomConfigurationsPath("/js/ckeditor/config-min.js");
+		helpTextbox.setToolbar("MyToolbar");
+		String msgText = ctxHelpMsg.get_Translation("MsgText");
+		msgText = removeHeaderTag(msgText);
+		helpTextbox.setValue(msgText);
+		helpTextbox.setWidth("99%");
+		helpTextbox.setVflex("1");
+		cell = new Cell();
+		cell.setWidth("85%");
+		cell.setHeight("100%");
+		cell.setAlign("left");
+		cell.appendChild(helpTextbox);
+		hlayout.appendChild(cell);
+		vlayout.appendChild(hlayout);
+		
+		confirmPanel = new ConfirmPanel(true);
+		confirmPanel.addActionListener(this);
+		South southPane = new South();
+		southPane.setSclass("dialog-footer");
+		borderlayout.appendChild(southPane);
+		southPane.appendChild(confirmPanel);
+		
+		this.setSclass("popup-dialog");
+		this.setClosable(true);
+		this.setBorder("normal");
+		this.setWidth("60%");
+		this.setHeight("650px");
+		this.setShadow(true);
+		this.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
+		this.setSizable(true);
+		
+		if (ctxHelpMsg.getAD_Client_ID() == Env.getAD_Client_ID(Env.getCtx())) {
+			setTitle(Msg.getMsg(Env.getCtx(), "edit") + " " + Msg.getElement(Env.getCtx(), "AD_CtxHelpMsg_ID"));
+		} else {
+			setTitle(Msg.getElement(Env.getCtx(), "AD_CtxHelpSuggestion_ID"));
+		}
+	}
+
+	@Override
+	public void onEvent(Event event) throws Exception {
+		if (event.getTarget() == confirmPanel.getButton(ConfirmPanel.A_OK)) {
+			onSave();
+		} else if (event.getTarget() == confirmPanel.getButton(ConfirmPanel.A_CANCEL)) {
+			this.detach();
+		}		
+	}
+
+	private void onSave() {
+		if (ctxHelpMsg.getAD_Client_ID() == Env.getAD_Client_ID(Env.getCtx())) {
+			if (Env.isBaseLanguage(Env.getCtx(), I_AD_CtxHelpMsg.Table_Name)) {
+				ctxHelpMsg.setMsgText(helpTextbox.getValue());
+				ctxHelpMsg.saveEx();
+			}
+			StringBuilder update = new StringBuilder("UPDATE AD_CtxHelpMsg_Trl SET MsgText=? ");
+			update.append("WHERE AD_CtxHelpMsg_ID=? AND AD_Client_ID=? AND AD_Language=? AND IsActive='Y' ");
+			Object[] params = new Object[]{helpTextbox.getValue(), ctxHelpMsg.get_ID(), ctxHelpMsg.getAD_Client_ID(), Env.getAD_Language(Env.getCtx())};
+			DB.executeUpdateEx(update.toString(), params, null);
+			FDialog.info(0, this, "Your changes have been saved.");
+		} else {
+			MCtxHelpSuggestion suggestion = new MCtxHelpSuggestion(Env.getCtx(), 0, null);
+			suggestion.setClientOrg(0, 0);
+			suggestion.setAD_CtxHelp_ID(ctxHelpMsg.getAD_CtxHelp_ID());
+			suggestion.setAD_CtxHelpMsg_ID(ctxHelpMsg.get_ID());
+			suggestion.setAD_Language(Env.getAD_Language(Env.getCtx()));
+			suggestion.setAD_User_ID(Env.getAD_User_ID(Env.getCtx()));
+			suggestion.setAD_UserClient_ID(Env.getAD_Client_ID(Env.getCtx()));
+			suggestion.setIsApproved(false);
+			suggestion.setProcessed(false);
+			suggestion.setMsgText(helpTextbox.getValue());
+			suggestion.setIsSaveAsTenantCustomization(false);
+			
+			suggestion.saveEx();
+			FDialog.info(0, this, "Your suggestions have been submitted for review");
+		} 
+		this.detach();
+	}
+	
+	private String removeHeaderTag(String htmlString) {
+		htmlString = htmlString
+				.replace("<html>", "")
+				.replace("</html>", "")
+				.replace("<body>", "")
+				.replace("</body>", "")
+				.replace("<head>", "")
+				.replace("</head>", "");
+		return htmlString;
+	}
+}
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index 6d8752a10d..66bbf7a601 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -30,7 +30,8 @@ bin.includes = META-INF/,\
                sessiontimeout.zul,\
                *.jsp,\
                labelapplet.jar,\
-               OSGI-INF/jfgchartrenderer.xml
+               OSGI-INF/jfgchartrenderer.xml,\
+               WEB-INF/lib/daisydiff-min.jar
 src.includes = WEB-INF/tld/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/,\
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index f89dbd8706..0dbe3f34d2 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -2,6 +2,7 @@
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
 		<get src="${url.file.srv}/jarfile/4.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/4.1/daisydiff-min.jar" dest="WEB-INF/lib/daisydiff-min.jar" usetimestamp="true" verbose="true" retries="5" />
 
 	</target>
 </project>
diff --git a/org.adempiere.ui.zk/js/ckeditor/config-min.js b/org.adempiere.ui.zk/js/ckeditor/config-min.js
new file mode 100644
index 0000000000..6029a9d7d0
--- /dev/null
+++ b/org.adempiere.ui.zk/js/ckeditor/config-min.js
@@ -0,0 +1,12 @@
+CKEDITOR.editorConfig = function(config) {
+    config.resize_enabled = false;
+    config.toolbar = 'MyToolbar';
+    config.toolbar_MyToolbar =
+[
+	{ name: 'styles', items : [ 'Styles','Format','Font','FontSize' ] },
+	{ name: 'colors', items : [ 'TextColor','BGColor' ] },
+	{ name: 'clipboard', items : [ 'Undo','Redo' ] },
+	{ name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
+	{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock' ] },
+];
+};
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 380eec3d1f..61e48d602b 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -217,5 +217,6 @@ Export-Package: javax.ws.rs,
  org.idempiere.webservices,
  org.idempiere.webservices.client,
  org.idempiere.webservices.fault,
- org.springframework.web.context
+ org.springframework.web.context,
+ org.springframework.web.util
 Web-ContextPath: ADInterface