diff --git a/migration/i1.0a-release/oracle/201301160230_IDEMPIERE-539.sql b/migration/i1.0a-release/oracle/201301160230_IDEMPIERE-539.sql
new file mode 100644
index 0000000000..3e89c3b767
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201301160230_IDEMPIERE-539.sql
@@ -0,0 +1,177 @@
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element SET Name='Activity Key', Description='Text key for Activity', PrintName='Activity Key',Updated=TO_DATE('2013-01-16 04:21:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=53222
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=53222
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Column SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Element_ID=53222
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL, AD_Element_ID=53222 WHERE UPPER(ColumnName)='ACTIVITYVALUE' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Element_ID=53222 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_InfoColumn SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Element_ID=53222 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=53222) AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_PrintFormatItem pi SET PrintName='Activity Key', Name='Activity Key' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=53222)
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element SET Name='Campaign Key', Description='Text key of the Campaign', PrintName='Campaign Key',Updated=TO_DATE('2013-01-16 04:23:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=54241
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=54241
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Column SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Element_ID=54241
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL, AD_Element_ID=54241 WHERE UPPER(ColumnName)='CAMPAIGNVALUE' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Element_ID=54241 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_InfoColumn SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Element_ID=54241 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=54241) AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:23:39 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_PrintFormatItem pi SET PrintName='Campaign Key', Name='Campaign Key' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=54241)
+;
+
+-- Jan 16, 2013 4:24:13 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,Description,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('SalesRegionValue',202193,'D','Sales Region Key','Text key of the Sales Region','Sales Region Key','5e4ae95e-a657-415b-8950-d0607b734495',0,TO_DATE('2013-01-16 04:24:13','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-01-16 04:24:13','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Jan 16, 2013 4:24:13 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+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,AD_Element_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=202193 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)
+;
+
+-- Jan 16, 2013 4:27:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column (IsSyncDatabase,IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsToolbarButton,IsAlwaysUpdateable) VALUES ('N','N',1,599,208378,'D','N','N','N',0,'N',40,'N',10,'N',53222,'N','Y','b422b2fa-1e2c-44ff-869e-d9dc1868e5a4','Y','ActivityValue','Text key for Activity','Activity Key','Y',TO_DATE('2013-01-16 04:27:31','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-01-16 04:27:31','YYYY-MM-DD HH24:MI:SS'),100,0,'N','N')
+;
+
+-- Jan 16, 2013 4:27:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208378 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)
+;
+
+-- Jan 16, 2013 4:27:34 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+ALTER TABLE I_GLJournal ADD ActivityValue NVARCHAR2(40) DEFAULT NULL 
+;
+
+-- Jan 16, 2013 4:28:25 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column (IsSyncDatabase,IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsToolbarButton,IsAlwaysUpdateable) VALUES ('N','N',1,599,208379,'D','N','N','N',0,'N',40,'N',10,'N',54241,'N','Y','1e417c58-e70d-43a9-b791-6b885f4696b4','Y','CampaignValue','Text key of the Campaign','Campaign Key','Y',TO_DATE('2013-01-16 04:28:24','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-01-16 04:28:24','YYYY-MM-DD HH24:MI:SS'),100,0,'N','N')
+;
+
+-- Jan 16, 2013 4:28:25 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208379 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)
+;
+
+-- Jan 16, 2013 4:28:31 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+ALTER TABLE I_GLJournal ADD CampaignValue NVARCHAR2(40) DEFAULT NULL 
+;
+
+-- Jan 16, 2013 4:29:17 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column (IsSyncDatabase,IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsToolbarButton,IsAlwaysUpdateable) VALUES ('N','N',1,599,208380,'D','N','N','N',0,'N',40,'N',10,'N',202193,'N','Y','59321609-8c57-4b5f-91e4-94604eac91af','Y','SalesRegionValue','Text key of the Sales Region','Sales Region Key','Y',TO_DATE('2013-01-16 04:29:16','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-01-16 04:29:16','YYYY-MM-DD HH24:MI:SS'),100,0,'N','N')
+;
+
+-- Jan 16, 2013 4:29:17 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208380 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)
+;
+
+-- Jan 16, 2013 4:29:21 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+ALTER TABLE I_GLJournal ADD SalesRegionValue NVARCHAR2(40) DEFAULT NULL 
+;
+
+-- Jan 16, 2013 4:31:41 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field (ColumnSpan,NumLines,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry) VALUES (2,1,'N',508,20,'N','N',208378,515,'Y',201651,'N','D','Text key for Activity','Activity Key','Y','N','a394d053-f0c2-436b-aed5-e84967c4be81',100,0,TO_DATE('2013-01-16 04:31:40','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-16 04:31:40','YYYY-MM-DD HH24:MI:SS'),'Y','Y',515,1,'N')
+;
+
+-- Jan 16, 2013 4:31:41 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201651 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)
+;
+
+-- Jan 16, 2013 4:32:35 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field (ColumnSpan,NumLines,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry) VALUES (2,1,'N',508,20,'N','N',208379,505,'Y',201652,'N','D','Text key of the Campaign','Campaign Key','Y','N','9fd17334-4a7b-4585-a96a-000bc99d54ec',100,0,TO_DATE('2013-01-16 04:32:35','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-16 04:32:35','YYYY-MM-DD HH24:MI:SS'),'Y','Y',505,1,'N')
+;
+
+-- Jan 16, 2013 4:32:35 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201652 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)
+;
+
+-- Jan 16, 2013 4:33:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field (ColumnSpan,NumLines,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry) VALUES (2,1,'N',508,20,'N','N',208380,525,'Y',201653,'N','D','Text key of the Sales Region','Sales Region Key','Y','N','245b156e-5dc9-41f9-8f41-f49d8607ae52',100,0,TO_DATE('2013-01-16 04:33:32','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2013-01-16 04:33:32','YYYY-MM-DD HH24:MI:SS'),'Y','Y',525,1,'N')
+;
+
+-- Jan 16, 2013 4:33:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201653 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)
+;
+
+-- Jan 16, 2013 4:34:19 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2013-01-16 04:34:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7114
+;
+
+-- Jan 16, 2013 4:34:35 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2013-01-16 04:34:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7157
+;
+
+SELECT register_migration_script('201301160230_IDEMPIERE-539.sql') FROM dual
+;
diff --git a/migration/i1.0a-release/oracle/201301160719_IDEMPIERE-539.sql b/migration/i1.0a-release/oracle/201301160719_IDEMPIERE-539.sql
new file mode 100644
index 0000000000..99459a9c5d
--- /dev/null
+++ b/migration/i1.0a-release/oracle/201301160719_IDEMPIERE-539.sql
@@ -0,0 +1,73 @@
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=510,Updated=TO_DATE('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201652
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=520, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7114
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=530,Updated=TO_DATE('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201651
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=540,Updated=TO_DATE('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7109
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=550,Updated=TO_DATE('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201653
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=560, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7157
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=570,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7107
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=580,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7142
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=590,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7110
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=600,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7133
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=610,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7117
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=620,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7131
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=630,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7138
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=640,Updated=TO_DATE('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7136
+;
+
+SELECT register_migration_script('201301160719_IDEMPIERE-539.sql') FROM dual
+;
+
diff --git a/migration/i1.0a-release/postgresql/201301160230_IDEMPIERE-539.sql b/migration/i1.0a-release/postgresql/201301160230_IDEMPIERE-539.sql
new file mode 100644
index 0000000000..4281fed162
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201301160230_IDEMPIERE-539.sql
@@ -0,0 +1,177 @@
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element SET Name='Activity Key', Description='Text key for Activity', PrintName='Activity Key',Updated=TO_TIMESTAMP('2013-01-16 04:21:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=53222
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=53222
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Column SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Element_ID=53222
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL, AD_Element_ID=53222 WHERE UPPER(ColumnName)='ACTIVITYVALUE' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Element_ID=53222 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_InfoColumn SET ColumnName='ActivityValue', Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Element_ID=53222 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET Name='Activity Key', Description='Text key for Activity', Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=53222) AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:21:16 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_PrintFormatItem SET PrintName='Activity Key', Name='Activity Key' 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=53222)
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element SET Name='Campaign Key', Description='Text key of the Campaign', PrintName='Campaign Key',Updated=TO_TIMESTAMP('2013-01-16 04:23:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=54241
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Element_Trl SET IsTranslated='N' WHERE AD_Element_ID=54241
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Column SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Element_ID=54241
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL, AD_Element_ID=54241 WHERE UPPER(ColumnName)='CAMPAIGNVALUE' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Process_Para SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Element_ID=54241 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_InfoColumn SET ColumnName='CampaignValue', Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Element_ID=54241 AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:23:38 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET Name='Campaign Key', Description='Text key of the Campaign', Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=54241) AND IsCentrallyMaintained='Y'
+;
+
+-- Jan 16, 2013 4:23:39 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_PrintFormatItem SET PrintName='Campaign Key', Name='Campaign Key' 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=54241)
+;
+
+-- Jan 16, 2013 4:24:13 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Element (ColumnName,AD_Element_ID,EntityType,Name,Description,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('SalesRegionValue',202193,'D','Sales Region Key','Text key of the Sales Region','Sales Region Key','5e4ae95e-a657-415b-8950-d0607b734495',0,TO_TIMESTAMP('2013-01-16 04:24:13','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-01-16 04:24:13','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
+;
+
+-- Jan 16, 2013 4:24:13 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+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,AD_Element_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=202193 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)
+;
+
+-- Jan 16, 2013 4:27:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column (IsSyncDatabase,IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsToolbarButton,IsAlwaysUpdateable) VALUES ('N','N',1,599,208378,'D','N','N','N',0,'N',40,'N',10,'N',53222,'N','Y','b422b2fa-1e2c-44ff-869e-d9dc1868e5a4','Y','ActivityValue','Text key for Activity','Activity Key','Y',TO_TIMESTAMP('2013-01-16 04:27:31','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-01-16 04:27:31','YYYY-MM-DD HH24:MI:SS'),100,0,'N','N')
+;
+
+-- Jan 16, 2013 4:27:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208378 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)
+;
+
+-- Jan 16, 2013 4:27:34 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+ALTER TABLE I_GLJournal ADD COLUMN ActivityValue VARCHAR(40) DEFAULT NULL 
+;
+
+-- Jan 16, 2013 4:28:25 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column (IsSyncDatabase,IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsToolbarButton,IsAlwaysUpdateable) VALUES ('N','N',1,599,208379,'D','N','N','N',0,'N',40,'N',10,'N',54241,'N','Y','1e417c58-e70d-43a9-b791-6b885f4696b4','Y','CampaignValue','Text key of the Campaign','Campaign Key','Y',TO_TIMESTAMP('2013-01-16 04:28:24','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-01-16 04:28:24','YYYY-MM-DD HH24:MI:SS'),100,0,'N','N')
+;
+
+-- Jan 16, 2013 4:28:25 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208379 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)
+;
+
+-- Jan 16, 2013 4:28:31 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+ALTER TABLE I_GLJournal ADD COLUMN CampaignValue VARCHAR(40) DEFAULT NULL 
+;
+
+-- Jan 16, 2013 4:29:17 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column (IsSyncDatabase,IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsToolbarButton,IsAlwaysUpdateable) VALUES ('N','N',1,599,208380,'D','N','N','N',0,'N',40,'N',10,'N',202193,'N','Y','59321609-8c57-4b5f-91e4-94604eac91af','Y','SalesRegionValue','Text key of the Sales Region','Sales Region Key','Y',TO_TIMESTAMP('2013-01-16 04:29:16','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-01-16 04:29:16','YYYY-MM-DD HH24:MI:SS'),100,0,'N','N')
+;
+
+-- Jan 16, 2013 4:29:17 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=208380 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)
+;
+
+-- Jan 16, 2013 4:29:21 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+ALTER TABLE I_GLJournal ADD COLUMN SalesRegionValue VARCHAR(40) DEFAULT NULL 
+;
+
+-- Jan 16, 2013 4:31:41 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field (ColumnSpan,NumLines,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry) VALUES (2,1,'N',508,20,'N','N',208378,515,'Y',201651,'N','D','Text key for Activity','Activity Key','Y','N','a394d053-f0c2-436b-aed5-e84967c4be81',100,0,TO_TIMESTAMP('2013-01-16 04:31:40','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-16 04:31:40','YYYY-MM-DD HH24:MI:SS'),'Y','Y',515,1,'N')
+;
+
+-- Jan 16, 2013 4:31:41 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201651 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)
+;
+
+-- Jan 16, 2013 4:32:35 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field (ColumnSpan,NumLines,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry) VALUES (2,1,'N',508,20,'N','N',208379,505,'Y',201652,'N','D','Text key of the Campaign','Campaign Key','Y','N','9fd17334-4a7b-4585-a96a-000bc99d54ec',100,0,TO_TIMESTAMP('2013-01-16 04:32:35','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-16 04:32:35','YYYY-MM-DD HH24:MI:SS'),'Y','Y',505,1,'N')
+;
+
+-- Jan 16, 2013 4:32:35 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201652 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)
+;
+
+-- Jan 16, 2013 4:33:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field (ColumnSpan,NumLines,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Description,Name,IsDisplayed,IsFieldOnly,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry) VALUES (2,1,'N',508,20,'N','N',208380,525,'Y',201653,'N','D','Text key of the Sales Region','Sales Region Key','Y','N','245b156e-5dc9-41f9-8f41-f49d8607ae52',100,0,TO_TIMESTAMP('2013-01-16 04:33:32','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2013-01-16 04:33:32','YYYY-MM-DD HH24:MI:SS'),'Y','Y',525,1,'N')
+;
+
+-- Jan 16, 2013 4:33:32 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) 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,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=201653 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)
+;
+
+-- Jan 16, 2013 4:34:19 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2013-01-16 04:34:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7114
+;
+
+-- Jan 16, 2013 4:34:35 AM CET
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2013-01-16 04:34:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7157
+;
+
+SELECT register_migration_script('201301160230_IDEMPIERE-539.sql') FROM dual
+;
diff --git a/migration/i1.0a-release/postgresql/201301160719_IDEMPIERE-539.sql b/migration/i1.0a-release/postgresql/201301160719_IDEMPIERE-539.sql
new file mode 100644
index 0000000000..05cc194952
--- /dev/null
+++ b/migration/i1.0a-release/postgresql/201301160719_IDEMPIERE-539.sql
@@ -0,0 +1,73 @@
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=510,Updated=TO_TIMESTAMP('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201652
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=520, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7114
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=530,Updated=TO_TIMESTAMP('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201651
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=540,Updated=TO_TIMESTAMP('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7109
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=550,Updated=TO_TIMESTAMP('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201653
+;
+
+-- Jan 16, 2013 7:18:51 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=560, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-01-16 07:18:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7157
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=570,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7107
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=580,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7142
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=590,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7110
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=600,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7133
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=610,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7117
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=620,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7131
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=630,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7138
+;
+
+-- Jan 16, 2013 7:18:52 AM PST
+-- IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+UPDATE AD_Field SET SeqNo=640,Updated=TO_TIMESTAMP('2013-01-16 07:18:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=7136
+;
+
+SELECT register_migration_script('201301160719_IDEMPIERE-539.sql') FROM dual
+;
+
diff --git a/org.adempiere.base.process/src/org/compiere/process/ImportGLJournal.java b/org.adempiere.base.process/src/org/compiere/process/ImportGLJournal.java
index 78c7535f43..db6846b241 100644
--- a/org.adempiere.base.process/src/org/compiere/process/ImportGLJournal.java
+++ b/org.adempiere.base.process/src/org/compiere/process/ImportGLJournal.java
@@ -460,7 +460,57 @@ public class ImportGLJournal extends SvrProcess
 		no = DB.executeUpdate(sql.toString(), get_TrxName());
 		if (no != 0)
 			log.warning ("Invalid Project=" + no);
+		
+		// tbayen: IDEMPIERE-539 Import GL Window does not allow Key Values for Activity, Campaign, Sales Region
+		//	Set Campaign
+		sql = new StringBuilder ("UPDATE I_GLJournal i ")
+			.append("SET C_Campaign_ID=(SELECT p.C_Campaign_ID FROM C_Campaign p")
+			.append(" WHERE p.Value=i.CampaignValue AND p.IsSummary='N' AND i.AD_Client_ID=p.AD_Client_ID) ")
+			.append("WHERE C_Campaign_ID IS NULL AND CampaignValue IS NOT NULL")
+			.append(" AND (C_ValidCombination_ID IS NULL OR C_ValidCombination_ID=0) AND I_IsImported<>'Y'").append (clientCheck);
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
+		log.fine("Set Campaign from Value=" + no);
+		sql = new StringBuilder ("UPDATE I_GLJournal i ")
+			.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Campaign, '")
+			.append("WHERE C_Campaign_ID IS NULL AND CampaignValue IS NOT NULL")
+			.append(" AND (C_ValidCombination_ID IS NULL OR C_ValidCombination_ID=0) AND I_IsImported<>'Y'").append (clientCheck);
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
+		if (no != 0)
+			log.warning ("Invalid Campaign=" + no);
 
+		//	Set Activity
+		sql = new StringBuilder ("UPDATE I_GLJournal i ")
+			.append("SET C_Activity_ID=(SELECT p.C_Activity_ID FROM C_Activity p")
+			.append(" WHERE p.Value=i.ActivityValue AND p.IsSummary='N' AND i.AD_Client_ID=p.AD_Client_ID) ")
+			.append("WHERE C_Activity_ID IS NULL AND ActivityValue IS NOT NULL")
+			.append(" AND (C_ValidCombination_ID IS NULL OR C_ValidCombination_ID=0) AND I_IsImported<>'Y'").append (clientCheck);
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
+		log.fine("Set Activity from Value=" + no);
+		sql = new StringBuilder ("UPDATE I_GLJournal i ")
+			.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid Activity, '")
+			.append("WHERE C_Activity_ID IS NULL AND ActivityValue IS NOT NULL")
+			.append(" AND (C_ValidCombination_ID IS NULL OR C_ValidCombination_ID=0) AND I_IsImported<>'Y'").append (clientCheck);
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
+		if (no != 0)
+			log.warning ("Invalid Activity=" + no);
+
+		//	Set SalesRegion
+		sql = new StringBuilder ("UPDATE I_GLJournal i ")
+			.append("SET C_SalesRegion_ID=(SELECT p.C_SalesRegion_ID FROM C_SalesRegion p")
+			.append(" WHERE p.Value=i.SalesRegionValue AND p.IsSummary='N' AND i.AD_Client_ID=p.AD_Client_ID) ")
+			.append("WHERE C_SalesRegion_ID IS NULL AND SalesRegionValue IS NOT NULL")
+			.append(" AND (C_ValidCombination_ID IS NULL OR C_ValidCombination_ID=0) AND I_IsImported<>'Y'").append (clientCheck);
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
+		log.fine("Set SalesRegion from Value=" + no);
+		sql = new StringBuilder ("UPDATE I_GLJournal i ")
+			.append("SET I_IsImported='E', I_ErrorMsg=I_ErrorMsg||'ERR=Invalid SalesRegion, '")
+			.append("WHERE C_SalesRegion_ID IS NULL AND SalesRegionValue IS NOT NULL")
+			.append(" AND (C_ValidCombination_ID IS NULL OR C_ValidCombination_ID=0) AND I_IsImported<>'Y'").append (clientCheck);
+		no = DB.executeUpdate(sql.toString(), get_TrxName());
+		if (no != 0)
+			log.warning ("Invalid SalesRegion=" + no);
+
+		
 		//	Set TrxOrg
 		sql = new StringBuilder ("UPDATE I_GLJournal i ")
 			.append("SET AD_OrgTrx_ID=(SELECT o.AD_Org_ID FROM AD_Org o")
diff --git a/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
index 931455f4d8..a1ad28d292 100644
--- a/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/I_I_GLJournal.java
@@ -82,6 +82,15 @@ public interface I_I_GLJournal
 	  */
 	public String getAcctSchemaName();
 
+    /** Column name ActivityValue */
+    public static final String COLUMNNAME_ActivityValue = "ActivityValue";
+
+	/** Set Activity Value	  */
+	public void setActivityValue (String ActivityValue);
+
+	/** Get Activity Value	  */
+	public String getActivityValue();
+
     /** Column name AD_Client_ID */
     public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";
 
@@ -250,6 +259,15 @@ public interface I_I_GLJournal
 
 	public org.compiere.model.I_C_Activity getC_Activity() throws RuntimeException;
 
+    /** Column name CampaignValue */
+    public static final String COLUMNNAME_CampaignValue = "CampaignValue";
+
+	/** Set CampaignValue	  */
+	public void setCampaignValue (String CampaignValue);
+
+	/** Get CampaignValue	  */
+	public String getCampaignValue();
+
     /** Column name CategoryName */
     public static final String COLUMNNAME_CategoryName = "CategoryName";
 
@@ -853,6 +871,19 @@ public interface I_I_GLJournal
 	  */
 	public BigDecimal getQty();
 
+    /** Column name SalesRegionValue */
+    public static final String COLUMNNAME_SalesRegionValue = "SalesRegionValue";
+
+	/** Set Sales Region Value.
+	  * Key of the Sales Region
+	  */
+	public void setSalesRegionValue (String SalesRegionValue);
+
+	/** Get Sales Region Value.
+	  * Key of the Sales Region
+	  */
+	public String getSalesRegionValue();
+
     /** Column name SKU */
     public static final String COLUMNNAME_SKU = "SKU";
 
diff --git a/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
index 5b1029f053..29b51cc5ef 100644
--- a/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
+++ b/org.adempiere.base/src/org/compiere/model/X_I_GLJournal.java
@@ -33,7 +33,7 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20121031L;
+	private static final long serialVersionUID = 20121226L;
 
     /** Standard Constructor */
     public X_I_GLJournal (Properties ctx, int I_GLJournal_ID, String trxName)
@@ -136,6 +136,20 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return (String)get_Value(COLUMNNAME_AcctSchemaName);
 	}
 
+	/** Set Activity Value.
+		@param ActivityValue Activity Value	  */
+	public void setActivityValue (String ActivityValue)
+	{
+		set_Value (COLUMNNAME_ActivityValue, ActivityValue);
+	}
+
+	/** Get Activity Value.
+		@return Activity Value	  */
+	public String getActivityValue () 
+	{
+		return (String)get_Value(COLUMNNAME_ActivityValue);
+	}
+
 	/** Set Document Org.
 		@param AD_OrgDoc_ID 
 		Document Organization (independent from account organization)
@@ -369,6 +383,20 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return ii.intValue();
 	}
 
+	/** Set CampaignValue.
+		@param CampaignValue CampaignValue	  */
+	public void setCampaignValue (String CampaignValue)
+	{
+		set_Value (COLUMNNAME_CampaignValue, CampaignValue);
+	}
+
+	/** Get CampaignValue.
+		@return CampaignValue	  */
+	public String getCampaignValue () 
+	{
+		return (String)get_Value(COLUMNNAME_CampaignValue);
+	}
+
 	/** Set Category Name.
 		@param CategoryName 
 		Name of the Category
@@ -1346,6 +1374,23 @@ public class X_I_GLJournal extends PO implements I_I_GLJournal, I_Persistent
 		return bd;
 	}
 
+	/** Set Sales Region Value.
+		@param SalesRegionValue 
+		Key of the Sales Region
+	  */
+	public void setSalesRegionValue (String SalesRegionValue)
+	{
+		set_Value (COLUMNNAME_SalesRegionValue, SalesRegionValue);
+	}
+
+	/** Get Sales Region Value.
+		@return Key of the Sales Region
+	  */
+	public String getSalesRegionValue () 
+	{
+		return (String)get_Value(COLUMNNAME_SalesRegionValue);
+	}
+
 	/** Set SKU.
 		@param SKU 
 		Stock Keeping Unit
diff --git a/org.adempiere.base/src/org/compiere/util/WebDoc.java b/org.adempiere.base/src/org/compiere/util/WebDoc.java
index b14892988c..c2fc543cf6 100644
--- a/org.adempiere.base/src/org/compiere/util/WebDoc.java
+++ b/org.adempiere.base/src/org/compiere/util/WebDoc.java
@@ -170,7 +170,7 @@ public class WebDoc
 			m_head.addElement(new script((Element)null, WebEnv.getBaseDirectory("/js/standard.js")));
 		}
 		m_head.addElement(new meta().setHttpEquiv("Content-Type", "text/html; charset=UTF-8"));
-		m_head.addElement(new meta().setName("description", "ADempiere HTML UI"));
+		m_head.addElement(new meta().setName("description", "iDempiere HTML UI"));
 
 		m_table = new table("0", "0", "0", "100%", null);	//	spacing 2
 		m_topRow = new tr();
@@ -187,7 +187,7 @@ public class WebDoc
 		
 		if (javaClient) {
 			m_topRight.addElement(new img("res:org/compiere/images/AD10030.png")
-			.setAlign(AlignType.RIGHT).setAlt("ADempiere"));
+			.setAlign(AlignType.RIGHT).setAlt("iDempiere"));
 		} else {
 			if (title.equals("")) {
 				m_topRight.addElement(WebEnv.getLogo());
diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java b/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
index 584d0269ec..8c47f27636 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
@@ -80,9 +80,9 @@ public class AChat extends CDialog
 		}
 		//	Create Model
 		if (CM_Chat_ID > 0)
-			m_chat = new MChat (Env.getCtx(), AD_Table_ID, Record_ID, Description, trxName);
-		else
 			m_chat = new MChat (Env.getCtx(), CM_Chat_ID, trxName);
+		else
+			m_chat = new MChat (Env.getCtx(), AD_Table_ID, Record_ID, Description, trxName);
 		loadChat();
 		//
 		try
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
index dafaa12836..d431865ae6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
@@ -93,6 +93,7 @@ import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
+import org.compiere.util.Util;
 import org.compiere.util.WebDoc;
 import org.zkoss.zk.ui.AbstractComponent;
 import org.zkoss.zk.ui.Component;
@@ -1705,9 +1706,12 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
     {
     	final boolean wasChanged = toolbar.isSaveEnable();
     	IADTabpanel dirtyTabpanel = adTabbox.getDirtyADTabpanel();
-    	final boolean newRecord = dirtyTabpanel != null ? (dirtyTabpanel.getGridTab().getRecord_ID() <= 0)
-    			: false;
-    	if (dirtyTabpanel != null && dirtyTabpanel instanceof ADSortTab)
+    	final boolean newRecord = dirtyTabpanel != null ? (dirtyTabpanel.getGridTab().getRecord_ID() <= 0) : false;
+    	if (dirtyTabpanel == null) {
+			onSave0(onSaveEvent, onNavigationEvent, newRecord, wasChanged, callback);
+			return;
+    	}
+    	if (dirtyTabpanel instanceof ADSortTab)
     	{
     		ADSortTab sortTab = (ADSortTab) dirtyTabpanel;
     		sortTab.saveData();
@@ -1729,8 +1733,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
     	}
     	else
     	{
-    		if ((dirtyTabpanel != null && dirtyTabpanel.getGridTab().getCommitWarning() != null
-    			&& dirtyTabpanel.getGridTab().getCommitWarning().trim().length() > 0) ||
+    		if (!Util.isEmpty(dirtyTabpanel.getGridTab().getCommitWarning()) ||
     			(!Env.isAutoCommit(ctx, curWindowNo) && onNavigationEvent))
     		{
     			FDialog.ask(curWindowNo, this.getComponent(), "SaveChanges?", dirtyTabpanel.getGridTab().getCommitWarning(), new Callback<Boolean>() {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
index b6be87e433..3412d6caf3 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
@@ -99,14 +99,9 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		}
 		//	Create Model
 		if (CM_Chat_ID > 0)
+			m_chat = new MChat (Env.getCtx(), CM_Chat_ID, trxName);
+		else
 			m_chat = new MChat (Env.getCtx(), AD_Table_ID, Record_ID, Description, trxName);
-		else 
-		{
-			m_chat = new MChat (Env.getCtx(), 0, trxName);
-			m_chat.setDescription(Description);
-			m_chat.setAD_Table_ID(AD_Table_ID);
-			m_chat.setRecord_ID(Record_ID);
-		}
 		loadChat();
 		//
 	}	//	Attachment
@@ -170,7 +165,8 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		confirmPanel.setStyle("position:absolute; height:30px; width:99%; top:80px;");
 		confirmPanel.addActionListener(this);				
 
-		this.setStyle("position: relative; height: 600px; width: 500px;");
+		this.setHeight("600px");
+		this.setWidth("500px");
 		this.setMaximizable(true);
 		this.setSizable(true);
 		this.setBorder("normal");