diff --git a/migration/360lts-release/oracle/862a_ManufacturingLight.sql b/migration/360lts-release/oracle/862a_ManufacturingLight.sql
index 9748d67956..a67bb4295e 100644
--- a/migration/360lts-release/oracle/862a_ManufacturingLight.sql
+++ b/migration/360lts-release/oracle/862a_ManufacturingLight.sql
@@ -1,3 +1,6 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
 INSERT INTO AD_Window (AD_Client_ID,AD_Org_ID,AD_Window_ID,Created,CreatedBy,EntityType,IsActive,IsBetaFunctionality,IsDefault,IsSOTrx,Name,Processing,Updated,UpdatedBy,WindowType) VALUES (0,0,53127,TO_DATE('2011-07-27 15:13:48','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','N','N','Y','Production (Single Product)','N',TO_DATE('2011-07-27 15:13:48','YYYY-MM-DD HH24:MI:SS'),100,'T')
 ;
 
diff --git a/migration/360lts-release/oracle/877_IDEMPIERE_363.sql b/migration/360lts-release/oracle/877_IDEMPIERE_363.sql
new file mode 100644
index 0000000000..02e728de25
--- /dev/null
+++ b/migration/360lts-release/oracle/877_IDEMPIERE_363.sql
@@ -0,0 +1,398 @@
+-- Aug 17, 2012 1:03:26 PM COT
+-- New Table
+CREATE TABLE ASP_Ref_List (AD_Client_ID NUMBER(10) NOT NULL, AD_Org_ID NUMBER(10) NOT NULL, AD_Reference_ID NUMBER(10) NOT NULL, AD_Ref_List_ID NUMBER(10) NOT NULL, ASP_Level_ID NUMBER(10) NOT NULL, ASP_Ref_List_ID NUMBER(10) NOT NULL, ASP_Ref_List_UU NVARCHAR2(36) DEFAULT NULL , ASP_Status CHAR(1) DEFAULT 'U', Created DATE NOT NULL, CreatedBy NUMBER(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')), Updated DATE DEFAULT NULL , UpdatedBy NUMBER(10) NOT NULL, CONSTRAINT ASP_Ref_List_Key PRIMARY KEY (ASP_Ref_List_ID))
+;
+
+
+
+-- Aug 14, 2012 4:43:19 PM COT
+-- Table to enable the asp filter to the ref list
+INSERT INTO AD_Table (IsSecurityEnabled,AccessLevel,LoadSeq,AD_Table_ID,IsHighVolume,ImportTable,IsView,IsChangeLog,EntityType,CopyColumnsFromTable,ReplicationType,AD_Table_UU,IsCentrallyMaintained,IsDeleteable,TableName,Name,AD_Client_ID,IsActive,AD_Org_ID,CreatedBy,Updated,UpdatedBy,Created) VALUES ('N','4',0,200011,'N','N','N','N','U','N','L','d4532318-c4b9-43ed-8ae0-a97bf2008ace','Y','Y','ASP_Ref_List','ASP_Ref_List',0,'Y',0,100,TO_DATE('2012-08-14 16:43:17','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2012-08-14 16:43:17','YYYY-MM-DD HH24:MI:SS'))
+;
+
+-- Aug 14, 2012 4:43:19 PM COT
+INSERT INTO AD_Table_Trl (AD_Language,AD_Table_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Table_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Table t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Table_ID=200011 AND NOT EXISTS (SELECT * FROM AD_Table_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Table_ID=t.AD_Table_ID)
+;
+
+-- Aug 14, 2012 4:43:26 PM COT
+UPDATE AD_Table SET EntityType='D',Updated=TO_DATE('2012-08-14 16:43:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200011
+;
+
+-- Aug 14, 2012 4:43:52 PM COT
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ASP_Ref_List_ID',200090,'D','ASP_Ref_List','ASP_Ref_List','8cd85dd3-af2d-4926-b7f5-49763a29eb56',0,TO_DATE('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 14, 2012 4:43:52 PM COT
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200090 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Aug 14, 2012 4:43:53 PM COT
+-- Key
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200293,'D','Y','N','N','N',10,'N',13,'Y',200090,'55a57ae8-d081-42e6-a5c1-41d326d21e52','N','N','N','ASP_Ref_List_ID','ASP_Ref_List',100,TO_DATE('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:53 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200293 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:53 PM COT
+-- AD Client
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200294,'D','Y','N','N','N',10,'N',19,'N',102,'0ca1e1d8-9b2b-4a14-bb4d-b31e610a2eaf','N','N','N','AD_Client_ID','Client/Tenant for this installation.','A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.','Client',100,TO_DATE('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:53 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200294 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:54 PM COT
+-- AD_Org
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200295,'D','Y','N','N','N',10,'N',19,'N',113,'47189a0e-5c46-4edc-932b-e1e22ad4b202','N','N','N','AD_Org_ID','Organizational entity within client','An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.','Organization',100,TO_DATE('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:54 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200295 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:54 PM COT
+-- Created
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200296,'D','Y','N','N','N',29,'N',16,'N',245,'cf5e8a71-219d-44bc-b2ba-62005342b5b0','N','N','N','Created','Date this record was created','The Created field indicates the date that this record was created.','Created',100,TO_DATE('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:54 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200296 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:43:55 PM COT
+-- Created By
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,AD_Reference_Value_ID,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200297,'D',110,'Y','N','N','N',10,'N',18,'N',246,'6e3c010f-36ad-4505-8f78-17b77ecd114e','N','N','N','CreatedBy','User who created this records','The Created By field indicates the user who created this record.','Created By',100,TO_DATE('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:55 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200297 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:43:55 PM COT
+-- Updated By
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,AD_Reference_Value_ID,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200298,'D',110,'Y','N','N','N',10,'N',18,'N',608,'c1a6e667-5ea2-4110-b01e-4ee2cd9c1799','N','N','N','UpdatedBy','User who updated this records','The Updated By field indicates the user who updated this record.','Updated By',100,TO_DATE('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:55 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200298 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:43:56 PM COT
+-- Reference
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200299,'D','Y','N','N','N',10,'N',19,'N',120,'40b51540-7ae8-4740-9624-3c3bb003788e','N','Y','N','AD_Reference_ID','System Reference and Validation','The Reference could be a display type, list or table validation.','Reference',100,TO_DATE('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200299 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+-- UU
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('asp_ref_list_uu',200091,'D','asp_ref_list_uu','asp_ref_list_uu','35796bbc-b288-4646-af4c-ebb19866c08f',0,TO_DATE('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200091 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+-- UU
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200300,'D','N','N','N','N',36,'N',10,'N',200091,'9cc459be-b830-4e56-b75e-7e4431b87ff9','N','Y','N','asp_ref_list_uu','asp_ref_list_uu',100,TO_DATE('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200300 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+-- Active
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200301,'D','N','N','N','N',1,'N',20,'N',348,'a3472edc-7f0e-4a5f-8673-93b826af9c42','N','Y','N','IsActive','The record is active in the system','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.','Active',100,TO_DATE('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200301 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+-- Status
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200302,'D','N','N','N','N',1,'N',20,'N',53327,'11a532b2-d0d8-4eea-8120-96525401214d','N','Y','N','ASP_Status','ASP Status',100,TO_DATE('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200302 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+-- ID Ref List
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200303,'D','Y','N','N','N',10,'N',19,'N',119,'0778c23f-1c35-4656-ab7b-da0c6483ef97','N','Y','N','AD_Ref_List_ID','Reference List based on Table','The Reference List field indicates a list of reference values from a database tables.  Reference lists populate drop down list boxes in data entry screens','Reference List',100,TO_DATE('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200303 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+-- Date last Updated
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200304,'D','N','N','N','N',29,'N',16,'N',607,'bd82cb97-0ad2-4e29-868b-a7dcdc9705ec','N','N','N','Updated','Date this record was updated','The Updated field indicates the date that this record was updated.','Updated',100,TO_DATE('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200304 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+-- ASP Level ID
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200305,'D','Y','N','N','N',10,'N',19,'N',53326,'fade0ebc-a1b2-403a-8ded-64a248c89ecd','N','Y','N','ASP_Level_ID','ASP Level',100,TO_DATE('2012-08-14 16:43:59','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:59','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200305 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:45:34 PM COT
+UPDATE AD_Column SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', IsAllowCopy='N',Updated=TO_DATE('2012-08-14 16:45:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200300
+;
+
+-- Aug 14, 2012 4:45:34 PM COT
+UPDATE AD_Column_Trl SET IsTranslated='N' WHERE AD_Column_ID=200300
+;
+
+-- Aug 14, 2012 4:45:34 PM COT
+UPDATE AD_Field SET Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Column_ID=200300 AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Element SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', PrintName='ASP_Ref_List_UU',Updated=TO_DATE('2012-08-14 16:45:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200091
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200091
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Column SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200091
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Process_Para SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', Description=NULL, Help=NULL, AD_Element_ID=200091 WHERE UPPER(ColumnName)='ASP_REF_LIST_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Process_Para SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200091 AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Field SET Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200091) AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_PrintFormatItem pi SET PrintName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=200091)
+;
+
+-- Aug 14, 2012 4:48:26 PM COT
+-- Tab in the window asp module
+INSERT INTO AD_Tab (IsSingleRow,AD_Window_ID,SeqNo,IsTranslationTab,IsSortTab,AD_Table_ID,ImportFields,HasTree,IsInfoTab,IsReadOnly,AD_Column_ID,IsInsertRecord,IsAdvancedTab,TabLevel,AD_Tab_UU,EntityType,Name,AD_Tab_ID,AD_Client_ID,AD_Org_ID,Created,CreatedBy,Updated,UpdatedBy,Processing,IsActive) VALUES ('N',53015,120,'N','N',200011,'N','N','N','N',200305,'Y','N',2,'8a54e851-1731-4b8a-9e11-503f15f26aab','U','Ref List',200010,0,0,TO_DATE('2012-08-14 16:48:25','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2012-08-14 16:48:25','YYYY-MM-DD HH24:MI:SS'),100,'N','Y')
+;
+
+-- Aug 14, 2012 4:48:26 PM COT
+INSERT INTO AD_Tab_Trl (AD_Language,AD_Tab_ID, Help,CommitWarning,Name,Description, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Tab_ID, t.Help,t.CommitWarning,t.Name,t.Description, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Tab t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Tab_ID=200010 AND NOT EXISTS (SELECT * FROM AD_Tab_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Tab_ID=t.AD_Tab_ID)
+;
+
+-- Aug 14, 2012 4:48:34 PM COT
+UPDATE AD_Tab SET EntityType='D',Updated=TO_DATE('2012-08-14 16:48:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=200010
+;
+
+-- Aug 14, 2012 4:49:09 PM COT
+-- Active
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,1,'N','N',200301,'Y',200277,'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.','D','The record is active in the system','Active','Y','N','a299f169-5588-4ce8-a0a8-d9a5435835ae',100,0,TO_DATE('2012-08-14 16:49:08','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:08','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:09 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200277 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:10 PM COT
+-- ASP Level
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200305,'Y',200278,'N','D','ASP Level','Y','N','8289aece-c729-4aff-bcda-16d76ef20f10',100,0,TO_DATE('2012-08-14 16:49:09','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:09','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:10 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200278 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:10 PM COT
+-- Key
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid) VALUES ('N',200010,10,'N','N',200293,'Y',200279,'N','D','ASP_Ref_List','N','N','622dbe18-9630-4114-b4ae-9e2c5872c3ed',100,0,TO_DATE('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),'Y','N')
+;
+
+-- Aug 14, 2012 4:49:10 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200279 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+-- UU
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,36,'N','N',200300,'Y',200280,'N','D','ASP_Ref_List_UU','Y','N','47d4060c-eee9-4eec-8fd5-4a49a8e1da60',100,0,TO_DATE('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200280 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+-- Status
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,1,'N','N',200302,'Y',200281,'N','D','ASP Status','Y','N','131721db-4fac-402d-bd4a-b9df4d28185d',100,0,TO_DATE('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200281 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:12 PM COT
+-- Client
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200294,'Y',200282,'N','A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.','D','Client/Tenant for this installation.','Client','Y','N','02fcc057-a62a-4c88-88b1-6844c675105b',100,0,TO_DATE('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:12 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200282 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 14, 2012 4:49:12 PM COT
+-- Organization
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200295,'Y',200283,'N','An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.','D','Organizational entity within client','Organization','Y','N','c4aa51bf-4eda-4fda-bec4-419343d33eec',100,0,TO_DATE('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:12 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200283 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+-- Reference
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200299,'Y',200284,'N','The Reference could be a display type, list or table validation.','D','System Reference and Validation','Reference','Y','N','a1fb2962-baa0-4ed4-aa10-235151c79491',100,0,TO_DATE('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200284 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+-- Reference
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200303,'Y',200285,'N','The Reference List field indicates a list of reference values from a database tables.  Reference lists populate drop down list boxes in data entry screens','D','Reference List based on Table','Reference List','Y','N','981ba7dc-6214-459c-add0-a6831e47ff95',100,0,TO_DATE('2012-08-14 16:49:13','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-08-14 16:49:13','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200285 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=200282
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=200283
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=200278
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=200284
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=200285
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200281
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200277
+;
+
+-- Aug 14, 2012 4:50:27 PM COT
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2012-08-14 16:50:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200283
+;
+
+-- Aug 14, 2012 4:50:34 PM COT
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2012-08-14 16:50:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200285
+;
+
+-- Aug 14, 2012 4:50:43 PM COT
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2012-08-14 16:50:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200277
+;
+
+-- Aug 14, 2012 4:56:32 PM COT
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Description,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('AD_Ref_List.AD_Reference_ID=@AD_Reference_ID@',200003,'U','AD_Ref_List_ID by Reference','Ref List by Reference','S','6d752432-378a-4f8b-a1d5-81738e45731b',100,100,TO_DATE('2012-08-14 16:56:31','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-08-14 16:56:31','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Aug 14, 2012 5:08:52 PM COT
+UPDATE AD_Column SET AD_Reference_Value_ID=53234, AD_Reference_ID=17,Updated=TO_DATE('2012-08-14 17:08:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200302
+;
+
+-- Aug 14, 2012 5:08:52 PM COT
+UPDATE AD_Column SET AD_Reference_Value_ID=53234, AD_Reference_ID=17,Updated=TO_DATE('2012-08-14 17:08:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200302
+;
+
+-- Aug 16, 2012 4:37:29 PM COT
+UPDATE AD_Tab SET DisplayLogic=NULL,Updated=TO_DATE('2012-08-16 16:37:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53058
+;
+
+
+-- Aug 17, 2012 10:45:49 AM COT
+UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=200280
+;
+
+-- Aug 17, 2012 10:46:41 AM COT
+UPDATE AD_Column SET DefaultValue='@#AD_Client_ID@',Updated=TO_DATE('2012-08-17 10:46:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200294
+;
+
+-- Aug 17, 2012 10:46:56 AM COT
+UPDATE AD_Column SET DefaultValue='@#AD_Org_ID@',Updated=TO_DATE('2012-08-17 10:46:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200295
+;
+
+-- Aug 17, 2012 10:47:11 AM COT
+UPDATE AD_Column SET DefaultValue='U',Updated=TO_DATE('2012-08-17 10:47:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200302
+;
+
+-- Aug 17, 2012 10:47:18 AM COT
+UPDATE AD_Column SET DefaultValue='Y',Updated=TO_DATE('2012-08-17 10:47:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200301
+;
+
+-- Aug 17, 2012 11:48:50 AM COT
+UPDATE AD_Column SET AD_Val_Rule_ID=200003,Updated=TO_DATE('2012-08-17 11:48:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200303
+;
+
+-- Aug 17, 2012 2:42:59 PM COT
+-- sequence asp ref list
+INSERT INTO AD_Sequence (StartNewYear,CurrentNextSys,IsTableID,StartNo,CurrentNext,IsAudited,IsAutoSequence,AD_Sequence_ID,Description,Name,IncrementNo,AD_Sequence_UU,AD_Org_ID,AD_Client_ID,Created,CreatedBy,Updated,UpdatedBy,IsActive) VALUES ('N',50000,'Y',1000000,1000000,'N','Y',200012,'ASP_Ref_List','ASP_Ref_List',1,'db36a063-5d47-4131-aded-85cce9c8b4c8',0,0,TO_DATE('2012-08-17 14:42:58','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2012-08-17 14:42:58','YYYY-MM-DD HH24:MI:SS'),100,'Y')
+;
+
+-- Aug 22, 2012 11:04:29 PM COT
+UPDATE AD_Column SET AD_Val_Rule_ID=52047,Updated=TO_DATE('2012-08-22 23:04:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200299
+;
+
+-- Aug 22, 2012 11:20:55 PM COT
+-- IDEMPIERE-363 ASP / SaaS module - implement reference lists show/hide option
+UPDATE AD_Column SET AD_Val_Rule_ID=186,Updated=TO_DATE('2012-08-22 23:20:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54231
+;
+
+UPDATE AD_System
+  SET LastMigrationScriptApplied='877_IDEMPIERE_363.sql'
+WHERE LastMigrationScriptApplied<'877_IDEMPIERE_363.sql'
+   OR LastMigrationScriptApplied IS NULL
+;
diff --git a/migration/360lts-release/oracle/884_IDEMPIERE-246.sql b/migration/360lts-release/oracle/884_IDEMPIERE-246.sql
index 0067263f32..a0765e786d 100644
--- a/migration/360lts-release/oracle/884_IDEMPIERE-246.sql
+++ b/migration/360lts-release/oracle/884_IDEMPIERE-246.sql
@@ -370,15 +370,6 @@ UPDATE AD_Field SET SeqNo=570,IsDisplayed='Y' WHERE AD_Field_ID=52016
 ;
 
 -- GardenWorld seed BOMs
-INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
-  VALUES(200001, 11, 0, 'Y', TO_DATE('2003-01-21 20:05:55','YYYY-MM-DD HH24:MI:SS'), 100, TO_DATE('2009-02-17 17:20:59','YYYY-MM-DD HH24:MI:SS'), 100, 30, 145, 135, 1, '1 table, 4 Chairs and 1 Sun Screen', 'P');
-
-INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
-  VALUES(200002, 11, 0, 'Y', TO_DATE('2003-01-21 20:05:20','YYYY-MM-DD HH24:MI:SS'), 100, TO_DATE('2003-12-30 18:18:34','YYYY-MM-DD HH24:MI:SS'), 100, 10, 145, 134, 1, '1 table, 4 Chairs and 1 Sun Screen', 'P');
-
-INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
-  VALUES(200003, 11, 0, 'Y', TO_DATE('2003-01-21 20:05:46','YYYY-MM-DD HH24:MI:SS'), 100, TO_DATE('2003-12-30 18:19:08','YYYY-MM-DD HH24:MI:SS'), 100, 20, 145, 133, 4, '1 table, 4 Chairs and 1 Sun Screen', 'P');
-
 INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
   VALUES(200004, 11, 0, 'Y', TO_DATE('2008-09-22 14:45:22','YYYY-MM-DD HH24:MI:SS'), 100, TO_DATE('2008-09-22 14:45:22','YYYY-MM-DD HH24:MI:SS'), 100, 10, 133, 50004, 1, 'Nice Chair for outdoors', 'P');
 
diff --git a/migration/360lts-release/oracle/894_IDEMPIERE-246.sql b/migration/360lts-release/oracle/894_IDEMPIERE-246.sql
new file mode 100644
index 0000000000..c21979379f
--- /dev/null
+++ b/migration/360lts-release/oracle/894_IDEMPIERE-246.sql
@@ -0,0 +1,405 @@
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=167
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=357
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=229
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=412
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=256
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=197
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=477
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=181
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=179
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=503
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=196
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=228
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=479
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=482
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=14, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=481
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=15, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=411
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=16, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53253
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=17, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=426
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=18, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=537
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=19, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=311
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=20, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=292
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=21, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=504
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=22, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=515
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=218
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=153
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=263
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=166
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=203
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53242
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=236
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=183
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=160
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=278
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53296
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=345
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53014
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53108
+;
+
+-- Aug 27, 2012 8:17:46 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Menu SET Name='Manufacturing',Updated=TO_DATE('2012-08-27 08:17:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53296
+;
+
+-- Aug 27, 2012 8:17:46 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Menu_Trl SET IsTranslated='N' WHERE AD_Menu_ID=53296
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=167
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=357
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=229
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=412
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=256
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=197
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=477
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=181
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=179
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=503
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=196
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=479
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=12, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=482
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=13, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=481
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=14, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=411
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=15, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53253
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=16, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=426
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=17, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=537
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=18, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=311
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=19, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=292
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=20, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=504
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=21, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=515
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53350
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=1, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53351
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=2, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53298
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=3, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53299
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=4, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53300
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=5, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53301
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=6, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53352
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=7, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53302
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=8, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53353
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=9, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53354
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=10, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=228
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=11, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=53297
+;
+
+-- Aug 27, 2012 3:15:50 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=61997
+;
+
+-- Aug 27, 2012 3:15:58 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=61997
+;
+
+-- Aug 27, 2012 5:34:16 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET SeqNo=10,Updated=TO_DATE('2012-08-27 17:34:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53520
+;
+
+-- Aug 27, 2012 5:34:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET IsMandatory='Y', FieldLength=10, SeqNo=20,Updated=TO_DATE('2012-08-27 17:34:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53521
+;
+
+-- Aug 27, 2012 5:34:27 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET SeqNo=30,Updated=TO_DATE('2012-08-27 17:34:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53522
+;
+
+-- Aug 27, 2012 5:34:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET FieldLength=10,Updated=TO_DATE('2012-08-27 17:34:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53520
+;
+
+-- Aug 27, 2012 5:34:36 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET FieldLength=10,Updated=TO_DATE('2012-08-27 17:34:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53522
+;
+
+UPDATE AD_System
+  SET LastMigrationScriptApplied='894_IDEMPIERE-246.sql'
+WHERE LastMigrationScriptApplied<'894_IDEMPIERE-246.sql'
+   OR LastMigrationScriptApplied IS NULL
+;
diff --git a/migration/360lts-release/postgresql/877_IDEMPIERE_363.sql b/migration/360lts-release/postgresql/877_IDEMPIERE_363.sql
new file mode 100644
index 0000000000..e38b616b96
--- /dev/null
+++ b/migration/360lts-release/postgresql/877_IDEMPIERE_363.sql
@@ -0,0 +1,403 @@
+-- Aug 17, 2012 1:03:26 PM COT
+-- New Table
+CREATE TABLE ASP_Ref_List (AD_Client_ID NUMERIC(10) NOT NULL, AD_Org_ID NUMERIC(10) NOT NULL, AD_Reference_ID NUMERIC(10) NOT NULL, AD_Ref_List_ID NUMERIC(10) NOT NULL, ASP_Level_ID NUMERIC(10) NOT NULL, ASP_Ref_List_ID NUMERIC(10) NOT NULL, ASP_Ref_List_UU VARCHAR(36) DEFAULT NULL , ASP_Status CHAR(1) DEFAULT 'U', Created TIMESTAMP NOT NULL, CreatedBy NUMERIC(10) NOT NULL, IsActive CHAR(1) DEFAULT 'Y' CHECK (IsActive IN ('Y','N')), Updated TIMESTAMP DEFAULT NULL , UpdatedBy NUMERIC(10) NOT NULL, CONSTRAINT ASP_Ref_List_Key PRIMARY KEY (ASP_Ref_List_ID))
+;
+
+
+-- Aug 14, 2012 4:43:19 PM COT
+-- Table to enable the asp filter to the ref list
+INSERT INTO AD_Table (IsSecurityEnabled,AccessLevel,LoadSeq,AD_Table_ID,IsHighVolume,ImportTable,IsView,IsChangeLog,EntityType,CopyColumnsFromTable,ReplicationType,AD_Table_UU,IsCentrallyMaintained,IsDeleteable,TableName,Name,AD_Client_ID,IsActive,AD_Org_ID,CreatedBy,Updated,UpdatedBy,Created) VALUES ('N','4',0,200011,'N','N','N','N','U','N','L','d4532318-c4b9-43ed-8ae0-a97bf2008ace','Y','Y','ASP_Ref_List','ASP_Ref_List',0,'Y',0,100,TO_TIMESTAMP('2012-08-14 16:43:17','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2012-08-14 16:43:17','YYYY-MM-DD HH24:MI:SS'))
+;
+
+-- Aug 14, 2012 4:43:19 PM COT
+INSERT INTO AD_Table_Trl (AD_Language,AD_Table_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Table_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Table t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Table_ID=200011 AND NOT EXISTS (SELECT * FROM AD_Table_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Table_ID=t.AD_Table_ID)
+;
+
+-- Aug 14, 2012 4:43:26 PM COT
+UPDATE AD_Table SET EntityType='D',Updated=TO_TIMESTAMP('2012-08-14 16:43:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200011
+;
+
+-- Aug 14, 2012 4:43:52 PM COT
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ASP_Ref_List_ID',200090,'D','ASP_Ref_List','ASP_Ref_List','8cd85dd3-af2d-4926-b7f5-49763a29eb56',0,TO_TIMESTAMP('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 14, 2012 4:43:52 PM COT
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200090 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+
+-- Aug 14, 2012 4:43:53 PM COT
+-- Key
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200293,'D','Y','N','N','N',10,'N',13,'Y',200090,'55a57ae8-d081-42e6-a5c1-41d326d21e52','N','N','N','ASP_Ref_List_ID','ASP_Ref_List',100,TO_TIMESTAMP('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:51','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:53 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200293 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:53 PM COT
+-- AD Client
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200294,'D','Y','N','N','N',10,'N',19,'N',102,'0ca1e1d8-9b2b-4a14-bb4d-b31e610a2eaf','N','N','N','AD_Client_ID','Client/Tenant for this installation.','A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.','Client',100,TO_DATE('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200294 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+
+-- Aug 14, 2012 4:43:54 PM COT
+-- AD_Org
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200295,'D','Y','N','N','N',10,'N',19,'N',113,'47189a0e-5c46-4edc-932b-e1e22ad4b202','N','N','N','AD_Org_ID','Organizational entity within client','An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.','Organization',100,TO_TIMESTAMP('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:53','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:54 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200295 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:43:54 PM COT
+-- Created
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200296,'D','Y','N','N','N',29,'N',16,'N',245,'cf5e8a71-219d-44bc-b2ba-62005342b5b0','N','N','N','Created','Date this record was created','The Created field indicates the date that this record was created.','Created',100,TO_TIMESTAMP('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:54 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200296 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:43:55 PM COT
+-- Created By
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,AD_Reference_Value_ID,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200297,'D',110,'Y','N','N','N',10,'N',18,'N',246,'6e3c010f-36ad-4505-8f78-17b77ecd114e','N','N','N','CreatedBy','User who created this records','The Created By field indicates the user who created this record.','Created By',100,TO_TIMESTAMP('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:54','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:55 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200297 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:43:55 PM COT
+-- Updated By
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,AD_Reference_Value_ID,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200298,'D',110,'Y','N','N','N',10,'N',18,'N',608,'c1a6e667-5ea2-4110-b01e-4ee2cd9c1799','N','N','N','UpdatedBy','User who updated this records','The Updated By field indicates the user who updated this record.','Updated By',100,TO_TIMESTAMP('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:55 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200298 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+-- Reference
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200299,'D','Y','N','N','N',10,'N',19,'N',120,'40b51540-7ae8-4740-9624-3c3bb003788e','N','Y','N','AD_Reference_ID','System Reference and Validation','The Reference could be a display type, list or table validation.','Reference',100,TO_TIMESTAMP('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:55','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200299 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+-- UU
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('asp_ref_list_uu',200091,'D','asp_ref_list_uu','asp_ref_list_uu','35796bbc-b288-4646-af4c-ebb19866c08f',0,TO_TIMESTAMP('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Aug 14, 2012 4:43:56 PM COT
+INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_Help,Name,Description,PrintName,PO_Name,PO_PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Element_ID, t.Help,t.PO_Description,t.PO_Help,t.Name,t.Description,t.PrintName,t.PO_Name,t.PO_PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200091 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+-- UU
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200300,'D','N','N','N','N',36,'N',10,'N',200091,'9cc459be-b830-4e56-b75e-7e4431b87ff9','N','Y','N','asp_ref_list_uu','asp_ref_list_uu',100,TO_TIMESTAMP('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:56','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200300 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+-- Active
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200301,'D','N','N','N','N',1,'N',20,'N',348,'a3472edc-7f0e-4a5f-8673-93b826af9c42','N','Y','N','IsActive','The record is active in the system','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.','Active',100,TO_TIMESTAMP('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:57 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200301 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+-- Status
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200302,'D','N','N','N','N',1,'N',20,'N',53327,'11a532b2-d0d8-4eea-8120-96525401214d','N','Y','N','ASP_Status','ASP Status',100,TO_TIMESTAMP('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:57','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200302 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+-- ID Ref List
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200303,'D','Y','N','N','N',10,'N',19,'N',119,'0778c23f-1c35-4656-ab7b-da0c6483ef97','N','Y','N','AD_Ref_List_ID','Reference List based on Table','The Reference List field indicates a list of reference values from a database tables.  Reference lists populate drop down list boxes in data entry screens','Reference List',100,TO_TIMESTAMP('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:58 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200303 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+-- Date last Updated
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Description,Help,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200304,'D','N','N','N','N',29,'N',16,'N',607,'bd82cb97-0ad2-4e29-868b-a7dcdc9705ec','N','N','N','Updated','Date this record was updated','The Updated field indicates the date that this record was updated.','Updated',100,TO_TIMESTAMP('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:58','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200304 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+-- ASP Level ID
+INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (0,200011,200305,'D','Y','N','N','N',10,'N',19,'N',53326,'fade0ebc-a1b2-403a-8ded-64a248c89ecd','N','Y','N','ASP_Level_ID','ASP Level',100,TO_TIMESTAMP('2012-08-14 16:43:59','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-08-14 16:43:59','YYYY-MM-DD HH24:MI:SS'),100,0)
+;
+
+-- Aug 14, 2012 4:43:59 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200305 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+
+-- Aug 14, 2012 4:45:34 PM COT
+UPDATE AD_Column SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', IsAllowCopy='N',Updated=TO_TIMESTAMP('2012-08-14 16:45:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200300
+;
+
+-- Aug 14, 2012 4:45:34 PM COT
+UPDATE AD_Column_Trl SET IsTranslated='N' WHERE AD_Column_ID=200300
+;
+
+-- Aug 14, 2012 4:45:34 PM COT
+UPDATE AD_Field SET Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Column_ID=200300 AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Element SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', PrintName='ASP_Ref_List_UU',Updated=TO_TIMESTAMP('2012-08-14 16:45:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=200091
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=200091
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Column SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200091
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Process_Para SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', Description=NULL, Help=NULL, AD_Element_ID=200091 WHERE UPPER(ColumnName)='ASP_REF_LIST_UU' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Process_Para SET ColumnName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Element_ID=200091 AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_Field SET Name='ASP_Ref_List_UU', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=200091) AND IsCentrallyMaintained='Y'
+;
+
+-- Aug 14, 2012 4:45:47 PM COT
+UPDATE AD_PrintFormatItem SET PrintName='ASP_Ref_List_UU', Name='ASP_Ref_List_UU' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=200091)
+;
+
+-- Aug 14, 2012 4:48:26 PM COT
+-- Tab in the window asp module
+INSERT INTO AD_Tab (IsSingleRow,AD_Window_ID,SeqNo,IsTranslationTab,IsSortTab,AD_Table_ID,ImportFields,HasTree,IsInfoTab,IsReadOnly,AD_Column_ID,IsInsertRecord,IsAdvancedTab,TabLevel,AD_Tab_UU,EntityType,Name,AD_Tab_ID,AD_Client_ID,AD_Org_ID,Created,CreatedBy,Updated,UpdatedBy,Processing,IsActive) VALUES ('N',53015,120,'N','N',200011,'N','N','N','N',200305,'Y','N',2,'8a54e851-1731-4b8a-9e11-503f15f26aab','U','Ref List',200010,0,0,TO_TIMESTAMP('2012-08-14 16:48:25','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2012-08-14 16:48:25','YYYY-MM-DD HH24:MI:SS'),100,'N','Y')
+;
+
+-- Aug 14, 2012 4:48:26 PM COT
+INSERT INTO AD_Tab_Trl (AD_Language,AD_Tab_ID, Help,CommitWarning,Name,Description, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Tab_ID, t.Help,t.CommitWarning,t.Name,t.Description, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Tab t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Tab_ID=200010 AND NOT EXISTS (SELECT * FROM AD_Tab_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Tab_ID=t.AD_Tab_ID)
+;
+
+
+-- Aug 14, 2012 4:48:34 PM COT
+UPDATE AD_Tab SET EntityType='D',Updated=TO_TIMESTAMP('2012-08-14 16:48:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=200010
+;
+
+-- Aug 14, 2012 4:49:09 PM COT
+-- Active
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,1,'N','N',200301,'Y',200277,'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.','D','The record is active in the system','Active','Y','N','a299f169-5588-4ce8-a0a8-d9a5435835ae',100,0,TO_TIMESTAMP('2012-08-14 16:49:08','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:08','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:09 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200277 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 14, 2012 4:49:10 PM COT
+-- ASP Level
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200305,'Y',200278,'N','D','ASP Level','Y','N','8289aece-c729-4aff-bcda-16d76ef20f10',100,0,TO_TIMESTAMP('2012-08-14 16:49:09','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:09','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:10 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200278 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 14, 2012 4:49:10 PM COT
+-- Key
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid) VALUES ('N',200010,10,'N','N',200293,'Y',200279,'N','D','ASP_Ref_List','N','N','622dbe18-9630-4114-b4ae-9e2c5872c3ed',100,0,TO_TIMESTAMP('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),'Y','N')
+;
+
+-- Aug 14, 2012 4:49:10 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200279 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 14, 2012 4:49:11 PM COT
+-- UU
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,36,'N','N',200300,'Y',200280,'N','D','ASP_Ref_List_UU','Y','N','47d4060c-eee9-4eec-8fd5-4a49a8e1da60',100,0,TO_TIMESTAMP('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:10','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200280 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+-- Status
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,1,'N','N',200302,'Y',200281,'N','D','ASP Status','Y','N','131721db-4fac-402d-bd4a-b9df4d28185d',100,0,TO_TIMESTAMP('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:11 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200281 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:12 PM COT
+-- Client
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200294,'Y',200282,'N','A Client is a company or a legal entity. You cannot share data between Clients. Tenant is a synonym for Client.','D','Client/Tenant for this installation.','Client','Y','N','02fcc057-a62a-4c88-88b1-6844c675105b',100,0,TO_TIMESTAMP('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:11','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:12 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200282 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+
+-- Aug 14, 2012 4:49:12 PM COT
+-- Organization
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200295,'Y',200283,'N','An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.','D','Organizational entity within client','Organization','Y','N','c4aa51bf-4eda-4fda-bec4-419343d33eec',100,0,TO_TIMESTAMP('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:12 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200283 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+-- Reference
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200299,'Y',200284,'N','The Reference could be a display type, list or table validation.','D','System Reference and Validation','Reference','Y','N','a1fb2962-baa0-4ed4-aa10-235151c79491',100,0,TO_TIMESTAMP('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:12','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200284 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',200010,10,'N','N',200303,'Y',200285,'N','The Reference List field indicates a list of reference values from a database tables.  Reference lists populate drop down list boxes in data entry screens','D','Reference List based on Table','Reference List','Y','N','981ba7dc-6214-459c-add0-a6831e47ff95',100,0,TO_TIMESTAMP('2012-08-14 16:49:13','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-08-14 16:49:13','YYYY-MM-DD HH24:MI:SS'),'Y')
+;
+
+-- Aug 14, 2012 4:49:13 PM COT
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200285 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=200282
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=200283
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=200278
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=200284
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=200285
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=200281
+;
+
+-- Aug 14, 2012 4:50:07 PM COT
+UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=200277
+;
+
+-- Aug 14, 2012 4:50:27 PM COT
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2012-08-14 16:50:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200283
+;
+
+-- Aug 14, 2012 4:50:34 PM COT
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2012-08-14 16:50:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200285
+;
+
+-- Aug 14, 2012 4:50:43 PM COT
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2012-08-14 16:50:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200277
+;
+
+-- Aug 14, 2012 4:56:32 PM COT
+INSERT INTO AD_Val_Rule (Code,AD_Val_Rule_ID,EntityType,Name,Description,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Client_ID,IsActive,AD_Org_ID) VALUES ('AD_Ref_List.AD_Reference_ID=@AD_Reference_ID@',200003,'U','AD_Ref_List_ID by Reference','Ref List by Reference','S','6d752432-378a-4f8b-a1d5-81738e45731b',100,100,TO_TIMESTAMP('2012-08-14 16:56:31','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-08-14 16:56:31','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
+;
+
+-- Aug 14, 2012 5:08:52 PM COT
+UPDATE AD_Column SET AD_Reference_Value_ID=53234, AD_Reference_ID=17,Updated=TO_TIMESTAMP('2012-08-14 17:08:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200302
+;
+
+-- Aug 14, 2012 5:08:52 PM COT
+UPDATE AD_Column SET AD_Reference_Value_ID=53234, AD_Reference_ID=17,Updated=TO_TIMESTAMP('2012-08-14 17:08:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200302
+;
+
+-- Aug 16, 2012 4:37:29 PM COT
+UPDATE AD_Tab SET DisplayLogic=NULL,Updated=TO_TIMESTAMP('2012-08-16 16:37:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=53058
+;
+
+-- Aug 17, 2012 10:45:49 AM COT
+UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=200280
+;
+
+-- Aug 17, 2012 10:46:41 AM COT
+UPDATE AD_Column SET DefaultValue='@#AD_Client_ID@',Updated=TO_TIMESTAMP('2012-08-17 10:46:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200294
+;
+
+-- Aug 17, 2012 10:46:56 AM COT
+UPDATE AD_Column SET DefaultValue='@#AD_Org_ID@',Updated=TO_TIMESTAMP('2012-08-17 10:46:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200295
+;
+
+-- Aug 17, 2012 10:47:11 AM COT
+UPDATE AD_Column SET DefaultValue='U',Updated=TO_TIMESTAMP('2012-08-17 10:47:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200302
+;
+
+-- Aug 17, 2012 10:47:18 AM COT
+UPDATE AD_Column SET DefaultValue='Y',Updated=TO_TIMESTAMP('2012-08-17 10:47:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200301
+;
+
+-- Aug 17, 2012 11:48:50 AM COT
+UPDATE AD_Column SET AD_Val_Rule_ID=200003,Updated=TO_TIMESTAMP('2012-08-17 11:48:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200303
+;
+
+-- Aug 17, 2012 2:42:59 PM COT
+-- Sequence asp_ref_list
+INSERT INTO AD_Sequence (StartNewYear,CurrentNextSys,IsTableID,StartNo,CurrentNext,IsAudited,IsAutoSequence,AD_Sequence_ID,Description,Name,IncrementNo,AD_Sequence_UU,AD_Org_ID,AD_Client_ID,Created,CreatedBy,Updated,UpdatedBy,IsActive) VALUES ('N',50000,'Y',1000000,1000000,'N','Y',200012,'ASP_Ref_List','ASP_Ref_List',1,'db36a063-5d47-4131-aded-85cce9c8b4c8',0,0,TO_TIMESTAMP('2012-08-17 14:42:58','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2012-08-17 14:42:58','YYYY-MM-DD HH24:MI:SS'),100,'Y')
+;
+
+-- Aug 22, 2012 11:04:29 PM COT
+UPDATE AD_Column SET AD_Val_Rule_ID=52047,Updated=TO_TIMESTAMP('2012-08-22 23:04:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200299
+;
+
+-- Aug 22, 2012 11:20:55 PM COT
+-- IDEMPIERE-363 ASP / SaaS module - implement reference lists show/hide option
+UPDATE AD_Column SET AD_Val_Rule_ID=186,Updated=TO_TIMESTAMP('2012-08-22 23:20:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54231
+;
+
+UPDATE AD_System
+  SET LastMigrationScriptApplied='877_IDEMPIERE_363.sql'
+WHERE LastMigrationScriptApplied<'877_IDEMPIERE_363.sql'
+   OR LastMigrationScriptApplied IS NULL
+;
diff --git a/migration/360lts-release/postgresql/884_IDEMPIERE-246.sql b/migration/360lts-release/postgresql/884_IDEMPIERE-246.sql
index 310b633bf8..e6edbc9d9a 100644
--- a/migration/360lts-release/postgresql/884_IDEMPIERE-246.sql
+++ b/migration/360lts-release/postgresql/884_IDEMPIERE-246.sql
@@ -370,15 +370,6 @@ UPDATE AD_Field SET SeqNo=570,IsDisplayed='Y' WHERE AD_Field_ID=52016
 ;
 
 -- GardenWorld seed BOMs
-INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
-  VALUES(200001, 11, 0, 'Y', TO_TIMESTAMP('2003-01-21 20:05:55','YYYY-MM-DD HH24:MI:SS'), 100, TO_TIMESTAMP('2009-02-17 17:20:59','YYYY-MM-DD HH24:MI:SS'), 100, 30, 145, 135, 1, '1 table, 4 Chairs and 1 Sun Screen', 'P');
-
-INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
-  VALUES(200002, 11, 0, 'Y', TO_TIMESTAMP('2003-01-21 20:05:20','YYYY-MM-DD HH24:MI:SS'), 100, TO_TIMESTAMP('2003-12-30 18:18:34','YYYY-MM-DD HH24:MI:SS'), 100, 10, 145, 134, 1, '1 table, 4 Chairs and 1 Sun Screen', 'P');
-
-INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
-  VALUES(200003, 11, 0, 'Y', TO_TIMESTAMP('2003-01-21 20:05:46','YYYY-MM-DD HH24:MI:SS'), 100, TO_TIMESTAMP('2003-12-30 18:19:08','YYYY-MM-DD HH24:MI:SS'), 100, 20, 145, 133, 4, '1 table, 4 Chairs and 1 Sun Screen', 'P');
-
 INSERT INTO m_product_bom(m_product_bom_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, line, m_product_id, m_productbom_id, bomqty, description, bomtype)
   VALUES(200004, 11, 0, 'Y', TO_TIMESTAMP('2008-09-22 14:45:22','YYYY-MM-DD HH24:MI:SS'), 100, TO_TIMESTAMP('2008-09-22 14:45:22','YYYY-MM-DD HH24:MI:SS'), 100, 10, 133, 50004, 1, 'Nice Chair for outdoors', 'P');
 
diff --git a/migration/360lts-release/postgresql/894_IDEMPIERE-246.sql b/migration/360lts-release/postgresql/894_IDEMPIERE-246.sql
new file mode 100644
index 0000000000..a0fd005f7e
--- /dev/null
+++ b/migration/360lts-release/postgresql/894_IDEMPIERE-246.sql
@@ -0,0 +1,405 @@
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=167
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=357
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=229
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=412
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=4, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=256
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=5, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=197
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=6, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=477
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=7, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=181
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=8, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=179
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=9, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=503
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=10, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=196
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=11, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=228
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=12, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=479
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=13, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=482
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=14, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=481
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=15, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=411
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=16, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53253
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=17, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=426
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=18, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=537
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=19, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=311
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=20, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=292
+;
+
+-- Aug 27, 2012 8:17:35 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=21, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=504
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=22, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=515
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=218
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=153
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=263
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=166
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=4, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=203
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=5, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53242
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=6, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=236
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=7, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=183
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=8, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=160
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=9, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=278
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=10, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53296
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=11, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=345
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=12, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53014
+;
+
+-- Aug 27, 2012 8:17:36 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=13, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53108
+;
+
+-- Aug 27, 2012 8:17:46 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Menu SET Name='Manufacturing',Updated=TO_TIMESTAMP('2012-08-27 08:17:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=53296
+;
+
+-- Aug 27, 2012 8:17:46 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Menu_Trl SET IsTranslated='N' WHERE AD_Menu_ID=53296
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=167
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=357
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=229
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=412
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=4, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=256
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=5, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=197
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=6, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=477
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=7, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=181
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=8, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=179
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=9, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=503
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=10, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=196
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=11, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=479
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=12, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=482
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=13, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=481
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=14, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=411
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=15, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53253
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=16, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=426
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=17, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=537
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=18, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=311
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=19, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=292
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=20, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=504
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=183, SeqNo=21, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=515
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=0, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53350
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=1, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53351
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=2, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53298
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=3, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53299
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=4, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53300
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=5, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53301
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=6, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53352
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=7, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53302
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=8, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53353
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=9, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53354
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=10, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=228
+;
+
+-- Aug 27, 2012 8:19:57 AM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_TreeNodeMM SET Parent_ID=53296, SeqNo=11, Updated=CURRENT_TIMESTAMP WHERE AD_Tree_ID=10 AND Node_ID=53297
+;
+
+-- Aug 27, 2012 3:15:50 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=61997
+;
+
+-- Aug 27, 2012 3:15:58 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=61997
+;
+
+-- Aug 27, 2012 5:34:16 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET SeqNo=10,Updated=TO_TIMESTAMP('2012-08-27 17:34:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53520
+;
+
+-- Aug 27, 2012 5:34:23 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET IsMandatory='Y', FieldLength=10, SeqNo=20,Updated=TO_TIMESTAMP('2012-08-27 17:34:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53521
+;
+
+-- Aug 27, 2012 5:34:27 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET SeqNo=30,Updated=TO_TIMESTAMP('2012-08-27 17:34:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53522
+;
+
+-- Aug 27, 2012 5:34:32 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET FieldLength=10,Updated=TO_TIMESTAMP('2012-08-27 17:34:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53520
+;
+
+-- Aug 27, 2012 5:34:36 PM COT
+-- IDEMPIERE-246 Integrate Manufacturing Light
+UPDATE AD_Process_Para SET FieldLength=10,Updated=TO_TIMESTAMP('2012-08-27 17:34:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=53522
+;
+
+UPDATE AD_System
+  SET LastMigrationScriptApplied='894_IDEMPIERE-246.sql'
+WHERE LastMigrationScriptApplied<'894_IDEMPIERE-246.sql'
+   OR LastMigrationScriptApplied IS NULL
+;
diff --git a/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql b/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql
index 2bb918f457..36cdec48e8 100644
--- a/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql
+++ b/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql
@@ -427,7 +427,7 @@ UPDATE AD_WF_NODE n
            WHERE w.ad_window_id = n.ad_window_id
              AND (   w.NAME <> n.NAME
                   OR NVL (w.description, ' ') <> NVL (n.description, ' ')
-                  OR NVL (w.HELP, ' ') <> NVL (n.HELP, ' ')
+                  OR NVL (w.HELP, ' ') <> NVL (CAST(n.HELP AS VARCHAR2(4000)), ' ')
                  ));
 
 UPDATE AD_WF_NODE_TRL trl
@@ -459,7 +459,7 @@ UPDATE AD_WF_NODE_TRL trl
              AND n.isactive = 'Y'
              AND (   trl.NAME <> t.NAME
                   OR NVL (trl.description, ' ') <> NVL (t.description, ' ')
-                  OR NVL (trl.HELP, ' ') <> NVL (t.HELP, ' ')
+                  OR NVL (CAST(trl.HELP AS VARCHAR2(4000)), ' ') <> NVL (t.HELP, ' ')
                  ));
 
 UPDATE AD_WF_NODE n
@@ -473,7 +473,7 @@ UPDATE AD_WF_NODE n
            WHERE f.ad_form_id = n.ad_form_id
              AND (   f.NAME <> n.NAME
                   OR NVL (f.description, ' ') <> NVL (n.description, ' ')
-                  OR NVL (f.HELP, ' ') <> NVL (n.HELP, ' ')
+                  OR NVL (f.HELP, ' ') <> NVL (CAST(n.HELP AS VARCHAR2(4000)), ' ')
                  ));
 
 UPDATE AD_WF_NODE_TRL trl
@@ -493,7 +493,7 @@ UPDATE AD_WF_NODE_TRL trl
              AND n.isactive = 'Y'
              AND (   trl.NAME <> t.NAME
                   OR NVL (trl.description, ' ') <> NVL (t.description, ' ')
-                  OR NVL (trl.HELP, ' ') <> NVL (t.HELP, ' ')
+                  OR NVL (CAST(trl.HELP AS VARCHAR2(4000)), ' ') <> NVL (t.HELP, ' ')
                  ));
 
 UPDATE AD_WF_NODE n
@@ -507,7 +507,7 @@ UPDATE AD_WF_NODE n
            WHERE f.ad_process_id = n.ad_process_id
              AND (   f.NAME <> n.NAME
                   OR NVL (f.description, ' ') <> NVL (n.description, ' ')
-                  OR NVL (f.HELP, ' ') <> NVL (n.HELP, ' ')
+                  OR NVL (f.HELP, ' ') <> NVL (CAST(n.HELP AS VARCHAR2(4000)), ' ')
                  ));
 
 UPDATE AD_WF_NODE_TRL trl
@@ -527,7 +527,7 @@ UPDATE AD_WF_NODE_TRL trl
              AND n.isactive = 'Y'
              AND (   trl.NAME <> t.NAME
                   OR NVL (trl.description, ' ') <> NVL (t.description, ' ')
-                  OR NVL (trl.HELP, ' ') <> NVL (t.HELP, ' ')
+                  OR NVL (CAST(trl.HELP AS VARCHAR2(4000)), ' ') <> NVL (t.HELP, ' ')
                  ));
 
 UPDATE AD_PRINTFORMATITEM pfi
diff --git a/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java b/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java
index 1f76487243..eba3847126 100644
--- a/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/BOMFlagValidate.java
@@ -2,8 +2,10 @@ package org.compiere.process;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.logging.Level;
 
+import org.compiere.model.MProduct;
 import org.compiere.process.ProcessInfoParameter;
 import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
@@ -35,50 +37,61 @@ public class BOMFlagValidate extends SvrProcess {
 		
 		flagNonBOMs();
 		flagBOMs();
-		return "BOM Flags set correctly";
+		return "@OK@";
 	}
 	
-	private void flagNonBOMs() throws Exception
+	private void flagNonBOMs() throws SQLException
 	{
 		
 		//Select Products where there's a BOM, and there are no lines
-		String sql = "SELECT NAME FROM M_PRODUCT WHERE ISBOM = 'Y' AND " + 
-		"M_PRODUCT_ID NOT IN (SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM ) AND "; 
+		String sql = "SELECT Name, M_Product_ID FROM M_Product WHERE IsBOM = 'Y' AND " + 
+		"M_Product_ID NOT IN (SELECT M_Product_ID FROM M_Product_BOM ) AND "; 
 		if (p_M_Product_Category_ID == 0)
 			sql += "AD_Client_ID= ?";
 	        
 		else
 			sql += "M_Product_Category_ID= ?";
 		PreparedStatement pstmt = null;
-		pstmt = DB.prepareStatement (sql, null);
-		if (p_M_Product_Category_ID == 0)
-			pstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
-		else
-			pstmt.setInt(1, p_M_Product_Category_ID);
-		ResultSet rs = pstmt.executeQuery ();
-		
-		while (rs.next())
-		{
-			addLog(0, null, null, rs.getString(1) + "Has Been Flagged as NonBOM as it has no lines");
+		ResultSet rs = null;
+		try {
+			pstmt = DB.prepareStatement (sql, get_TrxName());
+			if (p_M_Product_Category_ID == 0)
+				pstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
+			else
+				pstmt.setInt(1, p_M_Product_Category_ID);
+			rs = pstmt.executeQuery ();
+
+			while (rs.next())
+			{
+				addLog(0, null, null, rs.getString(1) + " BOM without BOM lines", MProduct.Table_ID, rs.getInt(2));
+			}
+		} catch (SQLException e) {
+			throw e;
+		} finally {
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
+		}
+
+		PreparedStatement upstmt = null;
+		try {
+			String update = "UPDATE M_Product SET IsBOM = 'N' WHERE IsBOM = 'Y' AND M_Product_ID NOT IN " +
+					"(SELECT M_Product_ID FROM M_Product_BOM ) AND "; 
+			if (p_M_Product_Category_ID == 0)
+				update += "AD_Client_ID= ?";
+			else
+				update += "M_Product_Category_ID= ?";
+			upstmt = DB.prepareStatement (update, get_TrxName());
+			if (p_M_Product_Category_ID == 0)
+				upstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
+			else
+				upstmt.setInt(1, p_M_Product_Category_ID);
+			upstmt.executeUpdate();
+		} catch (SQLException e) {
+			throw e;
+		} finally {
+			DB.close(upstmt);
+			upstmt = null;
 		}
-		
-		rs.close();
-		pstmt.close();
-		
-		String update = "UPDATE M_Product SET ISBOM = 'N' WHERE ISBOM = 'Y' AND M_PRODUCT_ID NOT IN " +
-		"(SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM ) AND "; 
-		if (p_M_Product_Category_ID == 0)
-			update += "AD_Client_ID= ?";
-		else
-			update += "M_Product_Category_ID= ?";
-		pstmt = null;
-		pstmt = DB.prepareStatement (update, null);
-		if (p_M_Product_Category_ID == 0)
-			pstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
-		else
-			pstmt.setInt(1, p_M_Product_Category_ID);
-		pstmt.executeUpdate();
-		pstmt.close();
 		
 	}
 	
@@ -86,42 +99,54 @@ public class BOMFlagValidate extends SvrProcess {
 	{
 		
 		//Select Products where there's a BOM, and there are no lines
-		String sql = "SELECT NAME FROM M_PRODUCT WHERE ISBOM = 'N' AND " + 
-		"M_PRODUCT_ID IN (SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM ) AND "; 
+		String sql = "SELECT Name, M_Product_ID FROM M_Product WHERE IsBOM = 'N' AND " + 
+		"M_Product_ID IN (SELECT M_Product_ID FROM M_Product_BOM ) AND "; 
 		if (p_M_Product_Category_ID == 0)
 			sql += "AD_Client_ID= ?";
 	        
 		else
 			sql += "M_Product_Category_ID= ?";
 		PreparedStatement pstmt = null;
-		pstmt = DB.prepareStatement (sql, null);
-		if (p_M_Product_Category_ID == 0)
-			pstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
-		else
-			pstmt.setInt(1, p_M_Product_Category_ID);
-		ResultSet rs = pstmt.executeQuery ();
-		
-		while (rs.next())
-		{
-			addLog(0, null, null, rs.getString(1) + "Has Been Flagged as BOM as it has BOM lines");
+		ResultSet rs = null;
+		try {
+			pstmt = DB.prepareStatement (sql, get_TrxName());
+			if (p_M_Product_Category_ID == 0)
+				pstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
+			else
+				pstmt.setInt(1, p_M_Product_Category_ID);
+			rs = pstmt.executeQuery ();
+
+			while (rs.next())
+			{
+				addLog(0, null, null, rs.getString(1) + " not BOM with BOM lines", MProduct.Table_ID, rs.getInt(2));
+			}
+		} catch (SQLException e) {
+			throw e;
+		} finally {
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
 		}
-		rs.close();
-		pstmt.close();
 		
-		String update = "UPDATE M_Product SET ISBOM = 'Y' WHERE ISBOM = 'N' AND M_PRODUCT_ID IN " +
-		"(SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM ) AND "; 
+		String update = "UPDATE M_Product SET ISBOM = 'Y' WHERE IsBOM = 'N' AND M_Product_ID IN " +
+				"(SELECT M_Product_ID FROM M_Product_BOM ) AND "; 
 		if (p_M_Product_Category_ID == 0)
 			update += "AD_Client_ID= ?";
 		else
 			update += "M_Product_Category_ID= ?";
-		pstmt = null;
-		pstmt = DB.prepareStatement (update, null);
-		if (p_M_Product_Category_ID == 0)
-			pstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
-		else
-			pstmt.setInt(1, p_M_Product_Category_ID);
-		pstmt.executeUpdate();
-		pstmt.close();
+		PreparedStatement upstmt = null;
+		try {
+			upstmt = DB.prepareStatement (update, get_TrxName());
+			if (p_M_Product_Category_ID == 0)
+				upstmt.setInt (1, Env.getAD_Client_ID(getCtx()));
+			else
+				upstmt.setInt(1, p_M_Product_Category_ID);
+			upstmt.executeUpdate();
+		} catch (SQLException e) {
+			throw e;
+		} finally {
+			DB.close(upstmt);
+			upstmt = null;
+		}
 		
 	}
 
diff --git a/org.adempiere.base.process/src/org/compiere/process/BOMValidate.java b/org.adempiere.base.process/src/org/compiere/process/BOMValidate.java
index a9bfd16fb0..4faa2514b0 100644
--- a/org.adempiere.base.process/src/org/compiere/process/BOMValidate.java
+++ b/org.adempiere.base.process/src/org/compiere/process/BOMValidate.java
@@ -99,7 +99,7 @@ public class BOMValidate extends SvrProcess
 		ResultSet rs = null;
 		try
 		{
-			pstmt = DB.prepareStatement (sql, null);
+			pstmt = DB.prepareStatement (sql, get_TrxName());
 			if (p_M_Product_Category_ID == 0)
 				pstmt.setInt (1, AD_Client_ID);
 			else
@@ -107,8 +107,8 @@ public class BOMValidate extends SvrProcess
 			rs = pstmt.executeQuery ();
 			while (rs.next ())
 			{
-				String info = validateProduct(new MProduct(getCtx(), rs.getInt(1), get_TrxName()));
-				addLog(0, null, null, info);
+				String info = validateProduct(new MProduct(getCtx(), rs.getInt("M_Product_ID"), get_TrxName()));
+				addLog(0, null, null, info, MProduct.Table_ID, rs.getInt("M_Product_ID"));
 				counter++;
 			}
 		}
diff --git a/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java b/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
index f48d2d2db9..40d9ca266a 100644
--- a/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
+++ b/org.adempiere.base.process/src/org/compiere/process/BOMVerify.java
@@ -39,12 +39,10 @@ public class BOMVerify extends SvrProcess
 	/** Re-Validate			*/
 	private boolean	p_IsReValidate = false;
 	
-	/**	Product				*/
-	private MProduct			m_product = null;
 	/**	List of Products	*/
-	private ArrayList<MProduct>	foundproducts = new ArrayList<MProduct>();
+	private ArrayList<MProduct>	 foundproducts = new ArrayList<MProduct>();
 	private ArrayList<MProduct> validproducts = new ArrayList<MProduct>();
-	private ArrayList<MProduct>	invalidproducts = new ArrayList<MProduct>();
+	private ArrayList<MProduct>	 invalidproducts = new ArrayList<MProduct>();
 	private ArrayList<MProduct> containinvalidproducts = new ArrayList<MProduct>();
 	private ArrayList<MProduct> checkedproducts = new ArrayList<MProduct>();
 	
@@ -90,6 +88,7 @@ public class BOMVerify extends SvrProcess
 		//
 		int counter = 0;
 		PreparedStatement pstmt = null;
+		ResultSet rs = null;
 		String sql = "SELECT M_Product_ID FROM M_Product "
 			+ "WHERE IsBOM='Y' AND ";
 		if (p_M_Product_Category_ID == 0)
@@ -102,12 +101,12 @@ public class BOMVerify extends SvrProcess
 		int AD_Client_ID = Env.getAD_Client_ID(getCtx());
 		try
 		{
-			pstmt = DB.prepareStatement (sql, null);
+			pstmt = DB.prepareStatement (sql, get_TrxName());
 			if (p_M_Product_Category_ID == 0)
 				pstmt.setInt (1, AD_Client_ID);
 			else
 				pstmt.setInt(1, p_M_Product_Category_ID);
-			ResultSet rs = pstmt.executeQuery ();
+			rs = pstmt.executeQuery ();
 			while (rs.next ())
 			{
 				p_M_Product_ID = rs.getInt(1); //ADAXA - validate the product retrieved from database
@@ -115,23 +114,15 @@ public class BOMVerify extends SvrProcess
 				
 				counter++;
 			}
-			rs.close ();
-			pstmt.close ();
-			pstmt = null;
 		}
 		catch (Exception e)
 		{
-			log.log (Level.SEVERE, sql, e);
+			throw e;
 		}
-		try
+		finally
 		{
-			if (pstmt != null)
-				pstmt.close ();
-			pstmt = null;
-		}
-		catch (Exception e)
-		{
-			pstmt = null;
+			DB.close(rs, pstmt);
+			rs = null; pstmt = null;
 		}
 		return "#" + counter;
 	}	//	doIt
@@ -183,7 +174,7 @@ public class BOMVerify extends SvrProcess
 				else if (foundproducts.contains(pp))
 				{
 					invalid = true;
-					addLog(0, null, null, product.getValue() + " recursively contains " + pp.getValue());
+					addLog(0, null, null, product.getValue() + " recursively contains " + pp.getValue(), MProduct.Table_ID, product.getM_Product_ID());
 				}
 				else
 				{
@@ -223,11 +214,6 @@ public class BOMVerify extends SvrProcess
 			return true;
 		}
 		
-		
-		
 	}	//	validateProduct
-
-
 	
 }	//	BOMValidate
-
diff --git a/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java b/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java
index ad2e11baad..a55f4583b9 100644
--- a/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java
+++ b/org.adempiere.base.process/src/org/compiere/process/IndentedBOM.java
@@ -24,13 +24,10 @@ import java.util.logging.Level;
 import org.adempiere.exceptions.FillMandatoryException;
 import org.compiere.model.MAcctSchema;
 import org.compiere.model.MCost;
-import org.compiere.model.MCostElement;
 import org.compiere.model.MProduct;
 import org.compiere.model.MProductBOM;
 import org.compiere.model.Query;
 import org.compiere.model.X_T_BOM_Indented;
-import org.compiere.process.ProcessInfoParameter;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.Env;
 
 /**
@@ -49,13 +46,10 @@ public class IndentedBOM extends SvrProcess
 	private int p_C_AcctSchema_ID = 0;
 	private int p_M_Product_ID = 0;
 	private int p_M_CostElement_ID = 0;
-	private String p_CostingMethod = MCostElement.COSTINGMETHOD_StandardCosting;
 	//
 	private int m_LevelNo = 0;
 	private int m_SeqNo = 0;
 	private MAcctSchema m_as = null;
-	private BigDecimal m_currentCost = Env.ZERO;
-	private BigDecimal m_futureCost = Env.ZERO;
 
 	protected void prepare()
 	{
@@ -122,7 +116,7 @@ public class IndentedBOM extends SvrProcess
 		tboml.setLevelNo(m_LevelNo);
 		String pad = "";
 		if (m_LevelNo > 0)
-			pad = String.format("%1$" + 4*1 + "s", "");
+			pad = String.format("%1$" + 4*m_LevelNo + "s", "");
 		tboml.setLevels( (m_LevelNo > 0 ? ":" : "") +  pad +" " + product.getValue());
 		//
 		// Set Costs:
@@ -183,7 +177,7 @@ public class IndentedBOM extends SvrProcess
 		whereClause.append(MProductBOM.COLUMNNAME_M_Product_ID).append("=?");
 		params.add(product.get_ID());
 		
-		List<MProductBOM> list = new Query(getCtx(), MProductBOM.Table_Name, whereClause.toString(), null)
+		List<MProductBOM> list = new Query(getCtx(), MProductBOM.Table_Name, whereClause.toString(), get_TrxName())
 									.setParameters(params)
 									.setOnlyActiveRecords(true)
 									.setOrderBy(MProductBOM.COLUMNNAME_Line)
diff --git a/org.adempiere.base.process/src/org/compiere/process/ProductionProcess.java b/org.adempiere.base.process/src/org/compiere/process/ProductionProcess.java
index 2c7ad887e5..a53d74f0b9 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ProductionProcess.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ProductionProcess.java
@@ -5,8 +5,6 @@ import java.util.logging.Level;
 
 import org.compiere.model.MProduction;
 import org.compiere.model.MProductionLine;
-import org.compiere.process.ProcessInfoParameter;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.AdempiereSystemError;
 import org.compiere.util.AdempiereUserError;
 
@@ -24,9 +22,6 @@ public class ProductionProcess extends SvrProcess {
 	private Timestamp p_MovementDate = null;
 	private MProduction m_production = null;
 	private boolean mustBeStocked = false;  //not used
-	private boolean recreate = false;
-	private boolean issued = false;
-	//private int p_M_Locator_ID=0;
 	
 	
 	protected void prepare() {
@@ -77,7 +72,7 @@ public class ProductionProcess extends SvrProcess {
 			errors.append( lines[i].createTransactions(m_production.getMovementDate(), mustBeStocked) );
 			//TODO error handling 
 			lines[i].setProcessed( true );
-			lines[i].save(get_TrxName());
+			lines[i].saveEx(get_TrxName());
 			processed++;
 		}
 		
@@ -88,7 +83,7 @@ public class ProductionProcess extends SvrProcess {
 		
 		m_production.setProcessed(true);
 		
-		m_production.save(get_TrxName());
+		m_production.saveEx(get_TrxName());
 		return processed + " production lines were processed";
 	}
 
diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
index d401768f29..9ddc83163c 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java
@@ -22,7 +22,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.logging.Level;
 
 import org.compiere.model.MBPartner;
@@ -35,22 +34,18 @@ import org.compiere.model.MOrderLine;
 import org.compiere.model.MOrg;
 import org.compiere.model.MProduct;
 import org.compiere.model.MProduction;
-import org.compiere.model.MProductionLine;
 import org.compiere.model.MReplenish;
 import org.compiere.model.MRequisition;
 import org.compiere.model.MRequisitionLine;
 import org.compiere.model.MStorage;
 import org.compiere.model.MWarehouse;
 import org.compiere.model.X_T_Replenish;
-import org.compiere.process.ProcessInfoParameter;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.AdempiereSystemError;
 import org.compiere.util.AdempiereUserError;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
 import org.compiere.util.ReplenishInterface;
-import org.compiere.util.Util;
 import org.eevolution.model.MDDOrder;
 import org.eevolution.model.MDDOrderLine;
 
@@ -415,7 +410,7 @@ public class ReplenishReportProduction extends SvrProcess
 					if (qto == null)
 						qto = Env.ZERO;
 					replenish.setQtyToOrder(qto);
-					replenish.save();
+					replenish.saveEx();
 				}
 			}
 		}
@@ -470,7 +465,7 @@ public class ReplenishReportProduction extends SvrProcess
 			line.setM_Product_ID(replenish.getM_Product_ID());
 			line.setQty(replenish.getQtyToOrder());
 			line.setPrice();
-			line.save();
+			line.saveEx();
 		}
 		m_info = "#" + noOrders + info;
 		log.info(m_info);
@@ -515,7 +510,7 @@ public class ReplenishReportProduction extends SvrProcess
 			line.setC_BPartner_ID(replenish.getC_BPartner_ID());
 			line.setQty(replenish.getQtyToOrder());
 			line.setPrice();
-			line.save();
+			line.saveEx();
 		}
 		m_info = "#" + noReqs + info;
 		log.info(m_info);
@@ -594,7 +589,7 @@ public class ReplenishReportProduction extends SvrProcess
 				line.setM_AttributeSetInstance_ID(storage.getM_AttributeSetInstance_ID());
 				line.setM_LocatorTo_ID(M_LocatorTo_ID);					//	to
 				line.setM_AttributeSetInstanceTo_ID(storage.getM_AttributeSetInstance_ID());
-				line.save();
+				line.saveEx();
 				//
 				target = target.subtract(moveQty);
 				if (target.signum() == 0)
@@ -728,7 +723,7 @@ public class ReplenishReportProduction extends SvrProcess
 				line.setM_LocatorTo_ID(M_LocatorTo_ID);					//	to
 				line.setM_AttributeSetInstanceTo_ID(storage.getM_AttributeSetInstance_ID());
 				line.setIsInvoiced(false);
-				line.save();
+				line.saveEx();
 				//
 				target = target.subtract(moveQty);
 				if (target.signum() == 0)
@@ -745,7 +740,7 @@ public class ReplenishReportProduction extends SvrProcess
 			line.setM_LocatorTo_ID(M_LocatorTo_ID);					//	to
 			line.setM_AttributeSetInstanceTo_ID(0);
 			line.setIsInvoiced(false);
-			line.save();
+			line.saveEx();
 			
 		}
 		if (replenishs.length == 0)
@@ -813,7 +808,7 @@ public class ReplenishReportProduction extends SvrProcess
 				production.createLines(false);
 
 				production.setIsCreated("Y");
-				production.save(get_TrxName());
+				production.saveEx(get_TrxName());
 				log.fine(production.toString());
 				noProds++;
 				info += " - " + production.getDocumentNo();
diff --git a/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java b/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java
index b809eded29..b8f2987ad7 100644
--- a/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java
+++ b/org.adempiere.base.process/src/org/compiere/process/RollUpCosts.java
@@ -1,13 +1,8 @@
 package org.compiere.process;
 
-import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.logging.Level;
 
-import javax.sql.RowSet;
-
-import org.compiere.process.ProcessInfoParameter;
-import org.compiere.process.SvrProcess;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 
@@ -17,8 +12,6 @@ public class RollUpCosts extends SvrProcess {
 	int category = 0;
 	int product_id = 0;
 	int client_id = 0; 
-	int org_id = 0; 
-	int user_id = 0;
 	int costelement_id = 0;
 	private HashSet<Integer> processed;
 	
@@ -57,11 +50,8 @@ public class RollUpCosts extends SvrProcess {
 	protected String doIt() throws Exception
 	{
 		client_id = Env.getAD_Client_ID(getCtx());
-		org_id = Env.getAD_Org_ID(getCtx());
-		user_id = Env.getAD_User_ID(getCtx());
-		createView();
+		createArray();
 		String result = rollUp();
-		deleteView();
 		return result;
 	}
 	
@@ -76,57 +66,45 @@ public class RollUpCosts extends SvrProcess {
 		}
 		else if (category != 0) //roll up for all categories
 		{
-			String sql = "SELECT M_PRODUCT_ID FROM M_PRODUCT WHERE M_PRODUCT_CATEGORY_ID = " + 
-			    category + " AND AD_CLIENT_ID = " + Env.getAD_Client_ID(getCtx()) + 
-			    " AND M_PRODUCT_ID IN (SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM)";
-			//System.err.println(sql);
-		    RowSet results = DB.getRowSet(sql);
-			while (results.next())
-			{
-				rollUpCosts(results.getInt(1));
+			String sql = "SELECT M_Product_ID FROM M_Product WHERE M_Product_Category_ID = ? AND AD_Client_ID = ? " +
+			    " AND M_Product_ID IN (SELECT M_Product_ID FROM M_Product_BOM)";
+			int[] prodids = DB.getIDsEx(get_TrxName(), sql, category, client_id);
+			for (int prodid : prodids) {
+				rollUpCosts(prodid);
 			}
 		}
 		else //do it for all products 
 		{
-			String sql = "SELECT M_PRODUCT_ID FROM M_PRODUCT WHERE AD_CLIENT_ID = " + Env.getAD_Client_ID(getCtx()) + 
-			   " AND M_PRODUCT_ID IN (SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM)";
-		    //System.err.println(sql);
-	        RowSet results = DB.getRowSet(sql);
-		    while (results.next())
-		    {
-			    rollUpCosts(results.getInt(1));
-		    }
+			String sql = "SELECT M_Product_ID FROM M_Product WHERE AD_Client_ID = ? " +
+			   " AND M_Product_ID IN (SELECT M_Product_ID FROM M_Product_BOM)";
+			int[] prodids = DB.getIDsEx(get_TrxName(), sql, client_id);
+			for (int prodid : prodids) {
+				rollUpCosts(prodid);
+			}
 	    }
 		
 		return "Roll Up Complete";
 	}
     
-	protected void createView() throws Exception
+	protected void createArray() throws Exception
 	{
 		
 		processed = new HashSet<Integer>();
 		
 	}
 	
-	protected void deleteView()
-	{
-	}
-	
 	protected void rollUpCosts(int p_id) throws Exception 
 	{
-		String sql = "SELECT M_ProductBOM_ID FROM M_Product_BOM WHERE M_Product_ID = " + 
-		    p_id + " AND AD_Client_ID = " + Env.getAD_Client_ID(getCtx());
-		//System.err.println(sql);
-		RowSet results = DB.getRowSet(sql);
+		String sql = "SELECT M_ProductBOM_ID FROM M_Product_BOM WHERE M_Product_ID = ? " + 
+		    " AND AD_Client_ID = " + client_id;
+		int[] prodbomids = DB.getIDsEx(get_TrxName(), sql, client_id);
 		
-		while (results.next())
-		{
+		for (int prodbomid : prodbomids) {
 			if ( !processed.contains(p_id)) {
-				rollUpCosts(results.getInt(1));
+				rollUpCosts(prodbomid);
 			}
-        }
-		results.close();
-			
+		}
+
 		//once the subproducts costs are accurate, calculate the costs for this product
 		String update = "UPDATE M_Cost set CurrentCostPrice = COALESCE((select Sum (b.BOMQty * c.currentcostprice)" + 
            " FROM M_Product_BOM b INNER JOIN M_Cost c ON (b.M_PRODUCTBOM_ID = c.M_Product_ID) " + 
@@ -134,14 +112,14 @@ public class RollUpCosts extends SvrProcess {
            " FutureCostPrice = COALESCE((select Sum (b.BOMQty * c.futurecostprice) FROM M_Product_BOM b " + 
            " INNER JOIN M_Cost c ON (b.M_PRODUCTBOM_ID = c.M_Product_ID) " + 
            " WHERE b.M_Product_ID = " + p_id + " AND M_CostElement_ID = " + costelement_id + "),0)" +
-           " WHERE M_Product_ID = " + p_id + " AND AD_Client_ID = " + Env.getAD_Client_ID(getCtx()) +
+           " WHERE M_Product_ID = " + p_id + " AND AD_Client_ID = " + client_id +
            " AND M_CostElement_ID = " + costelement_id +
            " AND M_PRODUCT_ID IN (SELECT M_PRODUCT_ID FROM M_PRODUCT_BOM)";;
         
-		//System.err.println(sql);
 		DB.executeUpdate(update, get_TrxName());
 
 		processed.add(p_id);
 		
 	}
+
 }
diff --git a/org.adempiere.base.process/src/org/compiere/process/UniversalSubstitution.java b/org.adempiere.base.process/src/org/compiere/process/UniversalSubstitution.java
index 7c5edc8505..d95aae5d18 100644
--- a/org.adempiere.base.process/src/org/compiere/process/UniversalSubstitution.java
+++ b/org.adempiere.base.process/src/org/compiere/process/UniversalSubstitution.java
@@ -1,12 +1,12 @@
 package org.compiere.process;
 
-import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
 import java.util.logging.Level;
 
 import org.adempiere.exceptions.AdempiereException;
-import org.compiere.process.ProcessInfoParameter;
-import org.compiere.process.SvrProcess;
-import org.compiere.util.DB;
+import org.compiere.model.MProductBOM;
+import org.compiere.model.Query;
 
 public class UniversalSubstitution extends SvrProcess {
 
@@ -29,21 +29,22 @@ public class UniversalSubstitution extends SvrProcess {
 	}
 
 	@Override
-	protected String doIt() throws Exception {
+	protected String doIt() throws SQLException {
 
 		if ( productId == 0 || replacementId == 0 )
 			throw new AdempiereException("Product and replacement product required");
 		
+		List<MProductBOM> boms = new Query(getCtx(), MProductBOM.Table_Name, "M_ProductBOM_ID=?", get_TrxName())
+			.setParameters(productId)
+			.list();
 		
-	String update = "UPDATE M_Product_BOM bb " +
-		"SET M_PRODUCTBOM_ID = ? " +
-		"WHERE bb.M_PRODUCTBOM_ID = ?";
-		
-		PreparedStatement pstmt = DB.prepareStatement(update, get_TrxName());
-		pstmt.setInt(1, replacementId);
-		pstmt.setInt(2, productId);
-		
-		int count = pstmt.executeUpdate();
+		int count = 0;
+		// Use model class to invalidate the product
+		for (MProductBOM bom : boms) {
+			bom.setM_ProductBOM_ID(replacementId);
+			bom.saveEx();
+			count++;
+		}
 
 		return count + " BOM products updated";
 	}
diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java
index 307cf70ee9..938ac32fb5 100644
--- a/org.adempiere.base/src/org/compiere/model/MClient.java
+++ b/org.adempiere.base/src/org/compiere/model/MClient.java
@@ -923,7 +923,7 @@ public class MClient extends X_AD_Client
 			String sqlvalidate =
 				"SELECT AD_Field_ID "
 				 + "  FROM AD_Field "
-				 + " WHERE (   AD_Field_ID IN ( "
+				 + " WHERE (   AD_Field_ID NOT IN ( "
 				 // ASP subscribed fields for client
 				 + "              SELECT f.AD_Field_ID "
 				 + "                FROM ASP_Field f, ASP_Tab t, ASP_Window w, ASP_Level l, ASP_ClientLevel cl "
@@ -937,38 +937,22 @@ public class MClient extends X_AD_Client
 				 + "                 AND w.IsActive = 'Y' "
 				 + "                 AND l.IsActive = 'Y' "
 				 + "                 AND cl.IsActive = 'Y' "
-				 + "                 AND f.ASP_Status = 'S') "
-				 + "        OR AD_Tab_ID IN ( "
-				 // ASP subscribed fields for client
-				 + "              SELECT t.AD_Tab_ID "
-				 + "                FROM ASP_Tab t, ASP_Window w, ASP_Level l, ASP_ClientLevel cl "
-				 + "               WHERE w.ASP_Level_ID = l.ASP_Level_ID "
-				 + "                 AND cl.AD_Client_ID = " + getAD_Client_ID()
-				 + "                 AND cl.ASP_Level_ID = l.ASP_Level_ID "
-				 + "                 AND t.ASP_Window_ID = w.ASP_Window_ID "
-				 + "                 AND t.IsActive = 'Y' "
-				 + "                 AND w.IsActive = 'Y' "
-				 + "                 AND l.IsActive = 'Y' "
-				 + "                 AND cl.IsActive = 'Y' "
-				 + "                 AND t.AllFields = 'Y' "
-				 + "                 AND t.ASP_Status = 'S') "
-				 + "        OR AD_Field_ID IN ( "
-				 // ASP show exceptions for client
-				 + "              SELECT AD_Field_ID "
-				 + "                FROM ASP_ClientException ce "
-				 + "               WHERE ce.AD_Client_ID = " + getAD_Client_ID()
-				 + "                 AND ce.IsActive = 'Y' "
-				 + "                 AND ce.AD_Field_ID IS NOT NULL "
-				 + "                 AND ce.ASP_Status = 'S') "
-				 + "       ) "
-				 + "   AND AD_Field_ID NOT IN ( "
+				 + "                 AND f.ASP_Status = 'H' "
+				 +"                  AND f.AD_Field_ID NOT IN ("
+				 +" 				 SELECT AD_Field_ID"             
+				 +" 				 FROM ASP_ClientException ce"            
+				 +" 				 WHERE ce.AD_Client_ID ="+getAD_Client_ID()             
+				 +" 				 AND ce.IsActive = 'Y'"              
+				 +"                  AND ce.AD_Field_ID IS NOT NULL"              
+				 +" 				 AND ce.ASP_Status <> 'H')"
+				 + "   UNION ALL "
 				 // minus ASP hide exceptions for client
 				 + "          SELECT AD_Field_ID "
 				 + "            FROM ASP_ClientException ce "
 				 + "           WHERE ce.AD_Client_ID = " + getAD_Client_ID()
 				 + "             AND ce.IsActive = 'Y' "
 				 + "             AND ce.AD_Field_ID IS NOT NULL "
-				 + "             AND ce.ASP_Status = 'H')"
+				 + "             AND ce.ASP_Status = 'H'))"
 				 + " ORDER BY AD_Field_ID";
 			PreparedStatement pstmt = null;
 			ResultSet rs = null;
diff --git a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
index 5a4dffe8c2..f979518461 100644
--- a/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
+++ b/org.adempiere.base/src/org/compiere/model/MLookupFactory.java
@@ -291,14 +291,30 @@ public class MLookupFactory
 	{
 		String byValue = DB.getSQLValueString(null, "SELECT IsOrderByValue FROM AD_Reference WHERE AD_Reference_ID = ? ", AD_Reference_Value_ID);
 		StringBuffer realSQL = new StringBuffer ("SELECT NULL, AD_Ref_List.Value,");
+		MClient client = MClient.get(Env.getCtx());
+		String AspFilter="";
+        if ( client.isUseASP() ) {
+        	AspFilter=" AND AD_Ref_List.AD_Ref_List_ID NOT IN ( " 
+        			 +" SELECT li.AD_Ref_List_ID"
+        			 +" FROM ASP_Ref_List li"
+        			 +" INNER JOIN ASP_Level l ON ( li.ASP_Level_ID = l.ASP_Level_ID)"
+        			 +" INNER JOIN ASP_ClientLevel cl on (l.ASP_Level_ID = cl.ASP_Level_ID)"
+        			 +" INNER JOIN AD_Client c on (cl.AD_Client_ID = c.AD_Client_ID)"
+        			 +" WHERE li.AD_Reference_ID="+AD_Reference_Value_ID
+        			 +" AND li.IsActive='Y'"
+        			 +" AND c.AD_Client_ID="+client.getAD_Client_ID()
+        			 +" AND li.ASP_Status='H')";
+			
+		}
 		if (Env.isBaseLanguage(language, "AD_Ref_List"))
-			realSQL.append("AD_Ref_List.Name,AD_Ref_List.IsActive FROM AD_Ref_List");
+			realSQL.append("AD_Ref_List.Name,AD_Ref_List.IsActive FROM AD_Ref_List ");
 		else
 			realSQL.append("trl.Name, AD_Ref_List.IsActive "
-				+ "FROM AD_Ref_List INNER JOIN AD_Ref_List_Trl trl "
+				+ "FROM AD_Ref_List  INNER JOIN AD_Ref_List_Trl trl "
 				+ " ON (AD_Ref_List.AD_Ref_List_ID=trl.AD_Ref_List_ID AND trl.AD_Language='")
 					.append(language.getAD_Language()).append("')");
 		realSQL.append(" WHERE AD_Ref_List.AD_Reference_ID=").append(AD_Reference_Value_ID);
+		realSQL.append(AspFilter);
 		if ("Y".equals(byValue))
 			realSQL.append(" ORDER BY 2");
 		else
@@ -320,10 +336,10 @@ public class MLookupFactory
 	{
 		StringBuffer realSQL = new StringBuffer ("SELECT ");
 		if (Env.isBaseLanguage(language, "AD_Ref_List"))
-			realSQL.append("AD_Ref_List.Name FROM AD_Ref_List");
+			realSQL.append("AD_Ref_List.Name FROM AD_Ref_List ");
 		else
 			realSQL.append("trl.Name "
-				+ "FROM AD_Ref_List INNER JOIN AD_Ref_List_Trl trl "
+				+ "FROM AD_Ref_List  INNER JOIN AD_Ref_List_Trl trl "
 				+ " ON (AD_Ref_List.AD_Ref_List_ID=trl.AD_Ref_List_ID AND trl.AD_Language='")
 					.append(language.getAD_Language()).append("')");
 		realSQL.append(" WHERE AD_Ref_List.AD_Reference_ID=").append(AD_Reference_Value_ID)
diff --git a/org.adempiere.base/src/org/compiere/model/MProduction.java b/org.adempiere.base/src/org/compiere/model/MProduction.java
index 523782742c..70b36445f6 100644
--- a/org.adempiere.base/src/org/compiere/model/MProduction.java
+++ b/org.adempiere.base/src/org/compiere/model/MProduction.java
@@ -6,27 +6,24 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Properties;
-import java.util.logging.Level;
 
 import org.adempiere.exceptions.AdempiereException;
-import org.compiere.model.MAttributeSetInstance;
-import org.compiere.model.MOrderLine;
-import org.compiere.model.MProduct;
-import org.compiere.model.MStorage;
-import org.compiere.model.X_M_Production;
 import org.compiere.util.AdempiereUserError;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 
 public class MProduction extends X_M_Production {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -9055468125493188165L;
 
 	/**
 	 * 
 	 */
 	/** Log								*/
 	private static CLogger		m_log = CLogger.getCLogger (MProduction.class);
-	private static final long serialVersionUID = 1L;
 	private int lineno;
 	private int count;
 
@@ -107,7 +104,7 @@ public class MProduction extends X_M_Production {
 		line.setMovementQty( getProductionQty());
 		line.setPlannedQty(getProductionQty());
 		
-		line.save();
+		line.saveEx();
 		count++;
 		
 		createLines(mustBeStocked, finishedProduct, getProductionQty());
@@ -166,7 +163,7 @@ public class MProduction extends X_M_Production {
 						BOMLine.setM_Locator_ID( defaultLocator );  
 						BOMLine.setQtyUsed(BOMMovementQty );
 						BOMLine.setPlannedQty( BOMMovementQty );
-						BOMLine.save(get_TrxName());
+						BOMLine.saveEx(get_TrxName());
 
 						lineno = lineno + 10;
 						count++;					
@@ -180,7 +177,7 @@ public class MProduction extends X_M_Production {
 						BOMLine.setM_Locator_ID( defaultLocator );  
 						BOMLine.setQtyUsed( BOMMovementQty );
 						BOMLine.setPlannedQty( BOMMovementQty );
-						BOMLine.save(get_TrxName());
+						BOMLine.saveEx(get_TrxName());
 
 						lineno = lineno + 10;
 						count++;
@@ -232,7 +229,7 @@ public class MProduction extends X_M_Production {
 									BOMLine.setQtyUsed(BOMLine.getQtyUsed()
 											.add(lineQty));
 									BOMLine.setPlannedQty(BOMLine.getQtyUsed());
-									BOMLine.save(get_TrxName());
+									BOMLine.saveEx(get_TrxName());
 
 								}
 								// otherwise create new line
@@ -245,7 +242,7 @@ public class MProduction extends X_M_Production {
 									BOMLine.setPlannedQty( lineQty);
 									if ( slASI != 0 && locAttribSet != 0 )  // ie non costing attribute
 										BOMLine.setM_AttributeSetInstance_ID(slASI);
-									BOMLine.save(get_TrxName());
+									BOMLine.saveEx(get_TrxName());
 
 									lineno = lineno + 10;
 									count++;
@@ -270,7 +267,7 @@ public class MProduction extends X_M_Production {
 									BOMLine.setQtyUsed(BOMLine.getQtyUsed()
 											.add(BOMMovementQty));
 									BOMLine.setPlannedQty(BOMLine.getQtyUsed());
-									BOMLine.save(get_TrxName());
+									BOMLine.saveEx(get_TrxName());
 
 								}
 								// otherwise create new line
@@ -282,7 +279,7 @@ public class MProduction extends X_M_Production {
 									BOMLine.setM_Locator_ID( defaultLocator );  
 									BOMLine.setQtyUsed( BOMMovementQty);
 									BOMLine.setPlannedQty( BOMMovementQty);
-									BOMLine.save(get_TrxName());
+									BOMLine.saveEx(get_TrxName());
 
 									lineno = lineno + 10;
 									count++;
diff --git a/org.adempiere.base/src/org/compiere/model/MProductionLine.java b/org.adempiere.base/src/org/compiere/model/MProductionLine.java
index 17330d3726..096243f0c1 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductionLine.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductionLine.java
@@ -1,22 +1,12 @@
 package org.compiere.model;
 
 import java.math.BigDecimal;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
-import org.compiere.model.MAttributeSet;
-import org.compiere.model.MAttributeSetInstance;
-import org.compiere.model.MInventoryLineMA;
-import org.compiere.model.MLocator;
-import org.compiere.model.MProduct;
-import org.compiere.model.MStorage;
-import org.compiere.model.MTransaction;
-import org.compiere.model.X_M_ProductionLine;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
 
@@ -25,7 +15,8 @@ public class MProductionLine extends X_M_ProductionLine {
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 5939914729719167512L;
+
 	private MProduction parent;
 
 
@@ -208,7 +199,7 @@ public class MProductionLine extends X_M_ProductionLine {
 					storage.setM_Locator_ID(getM_Locator_ID());
 					storage.setM_Product_ID(getM_Product_ID());
 					storage.setM_AttributeSetInstance_ID(0);
-					storage.save();
+					storage.saveEx();
 					
 				}
 				
diff --git a/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java b/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java
index f452745af1..4fd8b16acd 100644
--- a/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java
+++ b/org.adempiere.base/src/org/compiere/model/MProductionLineMA.java
@@ -8,11 +8,10 @@ import org.compiere.model.X_M_ProductionLineMA;
 import org.compiere.util.Env;
 
 public class MProductionLineMA extends X_M_ProductionLineMA {
-
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = -3935841562652510880L;
 
 	public MProductionLineMA(Properties ctx, int M_ProductionLineMA_ID,
 			String trxName) {
@@ -39,6 +38,7 @@ public class MProductionLineMA extends X_M_ProductionLineMA {
 		setM_AttributeSetInstance_ID(asi);
 		setM_ProductionLine_ID(parent.get_ID());
 		setMovementQty(qty);
+		setAD_Org_ID(parent.getAD_Org_ID());
 		
 	}
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java
index 75cf3c9a98..5803cc681d 100644
--- a/org.adempiere.base/src/org/compiere/model/MQuery.java
+++ b/org.adempiere.base/src/org/compiere/model/MQuery.java
@@ -421,71 +421,45 @@ public class MQuery implements Serializable
 	/** Between - 8		*/
 	public static final int		BETWEEN_INDEX = 8;
 	/** For IDEMPIERE-377	*/
-	public static final String 	NOT_NULL = "IS NOT NULL";
+	public static final String 	NOT_NULL = " IS NOT NULL ";
 	/** For IDEMPIERE-377	*/
-	public static final String 	NULL = "IS NULL";
+	public static final String 	NULL = " IS NULL ";
 
 	/**	Operators for Strings				*/
 	public static final ValueNamePair[]	OPERATORS = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),		//	0
-		new ValueNamePair (NOT_EQUAL,		" != "),
+		new ValueNamePair (EQUAL,			" = "),		//	0 - EQUAL_INDEX
+		new ValueNamePair (NOT_EQUAL,		" != "),	//  1 - NOT_EQUAL_INDEX
 		new ValueNamePair (LIKE,			" ~ "),
 		new ValueNamePair (NOT_LIKE,		" !~ "),
 		new ValueNamePair (GREATER,			" > "),
-		new ValueNamePair (GREATER_EQUAL,	" >= "),	//	5
+		new ValueNamePair (GREATER_EQUAL,	" >= "),
 		new ValueNamePair (LESS,			" < "),
 		new ValueNamePair (LESS_EQUAL,		" <= "),
-		new ValueNamePair (BETWEEN,			" >-< ")	//	8
+		new ValueNamePair (BETWEEN,			" >-< "),	//	8 - BETWEEN_INDEX
+		new ValueNamePair (NULL,			" NULL "),
+		new ValueNamePair (NOT_NULL,		" !NULL ")
 	};
-	/**	Operators for IDs					*/
-	public static final ValueNamePair[]	OPERATORS_ID = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),		//	0
-		new ValueNamePair (NOT_EQUAL,		" != ")
-	};
-	/**	Operators for Boolean					*/
-	public static final ValueNamePair[]	OPERATORS_YN = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = ")
+	/**	Operators for Lookups and Lists	(including Y/N)				*/
+	public static final ValueNamePair[]	OPERATORS_LOOKUP = new ValueNamePair[] {
+		new ValueNamePair (EQUAL,			" = "),
+		new ValueNamePair (NOT_EQUAL,		" != "),
+		new ValueNamePair (NULL,			" NULL "),
+		new ValueNamePair (NOT_NULL,		" !NULL ")
 	};
 
-	/**	Operators for Number, Amount, Date, Costs+Prices, Quantity, Integer, ID			*/
+	/**	Operators for Numbers, Dates, Integers	*/
 	public static final ValueNamePair[]	OPERATORS_NUMBERS = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),		//	0
+		new ValueNamePair (EQUAL,			" = "),
 		new ValueNamePair (NOT_EQUAL,		" != "),
 		new ValueNamePair (GREATER,			" > "),
-		new ValueNamePair (GREATER_EQUAL,	" >= "),	//	5
+		new ValueNamePair (GREATER_EQUAL,	" >= "),
 		new ValueNamePair (LESS,			" < "),
 		new ValueNamePair (LESS_EQUAL,		" <= "),
-		new ValueNamePair (BETWEEN,			" >-< "),	//	8
+		new ValueNamePair (BETWEEN,			" >-< "),
 		new ValueNamePair (NULL,			" NULL "),
 		new ValueNamePair (NOT_NULL,		" !NULL ")
-
-	};
-	/**	Operators for URL			*/
-	public static final ValueNamePair[]	OPERATORS_EQUAL_LIKE = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),		//	0
-		new ValueNamePair (NOT_EQUAL,		" != "),
-		new ValueNamePair (NOT_EQUAL,		" ~ "),
-		new ValueNamePair (LIKE,			" !~ "),
-		new ValueNamePair (NULL,			" NULL "),
-		new ValueNamePair (NOT_NULL,		" !NULL ")
-
 	};
 	
-	/**	Operators for all				*/
-	public static final ValueNamePair[]	OPERATORS_ALL = new ValueNamePair[] {
-		new ValueNamePair (EQUAL,			" = "),		//	0
-		new ValueNamePair (NOT_EQUAL,		" != "),
-		new ValueNamePair (LIKE,			" ~ "),
-		new ValueNamePair (NOT_LIKE,		" !~ "),
-		new ValueNamePair (GREATER,			" > "),
-		new ValueNamePair (GREATER_EQUAL,	" >= "),	//	5
-		new ValueNamePair (LESS,			" < "),
-		new ValueNamePair (LESS_EQUAL,		" <= "),
-		new ValueNamePair (BETWEEN,			" >-< "),	//	8
-		new ValueNamePair (NULL,			" NULL "),
-		new ValueNamePair (NOT_NULL,		" !NULL ")
-	};
-
 	/*************************************************************************
 	 * 	Add Restriction
 	 * 	@param ColumnName ColumnName
@@ -1150,50 +1124,28 @@ class Restriction  implements Serializable
 		else
 			sb.append(ColumnName);
 		
-		//	NULL Operator
-		if ((Operator.equals("=") || Operator.equals("!="))
-			&& (Code == null
-				|| "NULL".equals (Code.toString().toUpperCase())))
-		{
-			if (Operator.equals("="))
-				sb.append(" IS NULL ");
-			else
-				sb.append(" IS NOT NULL ");
-		}
-		
-		else if ((Operator.equals(MQuery.NULL) || Operator.equals(MQuery.NOT_NULL)) 
-				&& (Code == null 
-					|| "NULL".equals (Code.toString().toUpperCase())))
-		{
-			if (Operator.equals(MQuery.NULL))
-				sb.append(" IS NULL ");
-			else
-				sb.append(" IS NOT NULL ");
-		}
-		
-		else
-		{
 		sb.append(Operator);
-			
-		if (Code instanceof String)
-			sb.append(DB.TO_STRING(Code.toString()));
-		else if (Code instanceof Timestamp)
-			sb.append(DB.TO_DATE((Timestamp)Code));
-		else
-			sb.append(Code);
-	
-		//	Between
-	//	if (Code_to != null && InfoDisplay_to != null)
-		if (MQuery.BETWEEN.equals(Operator))
+		if ( ! (Operator.equals(MQuery.NULL) || Operator.equals(MQuery.NOT_NULL)))
 		{
-			sb.append(" AND ");
-			if (Code_to instanceof String)
-				sb.append(DB.TO_STRING(Code_to.toString()));
-			else if (Code_to instanceof Timestamp)
-				sb.append(DB.TO_DATE((Timestamp)Code_to));
+			if (Code instanceof String)
+				sb.append(DB.TO_STRING(Code.toString()));
+			else if (Code instanceof Timestamp)
+				sb.append(DB.TO_DATE((Timestamp)Code));
 			else
-				sb.append(Code_to);
-		}
+				sb.append(Code);
+
+			//	Between
+			//	if (Code_to != null && InfoDisplay_to != null)
+			if (MQuery.BETWEEN.equals(Operator))
+			{
+				sb.append(" AND ");
+				if (Code_to instanceof String)
+					sb.append(DB.TO_STRING(Code_to.toString()));
+				else if (Code_to instanceof Timestamp)
+					sb.append(DB.TO_DATE((Timestamp)Code_to));
+				else
+					sb.append(Code_to);
+			}
 		}
 		return sb.toString();
 	}	//	getSQL
diff --git a/org.adempiere.base/src/org/compiere/model/MStorage.java b/org.adempiere.base/src/org/compiere/model/MStorage.java
index 1de94dfc74..cca8d57abd 100644
--- a/org.adempiere.base/src/org/compiere/model/MStorage.java
+++ b/org.adempiere.base/src/org/compiere/model/MStorage.java
@@ -293,7 +293,7 @@ public class MStorage extends X_M_Storage
 		{
 			sql = "SELECT s.M_Product_ID,s.M_Locator_ID,s.M_AttributeSetInstance_ID,"
 				+ "s.AD_Client_ID,s.AD_Org_ID,s.IsActive,s.Created,s.CreatedBy,s.Updated,s.UpdatedBy,"
-				+ "s.QtyOnHand,s.QtyReserved,s.QtyOrdered,s.DateLastInventory "
+				+ "s.QtyOnHand,s.QtyReserved,s.QtyOrdered,s.DateLastInventory,s.M_Storage_UU "
 				+ "FROM M_Storage s"
 				+ " INNER JOIN M_Locator l ON (l.M_Locator_ID=s.M_Locator_ID)"
 				+ " LEFT OUTER JOIN M_AttributeSetInstance asi ON (s.M_AttributeSetInstance_ID=asi.M_AttributeSetInstance_ID) ";
diff --git a/org.adempiere.base/src/org/compiere/model/MTreeNode.java b/org.adempiere.base/src/org/compiere/model/MTreeNode.java
index c9e4e6d987..59163451a3 100644
--- a/org.adempiere.base/src/org/compiere/model/MTreeNode.java
+++ b/org.adempiere.base/src/org/compiere/model/MTreeNode.java
@@ -118,14 +118,14 @@ public final class MTreeNode extends DefaultMutableTreeNode
 	public static Icon[] 	IMAGES = new Icon[]
 	{
 		null,
-		Env.getImageIcon("mWindow.gif"),
-		Env.getImageIcon("mReport.gif"),
-		Env.getImageIcon("mProcess.gif"),
-		Env.getImageIcon("mWorkFlow.gif"),
-		Env.getImageIcon("mWorkbench.gif"),
-		Env.getImageIcon("mSetVariable.gif"),
-		Env.getImageIcon("mUserChoice.gif"),
-		Env.getImageIcon("mDocAction.gif")
+		Env.getImageIcon("mWindow.png"),
+		Env.getImageIcon("mReport.png"),
+		Env.getImageIcon("mProcess.png"),
+		Env.getImageIcon("mWorkFlow.png"),
+		Env.getImageIcon("mWorkbench.png"),
+		Env.getImageIcon("mSetVariable.png"),
+		Env.getImageIcon("mUserChoice.png"),
+		Env.getImageIcon("mDocAction.png")
 	};
 
 
diff --git a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
index 7b897a411b..4a11889f87 100644
--- a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
+++ b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java
@@ -39,6 +39,11 @@ import org.compiere.util.Util;
  */
 public class ProcessInfo implements Serializable
 {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1426147857271483561L;
+
 	/**
 	 *  Constructor
 	 *  @param Title Title
@@ -68,10 +73,6 @@ public class ProcessInfo implements Serializable
 		this (Title, AD_Process_ID, 0, 0);
 	}   //  ProcessInfo
 
-	/**	Serialization Info	**/
-	static final long serialVersionUID = -1993220053515488725L;
-	
-
 	/** Title of the Process/Report */
 	private String				m_Title;
 	/** Process ID                  */
diff --git a/org.adempiere.base/src/org/compiere/process/ProcessInfoLog.java b/org.adempiere.base/src/org/compiere/process/ProcessInfoLog.java
index e9dd94a374..deb41ebfa9 100644
--- a/org.adempiere.base/src/org/compiere/process/ProcessInfoLog.java
+++ b/org.adempiere.base/src/org/compiere/process/ProcessInfoLog.java
@@ -31,7 +31,7 @@ public class ProcessInfoLog implements Serializable
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -4064380205358897097L;
+	private static final long serialVersionUID = 2790364724540395200L;
 
 	/**
 	 * 	Create Process Info Log.
@@ -47,8 +47,8 @@ public class ProcessInfoLog implements Serializable
 		setP_Date (P_Date);
 		setP_Number (P_Number);
 		setP_Msg (P_Msg);
-		setAd_Table_Id(AD_Table_ID);
-		setRecord_Id(Record_ID);
+		setAD_Table_ID(AD_Table_ID);
+		setRecord_ID(Record_ID);
 		
 	}	//	ProcessInfoLog
 
@@ -92,19 +92,19 @@ public class ProcessInfoLog implements Serializable
 	private int 		m_AD_Table_ID;
 	private int 		m_Record_ID;
 
-	public int getAd_Table_Id() {
+	public int getAD_Table_ID() {
 		return m_AD_Table_ID;
 	}
 
-	public void setAd_Table_Id(int tableId) {
+	public void setAD_Table_ID(int tableId) {
 		this.m_AD_Table_ID = tableId;
 	}
 
-	public int getRecord_Id() {
+	public int getRecord_ID() {
 		return m_Record_ID;
 	}
 
-	public void setRecord_Id(int recordId) {
+	public void setRecord_ID(int recordId) {
 		this.m_Record_ID = recordId;
 	}
 	/**
diff --git a/org.adempiere.base/src/org/compiere/process/ProcessInfoUtil.java b/org.adempiere.base/src/org/compiere/process/ProcessInfoUtil.java
index b7e263357b..0162b095d3 100644
--- a/org.adempiere.base/src/org/compiere/process/ProcessInfoUtil.java
+++ b/org.adempiere.base/src/org/compiere/process/ProcessInfoUtil.java
@@ -115,7 +115,7 @@ public class ProcessInfoUtil
 	public static void setLogFromDB (ProcessInfo pi)
 	{
 	//	s_log.fine("setLogFromDB - AD_PInstance_ID=" + pi.getAD_PInstance_ID());
-		String sql = "SELECT Log_ID, P_ID, P_Date, P_Number, P_Msg, AD_Table_Id,Record_Id "				             
+		String sql = "SELECT Log_ID, P_ID, P_Date, P_Number, P_Msg, AD_Table_ID,Record_ID "				             
 			+ "FROM AD_PInstance_Log "
 			+ "WHERE AD_PInstance_ID=? "
 			+ "ORDER BY Log_ID";
@@ -158,7 +158,7 @@ public class ProcessInfoUtil
 		for (int i = 0; i < logs.length; i++)
 		{
 			StringBuffer sql = new StringBuffer ("INSERT INTO AD_PInstance_Log "
-				+ "(AD_PInstance_ID, Log_ID, P_Date, P_ID, P_Number, P_Msg, AD_Table_Id,Record_ID)"
+				+ "(AD_PInstance_ID, Log_ID, P_Date, P_ID, P_Number, P_Msg, AD_Table_ID,Record_ID)"
 				+ " VALUES (");
 			sql.append(pi.getAD_PInstance_ID()).append(",")
 				.append(logs[i].getLog_ID()).append(",");
@@ -178,14 +178,14 @@ public class ProcessInfoUtil
 				sql.append("NULL,");
 			else
 				sql.append(DB.TO_STRING(logs[i].getP_Msg(),2000)).append(",");
-			if (logs[i].getAd_Table_Id() == 0)
+			if (logs[i].getAD_Table_ID() == 0)
 				sql.append("NULL,");
 			else
-				sql.append(logs[i].getAd_Table_Id()).append(",");
-			if (logs[i].getRecord_Id() == 0)
+				sql.append(logs[i].getAD_Table_ID()).append(",");
+			if (logs[i].getRecord_ID() == 0)
 				sql.append("NULL)");
 			else
-				sql.append(logs[i].getRecord_Id()).append(")");
+				sql.append(logs[i].getRecord_ID()).append(")");
 //
 			DB.executeUpdate(sql.toString(), null);
 		}
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java b/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
index 416253ad0b..a013e8856b 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AWindow.java
@@ -61,7 +61,7 @@ public class AWindow extends CFrame
 	{
 		super(gc);
 		//	Set UI Components
-		this.setIconImage(Env.getImage("mWindow.gif"));
+		this.setIconImage(Env.getImage("mWindow.png"));
 		this.getContentPane().add(m_APanel, BorderLayout.CENTER);
 		this.setGlassPane(m_glassPane);
 	}	//	AWindow
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
index 284db3eeba..ecf1c011f3 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
@@ -201,7 +201,7 @@ public class ProcessDialog extends CFrame
 	 */
 	private void jbInit() throws Exception
 	{
-		setIconImage(Env.getImage("mProcess.gif"));
+		setIconImage(Env.getImage("mProcess.png"));
 		//
 		dialog.setLayout(mainLayout);
 		dialog.setMinimumSize(new Dimension(500, 200));
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
index 45ea0a5a76..612f4dd75d 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
@@ -81,6 +81,7 @@ import org.compiere.model.MLookupFactory;
 import org.compiere.model.MProduct;
 import org.compiere.model.MQuery;
 import org.compiere.model.MRole;
+import org.compiere.model.MTable;
 import org.compiere.model.MUserQuery;
 import static org.compiere.model.SystemIDs.*;
 import org.compiere.model.X_AD_Column;
@@ -856,12 +857,26 @@ public final class Find extends CDialog
 			if (columnName != null)
 			{
 				log.config("Column: " + columnName);
-				if (columnName.endsWith("_ID") || columnName.endsWith("_Acct"))
-					operators.setModel(new DefaultComboBoxModel(MQuery.OPERATORS_ID));
-				else if (columnName.startsWith("Is"))
-					operators.setModel(new DefaultComboBoxModel(MQuery.OPERATORS_YN));
-				else
+		    	int referenceType = -1;
+	    		MTable table = MTable.get(Env.getCtx(), m_tableName);
+	    		MColumn col = table.getColumn(columnName);
+	    		referenceType = col.getAD_Reference_ID();
+		        if (DisplayType.isLookup(referenceType)
+		        		|| DisplayType.YesNo == referenceType
+		        		|| DisplayType.Button == referenceType)
+		        {
+					operators.setModel(new DefaultComboBoxModel(MQuery.OPERATORS_LOOKUP));
+		        }
+		        else if (DisplayType.isNumeric(referenceType)
+		        		|| DisplayType.isDate(referenceType)
+		        		|| DisplayType.isID(referenceType)) // Note that lookups were filtered above
+		        {
+					operators.setModel(new DefaultComboBoxModel(MQuery.OPERATORS_NUMBERS));
+		        }
+		        else // DisplayType.isText
+		        {
 					operators.setModel(new DefaultComboBoxModel(MQuery.OPERATORS));
+		        }
 			}
 		}
 		else if (e.getSource() == fQueryName) 
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mDocAction.gif b/org.adempiere.ui.swing/src/org/compiere/images/mDocAction.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mDocAction.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mDocAction.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mProcess.gif b/org.adempiere.ui.swing/src/org/compiere/images/mProcess.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mProcess.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mProcess.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mReport.gif b/org.adempiere.ui.swing/src/org/compiere/images/mReport.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mReport.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mReport.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.gif b/org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mSetVariable.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.gif b/org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mUserChoice.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mWindow.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWindow.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mWindow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWindow.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWorkFlow.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.gif b/org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.png
similarity index 100%
rename from org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.gif
rename to org.adempiere.ui.swing/src/org/compiere/images/mWorkbench.png
diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
index e4d0bb50fb..6f2aeac6bd 100644
--- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
+++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
@@ -241,7 +241,7 @@ public class Viewer extends CFrame
 	 */
 	private void jbInit() throws Exception
 	{
-		this.setIconImage(Env.getImage("mReport.gif"));
+		this.setIconImage(Env.getImage("mReport.png"));
 		this.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		//
 		northPanel.setLayout(northLayout);
@@ -814,7 +814,7 @@ public class Viewer extends CFrame
 				return;
 			//	Create Menu
 			JPopupMenu pop = new JPopupMenu();
-			Icon wi = Env.getImageIcon("mWindow.gif");
+			Icon wi = Env.getImageIcon("mWindow.png");
 			if (m_ddQ != null)
 			{
 				m_ddM = new CMenuItem(m_ddQ.getDisplayName(Env.getCtx()), wi);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
index 35ae874def..441806452e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -81,7 +81,7 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 5616730124927184116L;
+	private static final long serialVersionUID = -208259686238044047L;
 
 	private static final String SAVED_CONTEXT = "saved.context";
 	
@@ -358,7 +358,8 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 		Session session = Executions.getCurrent().getDesktop().getSession();
 		
 		//stop background thread
-    	appDesktop.logout();
+		if (appDesktop != null)
+			appDesktop.logout();
 
     	//clear remove all children and root component
     	getChildren().clear();
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
index 899e9b9b10..ae8af22059 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
@@ -509,9 +509,9 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
 				recordLink = new A();
 				recordLink.setLabel(log.getP_Msg());
 
-				if (log.getAd_Table_Id() > 0 && log.getRecord_Id()> 0) {
-					recordLink.setAttribute("Record_ID", String.valueOf(log.getRecord_Id()));
-					recordLink.setAttribute("AD_Table_ID", String.valueOf(log.getAd_Table_Id()));
+				if (log.getAD_Table_ID() > 0 && log.getRecord_ID()> 0) {
+					recordLink.setAttribute("Record_ID", String.valueOf(log.getRecord_ID()));
+					recordLink.setAttribute("AD_Table_ID", String.valueOf(log.getAD_Table_ID()));
 					recordLink.addEventListener(Events.ON_CLICK, this);
 					
 				}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
index 9ffed1e6c0..2a6ad14b87 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
@@ -150,7 +150,7 @@ public class ProcessParameterPanel extends Panel implements
 		MClient client = MClient.get(Env.getCtx());
 		String ASPFilter = "";
 		if (client.isUseASP())
-			ASPFilter = "   AND (   p.AD_Process_Para_ID IN ( "
+			ASPFilter = "   AND (   p.AD_Process_Para_ID not IN ( "
 					// Just ASP subscribed process parameters for client "
 					+ "              SELECT pp.AD_Process_Para_ID "
 					+ "                FROM ASP_Process_Para pp, ASP_Process p, ASP_Level l, ASP_ClientLevel cl "
@@ -163,20 +163,18 @@ public class ProcessParameterPanel extends Panel implements
 					+ "                 AND p.IsActive = 'Y' "
 					+ "                 AND l.IsActive = 'Y' "
 					+ "                 AND cl.IsActive = 'Y' "
-					+ "                 AND pp.ASP_Status = 'S') " // Show
-					+ "        OR p.AD_Process_Para_ID IN ( "
-					// + show ASP exceptions for client
-					+ "              SELECT AD_Process_Para_ID "
-					+ "                FROM ASP_ClientException ce "
-					+ "               WHERE ce.AD_Client_ID = "
-					+ client.getAD_Client_ID()
-					+ "                 AND ce.IsActive = 'Y' "
-					+ "                 AND ce.AD_Process_Para_ID IS NOT NULL "
-					+ "                 AND ce.AD_Tab_ID IS NULL "
-					+ "                 AND ce.AD_Field_ID IS NULL "
-					+ "                 AND ce.ASP_Status = 'S') " // Show
-					+ "       ) "
-					+ "   AND p.AD_Process_Para_ID NOT IN ( "
+					+ "					AND p.ad_process_ID="+m_processInfo.getAD_Process_ID()
+					+ "                 AND pp.ASP_Status = 'H' " // Show
+					+"					AND pp.AD_Process_Para_ID not in ("
+					+" 					SELECT AD_Process_Para_ID"             
+					+" 					FROM ASP_ClientException ce"            
+					+" 					WHERE ce.AD_Client_ID ="+ client.getAD_Client_ID()    
+					+" 					AND ce.IsActive = 'Y'"              
+					+" 					AND ce.AD_Process_Para_ID IS NOT NULL"
+					+" 					AND ce.AD_Tab_ID IS NULL"              
+					+" 					AND ce.AD_Field_ID IS NULL"              
+					+" 					AND ce.ASP_Status in('S','U') )  "
+					+ "  UNION ALL "
 					// minus hide ASP exceptions for client
 					+ "          SELECT AD_Process_Para_ID "
 					+ "            FROM ASP_ClientException ce "
@@ -185,8 +183,9 @@ public class ProcessParameterPanel extends Panel implements
 					+ "             AND ce.IsActive = 'Y' "
 					+ "             AND ce.AD_Process_Para_ID IS NOT NULL "
 					+ "             AND ce.AD_Tab_ID IS NULL "
+					+ "				AND ce.AD_Process_Para_ID="+m_processInfo.getAD_Process_ID()
 					+ "             AND ce.AD_Field_ID IS NULL "
-					+ "             AND ce.ASP_Status = 'H')"; // Hide
+					+ "             AND ce.ASP_Status = 'H'))"; // Hide
 		//
 		String sql = null;
 		if (Env.isBaseLanguage(Env.getCtx(), "AD_Process_Para"))
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
index e36d8b7e94..dcc7598c3e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java
@@ -60,7 +60,6 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zul.Center;
-import org.zkoss.zul.DefaultTreeModel;
 import org.zkoss.zul.DefaultTreeNode;
 import org.zkoss.zul.North;
 import org.zkoss.zul.Separator;
@@ -251,22 +250,13 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener
 		}
 		if (event.getTarget().equals(treeExpand)) 
 		{
-			if (treeExpand.isChecked())
-			{
-				TreeUtils.expandAll(m_tree);
-			}
-			else
-			{
-				TreeUtils.collapseAll(m_tree);				
-			}
+			expandOrCollapse();
 		}
 		//  *** Tree ***
 		if (event.getTarget() instanceof Tree )	
 		{
 			Treeitem ti = m_tree.getSelectedItem(); 
 			if (ti == null) {
-				// ADialog.beep();
-				// TODO: review what is this beep for - no zk6 equivalent
 				log.log(Level.WARNING, "WTreeBOM.onEvent treeItem=null");
 			}
 			else
@@ -277,6 +267,19 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener
 		}
 
 	}
+
+	private void expandOrCollapse() {
+		if (treeExpand.isChecked())
+		{
+			if (m_tree.getTreechildren() != null)
+				TreeUtils.expandAll(m_tree);
+		}
+		else
+		{
+			if (m_tree.getTreechildren() != null)
+				TreeUtils.collapseAll(m_tree);				
+		}
+	}
 	
 	/**
 	 *  Set the selected node & initiate all listeners
@@ -385,15 +388,10 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener
 			m_tree.setModel(model);
 		}
 		
-		// TODO: check zk6 - was:
-		// int[] path = m_tree.getModel().getPath(parent, m_root);
-		int[] path = m_tree.getModel().getPath(m_root);
-		Treeitem ti = m_tree.renderItemByPath(path);
-		m_tree.setSelectedItem(ti);
-		ti.setOpen(true);
-
 		m_tree.addEventListener(Events.ON_SELECT, this);
 		loadTableBOM();
+
+		treeExpand.setChecked(false);
 	}
 
 	private void action_reloadBOM() throws Exception
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
index 9a821fd5d0..74616f35cb 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
@@ -76,7 +76,7 @@ public class RolePanel extends Window implements EventListener, Deferrable
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 153231955030136145L;
+	private static final long serialVersionUID = 4403663665119775251L;
 
 	private static final String RESOURCE = "org.compiere.apps.ALoginRes";
 
@@ -465,6 +465,7 @@ public class RolePanel extends Window implements EventListener, Deferrable
         }
         else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
         {
+            SessionManager.logoutSession();
             wndLogin.loginCancelled();
         }
     }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
index edba5650bb..22d1f5ba3a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
@@ -70,6 +70,7 @@ import org.compiere.model.MLookupFactory;
 import org.compiere.model.MProduct;
 import org.compiere.model.MQuery;
 import org.compiere.model.MRole;
+import org.compiere.model.MTable;
 import org.compiere.model.MUserQuery;
 import static org.compiere.model.SystemIDs.*;
 import org.compiere.model.X_AD_Column;
@@ -680,8 +681,7 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         ValueNamePair[] cols = new ValueNamePair[items.size()];
         items.toArray(cols);
         Arrays.sort(cols);      //  sort alpha
-        ValueNamePair[] op = MQuery.OPERATORS_ALL;
-
+        ValueNamePair[] op = MQuery.OPERATORS;
 
         if(fields == null)
         {
@@ -1281,75 +1281,28 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
     **/
     private void addOperators(ListItem column, Listbox listOperator)
     {
-        String columnName = column.getValue().toString();
-        int columnID = MColumn.getColumn_ID(this.m_tableName, columnName);
-        String SQL = "SELECT ad_reference_id FROM ad_column WHERE ad_column_id = ?";
-        PreparedStatement pstmt = null;
-		ResultSet rs = null;
-		int referenceType = -1;
-		try
-		{
-			pstmt = DB.prepareStatement(SQL, null);
-			pstmt.setInt(1, columnID);
-			rs = pstmt.executeQuery();
-			if( rs.next() )
-			{
-				referenceType = rs.getInt(1);
-			}
-		}
-		catch (SQLException e2)
-		{
-			log.log(Level.SEVERE, SQL, e2);
-		}
-		finally
-		{
-			DB.close(rs, pstmt);
-			rs = null; pstmt = null;
-		}
-		
-        log.config("Column: " + columnName);
-        log.log(Level.INFO, "referenceType : " + referenceType);
-        
-        List<Integer> numbersList = new ArrayList<Integer>();
-        numbersList.add(DisplayType.Number);
-        numbersList.add(DisplayType.Date);
-        numbersList.add(DisplayType.Amount);
-        numbersList.add(DisplayType.CostPrice);
-        numbersList.add(DisplayType.Quantity);
-        numbersList.add(DisplayType.ID);
-        numbersList.add(DisplayType.Integer);
-        
-        List<Integer> equalNotEqualList = new ArrayList<Integer>();
-        equalNotEqualList.add(DisplayType.TableDir);
-        equalNotEqualList.add(DisplayType.Table);
-        equalNotEqualList.add(DisplayType.Search);
-        equalNotEqualList.add(DisplayType.List);
-        
-        List<Integer> equalAndLikeList = new ArrayList<Integer>();
-        equalAndLikeList.add(DisplayType.URL);
-        equalAndLikeList.add(DisplayType.Memo);
-        equalAndLikeList.add(DisplayType.TextLong);
-        equalAndLikeList.add(DisplayType.Text);
-        
-        if(numbersList.contains(referenceType))
+    	String columnName = column.getValue().toString();
+    	int referenceType = -1;
+    	if (columnName != null) {
+    		MTable table = MTable.get(Env.getCtx(), m_tableName);
+    		MColumn col = table.getColumn(columnName);
+    		referenceType = col.getAD_Reference_ID();
+    	}
+        if (DisplayType.isLookup(referenceType)
+        		|| DisplayType.YesNo == referenceType
+        		|| DisplayType.Button == referenceType)
+        {
+        	addOperators(MQuery.OPERATORS_LOOKUP, listOperator);
+        }
+        else if (DisplayType.isNumeric(referenceType)
+        		|| DisplayType.isDate(referenceType)
+        		|| DisplayType.isID(referenceType)) // Note that lookups were filtered above
         {
         	addOperators(MQuery.OPERATORS_NUMBERS, listOperator);
         }
-        else if (equalNotEqualList.contains(referenceType))
+        else // DisplayType.isText
         {
-        	addOperators(MQuery.OPERATORS_ID, listOperator);
-        }
-        else if (DisplayType.YesNo == referenceType)
-        {
-        	addOperators(MQuery.OPERATORS_YN, listOperator);
-        }
-        else if (equalAndLikeList.contains(referenceType))
-        {
-        	addOperators(MQuery.OPERATORS_EQUAL_LIKE, listOperator);
-        }
-        else
-        {
-        	addOperators(MQuery.OPERATORS_ALL, listOperator);
+        	addOperators(MQuery.OPERATORS, listOperator);
         }
     } //    addOperators
 
@@ -1391,10 +1344,24 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
         if(field == null) return new Label("");
 
         WEditor editor = null;
-        if (field.isKey())
+        if (field.isKey() 
+        		|| (!DisplayType.isLookup(field.getDisplayType()) && DisplayType.isID(field.getDisplayType())))
+        {
             editor = new WNumberEditor(field);
+		}
+        else if (field.getDisplayType() == DisplayType.Button)
+        {
+        	if (columnName.endsWith("_ID"))
+        	{
+                editor = new WNumberEditor(field);
+        	} else {
+                editor = new WStringEditor(field);
+        	}
+        }
         else
+        {
             editor = WebEditorFactory.getEditor(field, true);
+        }
         if (editor == null)
             editor = new WStringEditor(field);
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
index 678f8a117b..3d537b35c5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
@@ -30,6 +30,7 @@ import org.adempiere.webui.IWebClient;
 import org.adempiere.webui.component.FWindow;
 import org.adempiere.webui.panel.LoginPanel;
 import org.adempiere.webui.panel.RolePanel;
+import org.compiere.model.MSysConfig;
 import org.compiere.model.MUser;
 import org.compiere.util.Env;
 import org.compiere.util.KeyNamePair;
@@ -53,7 +54,8 @@ public class LoginWindow extends FWindow implements EventListener
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -6312322926432586415L;
+	private static final long serialVersionUID = -5169830531440825871L;
+
 	private IWebClient app;
     private Properties ctx;
     private LoginPanel pnlLogin;
@@ -130,7 +132,14 @@ public class LoginWindow extends FWindow implements EventListener
     	getDesktop().getSession().setAttribute(Attributes.PREFERRED_LOCALE, locale);
     	Locales.setThreadLocal(locale);    	
     	Login login = new Login(Env.getCtx());
-    	loginOk(MUser.getNameOfUser(Env.getAD_User_ID(ctx)), true, login.getClients());
+    	MUser user = MUser.get(ctx, Env.getAD_User_ID(ctx));
+    	String loginName;
+		boolean email_login = MSysConfig.getBooleanValue(MSysConfig.USE_EMAIL_FOR_LOGIN, false);
+		if (email_login)
+			loginName = user.getEMail();
+		else
+			loginName = user.getLDAPUser() != null ? user.getLDAPUser() : user.getName();
+    	loginOk(loginName, true, login.getClients());
     	getDesktop().getSession().setAttribute("Check_AD_User_ID", Env.getAD_User_ID(ctx));
     	
     	pnlRole.changeRole(ctx);