diff --git a/migration/i1.0b-release/oracle/201304101012_IDEMPIERE-791.sql b/migration/i1.0b-release/oracle/201304101012_IDEMPIERE-791.sql
new file mode 100644
index 0000000000..e51ad6916d
--- /dev/null
+++ b/migration/i1.0b-release/oracle/201304101012_IDEMPIERE-791.sql
@@ -0,0 +1,550 @@
+-- Apr 10, 2013 9:58:31 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+INSERT INTO AD_Field (ColumnSpan,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,NumLines) VALUES (1,0,'N',402,0,'N','N',14726,560,'Y',201896,'N','Date when the task is planned to be complete','D','Planned Completion Date','Complete Plan','5180aa2f-2af0-4421-ae30-02328180bafe','Y','N',100,0,TO_DATE('2013-04-10 09:58:30','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-04-10 09:58:30','YYYY-MM-DD HH24:MI:SS'),'Y','Y',540,1,'N',0,1)
+;
+
+-- Apr 10, 2013 9:58:31 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+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=201896 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)
+;
+
+-- Apr 10, 2013 10:03:54 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+INSERT INTO AD_Field (ColumnSpan,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,NumLines) VALUES (1,0,'N',402,0,'N','N',14734,570,'Y',201897,'N','Date when you plan to start','D','Planned Start Date','Start Plan','c318610c-187c-467a-885f-457b8d0d5209','Y','N',100,0,TO_DATE('2013-04-10 10:03:53','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-04-10 10:03:53','YYYY-MM-DD HH24:MI:SS'),'Y','Y',550,1,'N',0,1)
+;
+
+-- Apr 10, 2013 10:03:54 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+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=201897 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)
+;
+
+-- Apr 10, 2013 10:07:11 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET SeqNo=130, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-04-10 10:07:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- Apr 10, 2013 10:07:11 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET SeqNo=140, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-04-10 10:07:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- Apr 10, 2013 10:07:45 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Column SET AD_Reference_ID=16,Updated=TO_DATE('2013-04-10 10:07:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14726
+;
+
+-- Apr 10, 2013 10:07:59 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Column SET AD_Reference_ID=16,Updated=TO_DATE('2013-04-10 10:07:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14734
+;
+
+-- Apr 10, 2013 10:08:56 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET ColumnSpan=2, SeqNo=130,Updated=TO_DATE('2013-04-10 10:08:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- Apr 10, 2013 10:08:56 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET ColumnSpan=2, SeqNo=140,Updated=TO_DATE('2013-04-10 10:08:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- May 29, 2013 4:11:16 PM COT
+-- IDEMPIERE-791 Dates used in request calendar not visible in request
+UPDATE AD_Field SET SeqNo=250, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11453
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=270,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11449
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=280, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=290, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=300,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11456
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=310,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5171
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=320,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5170
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=330,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5191
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8890
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5174
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5173
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5181
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5175
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11491
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11490
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5187
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_DATE('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5172
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=430,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11178
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=440,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11179
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=450,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5176
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=460,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10906
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=470,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5180
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=480,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5842
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=490,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5841
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=500,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5844
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=510,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5843
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=520,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11492
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=530,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11450
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=540,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11489
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=550,Updated=TO_DATE('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5184
+;
+
+-- May 29, 2013 4:12:50 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines) VALUES (0,'N',402,0,'N','N',14725,290,'Y',202181,'N','Completion Rate and Status of the Task','D','Status of the Task','Task Status','77bfea57-16ad-45a2-86ae-01d19f07238b','Y','N',100,0,TO_DATE('2013-05-29 16:12:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-05-29 16:12:49','YYYY-MM-DD HH24:MI:SS'),'Y','Y',560,1,'N',0,2,1)
+;
+
+-- May 29, 2013 4:12:50 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,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=202181 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)
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=280, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202181
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=290, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11456
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=300, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11463
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=310, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11451
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=320, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11492
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=330, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11489
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5171
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5170
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5191
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8890
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5174
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5173
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5181
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5175
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11491
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=430,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11490
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=440,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5187
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=450,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5172
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=460,Updated=TO_DATE('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11178
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=470,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11179
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=480,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5176
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=490,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10906
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=500,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5180
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=510,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5842
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=520,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5841
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=530,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5844
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=540,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5843
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=550, IsDisplayed='Y', XPosition=2,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5184
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=560,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11450
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_DATE('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=10,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12993
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=20,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4282
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=30,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4283
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=40,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4294
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=50,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4295
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=60,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5858
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=70,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11422
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=80,Updated=TO_DATE('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11421
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=90,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11423
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=100,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11426
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=110,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11424
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=120,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4302
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=130,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11418
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=140,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4310
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=150,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11411
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=160,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11416
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=170,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4296
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=180,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6502
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=190,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4284
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=200,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11410
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=210,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4293
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=220,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11412
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=230,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11425
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=240,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4305
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=250,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4309
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=260,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11417
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=270,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11419
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=280,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11413
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=290,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11420
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=300,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12751
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=310,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12750
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=320, IsDisplayed='Y', XPosition=1,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11427
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=330, IsDisplayed='Y', XPosition=4,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11415
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11502
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11499
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4287
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4286
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4547
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_DATE('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8889
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4290
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4289
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4299
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=430,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4291
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=440,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11501
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=450,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11500
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=460,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4307
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=470,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4288
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=480,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11176
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=490,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11177
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=500,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4292
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=510,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10905
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=520,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4298
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=530,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5846
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=540,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5845
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=550,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5848
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=560,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5847
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=570,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12748
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=580,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11414
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=590,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4303
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12749
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_DATE('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12752
+;
+
+SELECT register_migration_script('201304101012_IDEMPIERE-791.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/oracle/201305171202_IDEMPIERE-933.sql b/migration/i1.0b-release/oracle/201305171202_IDEMPIERE-933.sql
new file mode 100644
index 0000000000..b216cf0f0f
--- /dev/null
+++ b/migration/i1.0b-release/oracle/201305171202_IDEMPIERE-933.sql
@@ -0,0 +1,12 @@
+-- May 17, 2013 11:59:06 AM COT
+-- IDEMPIERE-933 Window Customization Security Hole
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','The reference of an encrypted field cannot be changed',200175,'D','f09382d4-62bb-48a8-abb9-d71ec5fbc5fe','NotChangeReference','Y',TO_DATE('2013-05-17 11:59:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-05-17 11:59:05','YYYY-MM-DD HH24:MI:SS'),0)
+;
+
+-- May 17, 2013 11:59:06 AM COT
+-- IDEMPIERE-933 Window Customization Security Hole
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200175 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
+;
+
+SELECT register_migration_script('201305171202_IDEMPIERE-933.sql') FROM dual
+;
diff --git a/migration/i1.0b-release/oracle/201305231200_IDEMPIERE-955.sql b/migration/i1.0b-release/oracle/201305231200_IDEMPIERE-955.sql
new file mode 100644
index 0000000000..5deefe5122
--- /dev/null
+++ b/migration/i1.0b-release/oracle/201305231200_IDEMPIERE-955.sql
@@ -0,0 +1,8 @@
+-- May 23, 2013 11:43:26 AM COT
+-- Proper English
+UPDATE AD_Message SET MsgText='Report Wizard',Updated=TO_DATE('2013-05-23 11:43:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200090
+;
+
+
+SELECT register_migration_script('201305231200_IDEMPIERE-955.sql') FROM dual
+;
diff --git a/migration/i1.0b-release/oracle/20130527113000_IDEMPIERE-962.sql b/migration/i1.0b-release/oracle/20130527113000_IDEMPIERE-962.sql
new file mode 100644
index 0000000000..c4b987a11b
--- /dev/null
+++ b/migration/i1.0b-release/oracle/20130527113000_IDEMPIERE-962.sql
@@ -0,0 +1,34 @@
+-- May 27, 2013 10:43:09 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Process SET Description='Validate that the workflow is correct',Updated=TO_DATE('2013-05-27 10:43:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=304
+;
+
+-- May 27, 2013 10:55:51 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Workflow SET IsValid='Y', Description='(Standard Process Invoice)',Updated=TO_DATE('2013-05-27 10:55:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=118
+;
+
+-- May 27, 2013 10:59:41 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Process SET Description='Check data consistency of Business Partner',Updated=TO_DATE('2013-05-27 10:59:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=314
+;
+
+-- May 27, 2013 10:59:41 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Menu SET Name='Validate Business Partner', Description='Check data consistency of Business Partner', IsActive='Y',Updated=TO_DATE('2013-05-27 10:59:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=506
+;
+
+-- May 29, 2013 7:52:39 AM COT
+UPDATE AD_Ref_List SET Description='Check Document consistency and check Inventory',Updated=TO_DATE('2013-05-29 07:52:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=345
+;
+
+-- May 29, 2013 7:53:14 AM COT
+UPDATE AD_Ref_List SET Description='Reopen Document and Reverse automatically generated documents; You need to Complete the transaction after the change. ',Updated=TO_DATE('2013-05-29 07:53:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=188
+;
+
+-- May 29, 2013 7:53:31 AM COT
+UPDATE AD_Ref_List SET Description='Wait Condition ok Complete Document',Updated=TO_DATE('2013-05-29 07:53:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=691
+;
+
+SELECT register_migration_script('20130527113000_IDEMPIERE-962.sql') FROM dual
+;
diff --git a/migration/i1.0b-release/oracle/201305291133_IDEMPIERE-170_SampleGWCash.sql b/migration/i1.0b-release/oracle/201305291133_IDEMPIERE-170_SampleGWCash.sql
new file mode 100644
index 0000000000..1155cb8813
--- /dev/null
+++ b/migration/i1.0b-release/oracle/201305291133_IDEMPIERE-170_SampleGWCash.sql
@@ -0,0 +1,23 @@
+-- May 29, 2013 11:30:16 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_Bank (C_Bank_UU,RoutingNo,C_Bank_ID,IsOwnBank,Name,AD_Org_ID,Updated,Created,CreatedBy,UpdatedBy,AD_Client_ID,IsActive) VALUES ('269f3083-6c14-4e08-bc65-2f9e91927cb0','POS Cash',200000,'Y','POS Cash',0,TO_DATE('2013-05-29 11:30:15','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-05-29 11:30:15','YYYY-MM-DD HH24:MI:SS'),100,100,11,'Y')
+;
+
+-- May 29, 2013 11:30:39 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_BankAccount (CurrentBalance,C_Currency_ID,IsDefault,BankAccountType,CreditLimit,C_BankAccount_ID,C_BankAccount_UU,CreatedBy,Created,Updated,AD_Org_ID,UpdatedBy,AD_Client_ID,IsActive,AccountNo,Value,Name,C_Bank_ID) VALUES (0,100,'N','B',0,200000,'4781b89e-ce6d-41c9-9c89-12d2db752b61',100,TO_DATE('2013-05-29 11:30:38','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-05-29 11:30:38','YYYY-MM-DD HH24:MI:SS'),11,100,11,'Y','HQ POS Cash','HQ POS Cash','HQ POS Cash',200000)
+;
+
+-- May 29, 2013 11:30:39 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_BankAccount_Acct (C_BankAccount_ID, C_AcctSchema_ID, AD_Client_ID,AD_Org_ID,IsActive, Created,CreatedBy,Updated,UpdatedBy ,B_Asset_Acct,B_InterestExp_Acct,B_InterestRev_Acct,B_InTransit_Acct,B_PaymentSelect_Acct,B_UnallocatedCash_Acct,C_BankAccount_Acct_UU) SELECT 200000, p.C_AcctSchema_ID, p.AD_Client_ID,0,'Y', SysDate,100,SysDate,100,p.B_Asset_Acct,p.B_InterestExp_Acct,p.B_InterestRev_Acct,p.B_InTransit_Acct,p.B_PaymentSelect_Acct,p.B_UnallocatedCash_Acct,generate_uuid() FROM C_AcctSchema_Default p WHERE p.AD_Client_ID=11 AND NOT EXISTS (SELECT * FROM C_BankAccount_Acct e WHERE e.C_AcctSchema_ID=p.C_AcctSchema_ID AND e.C_BankAccount_ID=200000)
+;
+
+-- May 29, 2013 11:30:55 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_BankAccountDoc (C_BankAccount_ID,PaymentRule,C_BankAccountDoc_ID,Check_PrintFormat_ID,CurrentNext,Name,C_BankAccountDoc_UU,Created,UpdatedBy,Updated,AD_Org_ID,CreatedBy,AD_Client_ID,IsActive) VALUES (200000,'B',200000,126,0,'HQ POS Cash','cdfacd83-2ca2-45a6-93f4-36215066c94d',TO_DATE('2013-05-29 11:30:54','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-05-29 11:30:54','YYYY-MM-DD HH24:MI:SS'),11,100,11,'Y')
+;
+
+SELECT register_migration_script('201305291133_IDEMPIERE-170_SampleGWCash.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql b/migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql
new file mode 100644
index 0000000000..9aa4e10c74
--- /dev/null
+++ b/migration/i1.0b-release/oracle/201305291158_IDEMPIERE-983.sql
@@ -0,0 +1,8 @@
+-- May 29, 2013 11:54:03 AM COT
+-- IDEMPIERE-983 Cannot print cash payments generated
+UPDATE AD_Column SET AD_Val_Rule_ID=52033,Updated=TO_DATE('2013-05-29 11:54:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5637
+;
+
+SELECT register_migration_script('201305291158_IDEMPIERE-983.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/oracle/20130529121300_IDEMPIERE-970.sql b/migration/i1.0b-release/oracle/20130529121300_IDEMPIERE-970.sql
new file mode 100644
index 0000000000..00c8ec126a
--- /dev/null
+++ b/migration/i1.0b-release/oracle/20130529121300_IDEMPIERE-970.sql
@@ -0,0 +1,8 @@
+-- May 29, 2013 12:13:00 PM COT
+-- IDEMPIERE-970  Role with the "can Export" option deselected would actually be able to export
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Value,Description,AD_SysConfig_UU,Created,Updated,AD_Org_ID,CreatedBy,IsActive,UpdatedBy,Name,AD_Client_ID,EntityType) VALUES (200030,'O','PDF','Sets default jasper output type','7dbe0a07-d566-419e-9f81-003cf0be6b52',TO_DATE('2013-05-29 12:13:00','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-05-29 12:13:00','YYYY-MM-DD HH24:MI:SS'),0,100,'Y',100,'ZK_REPORT_JASPER_OUTPUT_TYPE',0,'D')
+;
+
+SELECT register_migration_script('20130529121300_IDEMPIERE-970.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/postgresql/201304101012_IDEMPIERE-791.sql b/migration/i1.0b-release/postgresql/201304101012_IDEMPIERE-791.sql
new file mode 100644
index 0000000000..3649c5d032
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/201304101012_IDEMPIERE-791.sql
@@ -0,0 +1,550 @@
+-- Apr 10, 2013 9:58:31 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+INSERT INTO AD_Field (ColumnSpan,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,NumLines) VALUES (1,0,'N',402,0,'N','N',14726,560,'Y',201896,'N','Date when the task is planned to be complete','D','Planned Completion Date','Complete Plan','5180aa2f-2af0-4421-ae30-02328180bafe','Y','N',100,0,TO_TIMESTAMP('2013-04-10 09:58:30','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-04-10 09:58:30','YYYY-MM-DD HH24:MI:SS'),'Y','Y',540,1,'N',0,1)
+;
+
+-- Apr 10, 2013 9:58:31 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+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=201896 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)
+;
+
+-- Apr 10, 2013 10:03:54 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+INSERT INTO AD_Field (ColumnSpan,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,NumLines) VALUES (1,0,'N',402,0,'N','N',14734,570,'Y',201897,'N','Date when you plan to start','D','Planned Start Date','Start Plan','c318610c-187c-467a-885f-457b8d0d5209','Y','N',100,0,TO_TIMESTAMP('2013-04-10 10:03:53','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-04-10 10:03:53','YYYY-MM-DD HH24:MI:SS'),'Y','Y',550,1,'N',0,1)
+;
+
+-- Apr 10, 2013 10:03:54 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+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=201897 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)
+;
+
+-- Apr 10, 2013 10:07:11 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET SeqNo=130, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-04-10 10:07:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- Apr 10, 2013 10:07:11 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET SeqNo=140, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-04-10 10:07:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- Apr 10, 2013 10:07:45 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Column SET AD_Reference_ID=16,Updated=TO_TIMESTAMP('2013-04-10 10:07:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14726
+;
+
+-- Apr 10, 2013 10:07:59 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Column SET AD_Reference_ID=16,Updated=TO_TIMESTAMP('2013-04-10 10:07:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14734
+;
+
+-- Apr 10, 2013 10:08:56 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET ColumnSpan=2, SeqNo=130,Updated=TO_TIMESTAMP('2013-04-10 10:08:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- Apr 10, 2013 10:08:56 AM COT
+-- IDEMPIERE-791, Dates used in request calendar not visible in request
+UPDATE AD_Field SET ColumnSpan=2, SeqNo=140,Updated=TO_TIMESTAMP('2013-04-10 10:08:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- May 29, 2013 4:11:16 PM COT
+-- IDEMPIERE-791 Dates used in request calendar not visible in request
+UPDATE AD_Field SET SeqNo=250, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11453
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=270,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11449
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=280, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=290, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=300,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11456
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=310,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5171
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=320,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5170
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=330,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5191
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8890
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5174
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5173
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5181
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5175
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11491
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11490
+;
+
+-- May 29, 2013 4:11:16 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5187
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_TIMESTAMP('2013-05-29 16:11:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5172
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=430,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11178
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=440,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11179
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=450,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5176
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=460,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10906
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=470,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5180
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=480,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5842
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=490,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5841
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=500,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5844
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=510,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5843
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=520,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11492
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=530,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11450
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=540,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11489
+;
+
+-- May 29, 2013 4:11:17 PM COT
+UPDATE AD_Field SET SeqNo=550,Updated=TO_TIMESTAMP('2013-05-29 16:11:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5184
+;
+
+-- May 29, 2013 4:12:50 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines) VALUES (0,'N',402,0,'N','N',14725,290,'Y',202181,'N','Completion Rate and Status of the Task','D','Status of the Task','Task Status','77bfea57-16ad-45a2-86ae-01d19f07238b','Y','N',100,0,TO_TIMESTAMP('2013-05-29 16:12:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-05-29 16:12:49','YYYY-MM-DD HH24:MI:SS'),'Y','Y',560,1,'N',0,2,1)
+;
+
+-- May 29, 2013 4:12:50 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,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=202181 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)
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=280, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202181
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=290, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11456
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=300, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11463
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=310, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11451
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=320, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11492
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=330, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11489
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5171
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5170
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5191
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8890
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5174
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5173
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5181
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5175
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11491
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=430,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11490
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=440,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5187
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=450,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5172
+;
+
+-- May 29, 2013 4:16:34 PM COT
+UPDATE AD_Field SET SeqNo=460,Updated=TO_TIMESTAMP('2013-05-29 16:16:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11178
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=470,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11179
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=480,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5176
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=490,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10906
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=500,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5180
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=510,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5842
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=520,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5841
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=530,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5844
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=540,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5843
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=550, IsDisplayed='Y', XPosition=2,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5184
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=560,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11450
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201896
+;
+
+-- May 29, 2013 4:16:35 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:16:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201897
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=10,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12993
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=20,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4282
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=30,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4283
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=40,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4294
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=50,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4295
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=60,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5858
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=70,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11422
+;
+
+-- May 29, 2013 4:19:02 PM COT
+UPDATE AD_Field SET SeqNo=80,Updated=TO_TIMESTAMP('2013-05-29 16:19:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11421
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=90,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11423
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=100,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11426
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=110,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11424
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=120,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4302
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=130,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11418
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=140,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4310
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=150,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11411
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=160,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11416
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=170,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4296
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=180,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6502
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=190,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4284
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=200,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11410
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=210,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4293
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=220,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11412
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=230,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11425
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=240,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4305
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=250,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4309
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=260,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11417
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=270,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11419
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=280,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11413
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=290,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11420
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=300,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12751
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=310,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12750
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=320, IsDisplayed='Y', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11427
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=330, IsDisplayed='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11415
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11502
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11499
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4287
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4286
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4547
+;
+
+-- May 29, 2013 4:19:03 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_TIMESTAMP('2013-05-29 16:19:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=8889
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4290
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4289
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4299
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=430,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4291
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=440,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11501
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=450,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11500
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=460,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4307
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=470,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4288
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=480,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11176
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=490,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11177
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=500,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4292
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=510,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10905
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=520,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4298
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=530,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5846
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=540,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5845
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=550,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5848
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=560,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5847
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=570,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12748
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=580,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=11414
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=590,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4303
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12749
+;
+
+-- May 29, 2013 4:19:04 PM COT
+UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_TIMESTAMP('2013-05-29 16:19:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=12752
+;
+
+SELECT register_migration_script('201304101012_IDEMPIERE-791.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/postgresql/201305171202_IDEMPIERE-933.sql b/migration/i1.0b-release/postgresql/201305171202_IDEMPIERE-933.sql
new file mode 100644
index 0000000000..c57e6e9f6c
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/201305171202_IDEMPIERE-933.sql
@@ -0,0 +1,13 @@
+-- May 17, 2013 11:59:06 AM COT
+-- IDEMPIERE-933 Window Customization Security Hole
+INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','The reference of an encrypted field cannot be changed',200175,'D','f09382d4-62bb-48a8-abb9-d71ec5fbc5fe','NotChangeReference','Y',TO_TIMESTAMP('2013-05-17 11:59:05','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-05-17 11:59:05','YYYY-MM-DD HH24:MI:SS'),0)
+;
+
+-- May 17, 2013 11:59:06 AM COT
+-- IDEMPIERE-933 Window Customization Security Hole
+INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200175 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
+;
+
+SELECT register_migration_script('201305171202_IDEMPIERE-933.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/postgresql/201305231200_IDEMPIERE-955.sql b/migration/i1.0b-release/postgresql/201305231200_IDEMPIERE-955.sql
new file mode 100644
index 0000000000..a0d3b401ac
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/201305231200_IDEMPIERE-955.sql
@@ -0,0 +1,8 @@
+-- May 23, 2013 11:43:26 AM COT
+-- Proper English
+UPDATE AD_Message SET MsgText='Report Wizard',Updated=TO_TIMESTAMP('2013-05-23 11:43:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Message_ID=200090
+;
+
+
+SELECT register_migration_script('201305231200_IDEMPIERE-955.sql') FROM dual
+;
diff --git a/migration/i1.0b-release/postgresql/20130527113000_IDEMPIERE-962.sql b/migration/i1.0b-release/postgresql/20130527113000_IDEMPIERE-962.sql
new file mode 100644
index 0000000000..aba34eeb72
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/20130527113000_IDEMPIERE-962.sql
@@ -0,0 +1,34 @@
+-- May 27, 2013 10:43:09 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Process SET Description='Validate that the workflow is correct',Updated=TO_TIMESTAMP('2013-05-27 10:43:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=304
+;
+
+-- May 27, 2013 10:55:51 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Workflow SET IsValid='Y', Description='(Standard Process Invoice)',Updated=TO_TIMESTAMP('2013-05-27 10:55:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Workflow_ID=118
+;
+
+-- May 27, 2013 10:59:41 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Process SET Description='Check data consistency of Business Partner',Updated=TO_TIMESTAMP('2013-05-27 10:59:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_ID=314
+;
+
+-- May 27, 2013 10:59:41 AM COT
+-- IDEMPIERE-962 Misspelled words and/or sentences
+UPDATE AD_Menu SET Name='Validate Business Partner', Description='Check data consistency of Business Partner', IsActive='Y',Updated=TO_TIMESTAMP('2013-05-27 10:59:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=506
+;
+
+-- May 29, 2013 7:52:39 AM COT
+UPDATE AD_Ref_List SET Description='Check Document consistency and check Inventory',Updated=TO_TIMESTAMP('2013-05-29 07:52:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=345
+;
+
+-- May 29, 2013 7:53:14 AM COT
+UPDATE AD_Ref_List SET Description='Reopen Document and Reverse automatically generated documents; You need to Complete the transaction after the change. ',Updated=TO_TIMESTAMP('2013-05-29 07:53:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=188
+;
+
+-- May 29, 2013 7:53:31 AM COT
+UPDATE AD_Ref_List SET Description='Wait Condition ok Complete Document',Updated=TO_TIMESTAMP('2013-05-29 07:53:31','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=691
+;
+
+SELECT register_migration_script('20130527113000_IDEMPIERE-962.sql') FROM dual
+;
diff --git a/migration/i1.0b-release/postgresql/201305291133_IDEMPIERE-170_SampleGWCash.sql b/migration/i1.0b-release/postgresql/201305291133_IDEMPIERE-170_SampleGWCash.sql
new file mode 100644
index 0000000000..83d03032ca
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/201305291133_IDEMPIERE-170_SampleGWCash.sql
@@ -0,0 +1,23 @@
+-- May 29, 2013 11:30:16 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_Bank (C_Bank_UU,RoutingNo,C_Bank_ID,IsOwnBank,Name,AD_Org_ID,Updated,Created,CreatedBy,UpdatedBy,AD_Client_ID,IsActive) VALUES ('269f3083-6c14-4e08-bc65-2f9e91927cb0','POS Cash',200000,'Y','POS Cash',0,TO_TIMESTAMP('2013-05-29 11:30:15','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-05-29 11:30:15','YYYY-MM-DD HH24:MI:SS'),100,100,11,'Y')
+;
+
+-- May 29, 2013 11:30:39 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_BankAccount (CurrentBalance,C_Currency_ID,IsDefault,BankAccountType,CreditLimit,C_BankAccount_ID,C_BankAccount_UU,CreatedBy,Created,Updated,AD_Org_ID,UpdatedBy,AD_Client_ID,IsActive,AccountNo,Value,Name,C_Bank_ID) VALUES (0,100,'N','B',0,200000,'4781b89e-ce6d-41c9-9c89-12d2db752b61',100,TO_TIMESTAMP('2013-05-29 11:30:38','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-05-29 11:30:38','YYYY-MM-DD HH24:MI:SS'),11,100,11,'Y','HQ POS Cash','HQ POS Cash','HQ POS Cash',200000)
+;
+
+-- May 29, 2013 11:30:39 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_BankAccount_Acct (C_BankAccount_ID, C_AcctSchema_ID, AD_Client_ID,AD_Org_ID,IsActive, Created,CreatedBy,Updated,UpdatedBy ,B_Asset_Acct,B_InterestExp_Acct,B_InterestRev_Acct,B_InTransit_Acct,B_PaymentSelect_Acct,B_UnallocatedCash_Acct,C_BankAccount_Acct_UU) SELECT 200000, p.C_AcctSchema_ID, p.AD_Client_ID,0,'Y', statement_timestamp(),100,statement_timestamp(),100,p.B_Asset_Acct,p.B_InterestExp_Acct,p.B_InterestRev_Acct,p.B_InTransit_Acct,p.B_PaymentSelect_Acct,p.B_UnallocatedCash_Acct,generate_uuid() FROM C_AcctSchema_Default p WHERE p.AD_Client_ID=11 AND NOT EXISTS (SELECT * FROM C_BankAccount_Acct e WHERE e.C_AcctSchema_ID=p.C_AcctSchema_ID AND e.C_BankAccount_ID=200000)
+;
+
+-- May 29, 2013 11:30:55 AM COT
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+INSERT INTO C_BankAccountDoc (C_BankAccount_ID,PaymentRule,C_BankAccountDoc_ID,Check_PrintFormat_ID,CurrentNext,Name,C_BankAccountDoc_UU,Created,UpdatedBy,Updated,AD_Org_ID,CreatedBy,AD_Client_ID,IsActive) VALUES (200000,'B',200000,126,0,'HQ POS Cash','cdfacd83-2ca2-45a6-93f4-36215066c94d',TO_TIMESTAMP('2013-05-29 11:30:54','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-05-29 11:30:54','YYYY-MM-DD HH24:MI:SS'),11,100,11,'Y')
+;
+
+SELECT register_migration_script('201305291133_IDEMPIERE-170_SampleGWCash.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql b/migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql
new file mode 100644
index 0000000000..c59da724aa
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/201305291158_IDEMPIERE-983.sql
@@ -0,0 +1,8 @@
+-- May 29, 2013 11:54:03 AM COT
+-- IDEMPIERE-983 Cannot print cash payments generated
+UPDATE AD_Column SET AD_Val_Rule_ID=52033,Updated=TO_TIMESTAMP('2013-05-29 11:54:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5637
+;
+
+SELECT register_migration_script('201305291158_IDEMPIERE-983.sql') FROM dual
+;
+
diff --git a/migration/i1.0b-release/postgresql/20130529121300_IDEMPIERE-970.sql b/migration/i1.0b-release/postgresql/20130529121300_IDEMPIERE-970.sql
new file mode 100644
index 0000000000..376e9adf1f
--- /dev/null
+++ b/migration/i1.0b-release/postgresql/20130529121300_IDEMPIERE-970.sql
@@ -0,0 +1,9 @@
+-- May 29, 2013 12:13:00 PM COT
+-- IDEMPIERE-970  Role with the "can Export" option deselected would actually be able to export
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Value,Description,AD_SysConfig_UU,Created,Updated,AD_Org_ID,CreatedBy,IsActive,UpdatedBy,Name,AD_Client_ID,EntityType) VALUES (200030,'O','PDF','Sets default jasper output type','7dbe0a07-d566-419e-9f81-003cf0be6b52',TO_TIMESTAMP('2013-05-29 12:13:00','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-05-29 12:13:00','YYYY-MM-DD HH24:MI:SS'),0,100,'Y',100,'ZK_REPORT_JASPER_OUTPUT_TYPE',0,'D')
+;
+
+SELECT register_migration_script('20130529121300_IDEMPIERE-970.sql') FROM dual
+;
+
+
diff --git a/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql b/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql
index c5c08aaa9a..94bc083d03 100644
--- a/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql
+++ b/migration/processes_post_migration/oracle/02_SynchronizeTerminology.sql
@@ -117,6 +117,12 @@ UPDATE AD_MENU m SET Name = (SELECT Name FROM AD_TASK f WHERE m.AD_Task_ID=f.AD_
 UPDATE AD_MENU_TRL mt SET Name = (SELECT ft.Name FROM AD_TASK_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE), Description = (SELECT ft.Description FROM AD_TASK_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE), IsTranslated = (SELECT ft.IsTranslated FROM AD_TASK_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE) WHERE EXISTS (SELECT 1 FROM AD_TASK_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE AND m.AD_Task_ID IS NOT NULL AND m.Action = 'T' AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y')
 ;
 
+UPDATE	AD_MENU m SET Name = (SELECT Name FROM AD_InfoWindow f WHERE m.AD_InfoWindow_ID=f.AD_InfoWindow_ID), Description = (SELECT Description FROM AD_InfoWindow f WHERE m.AD_InfoWindow_ID=f.AD_InfoWindow_ID) WHERE m.AD_InfoWindow_ID IS NOT NULL AND m.Action = 'I' AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y'
+;
+
+UPDATE	AD_MENU_TRL mt SET Name = (SELECT ft.Name FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE), Description = (SELECT ft.Description FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE), IsTranslated = (SELECT ft.IsTranslated FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE) WHERE EXISTS (SELECT 1 FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND mt.AD_LANGUAGE=ft.AD_LANGUAGE AND m.AD_InfoWindow_ID IS NOT NULL AND m.Action = 'I' AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y')
+;
+
 UPDATE AD_COLUMN_TRL ct SET Name = (SELECT e.Name FROM AD_COLUMN c INNER JOIN AD_ELEMENT_TRL e ON (c.AD_Element_ID=e.AD_Element_ID) WHERE ct.AD_Column_ID=c.AD_Column_ID AND ct.AD_LANGUAGE=e.AD_LANGUAGE) WHERE EXISTS (SELECT 1 FROM AD_COLUMN c INNER JOIN AD_ELEMENT_TRL e ON (c.AD_Element_ID=e.AD_Element_ID) WHERE ct.AD_Column_ID=c.AD_Column_ID AND ct.AD_LANGUAGE=e.AD_LANGUAGE AND ct.Name<>e.Name)
 ;
 
diff --git a/migration/processes_post_migration/postgresql/02_SynchronizeTerminology.sql b/migration/processes_post_migration/postgresql/02_SynchronizeTerminology.sql
index 16af3b86ac..eb055b67f0 100644
--- a/migration/processes_post_migration/postgresql/02_SynchronizeTerminology.sql
+++ b/migration/processes_post_migration/postgresql/02_SynchronizeTerminology.sql
@@ -117,6 +117,12 @@ UPDATE AD_MENU SET Name = (SELECT Name FROM AD_TASK f WHERE AD_MENU.AD_Task_ID=f
 UPDATE AD_MENU_TRL SET Name = (SELECT ft.Name FROM AD_TASK_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE), Description = (SELECT ft.Description FROM AD_TASK_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE), IsTranslated = (SELECT ft.IsTranslated FROM AD_TASK_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE) WHERE EXISTS (SELECT 1 FROM AD_TASK_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_Task_ID=ft.AD_Task_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE AND m.AD_Task_ID IS NOT NULL AND m."action" = 'T' AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y')
 ;
 
+UPDATE AD_MENU SET Name = (SELECT Name FROM AD_InfoWindow f WHERE AD_MENU.AD_InfoWindow_ID=f.AD_InfoWindow_ID), Description = (SELECT Description FROM AD_InfoWindow f WHERE AD_MENU.AD_InfoWindow_ID=f.AD_InfoWindow_ID) WHERE AD_MENU.AD_InfoWindow_ID IS NOT NULL AND AD_MENU."action" = 'I' AND AD_MENU.IsCentrallyMaintained='Y' AND AD_MENU.IsActive='Y'
+;
+
+UPDATE AD_MENU_TRL SET Name = (SELECT ft.Name FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE), Description = (SELECT ft.Description FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE), IsTranslated = (SELECT ft.IsTranslated FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE) WHERE EXISTS (SELECT 1 FROM AD_InfoWindow_TRL ft, AD_MENU m WHERE AD_MENU_TRL.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID AND AD_MENU_TRL.AD_LANGUAGE=ft.AD_LANGUAGE AND m.AD_InfoWindow_ID IS NOT NULL AND m."action" = 'I' AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y')
+;
+
 UPDATE AD_COLUMN_TRL SET Name = (SELECT e.Name FROM AD_COLUMN c INNER JOIN AD_ELEMENT_TRL e ON (c.AD_Element_ID=e.AD_Element_ID) WHERE AD_COLUMN_TRL.AD_Column_ID=c.AD_Column_ID AND AD_COLUMN_TRL.AD_LANGUAGE=e.AD_LANGUAGE) WHERE EXISTS (SELECT 1 FROM AD_COLUMN c INNER JOIN AD_ELEMENT_TRL e ON (c.AD_Element_ID=e.AD_Element_ID) WHERE AD_COLUMN_TRL.AD_Column_ID=c.AD_Column_ID AND AD_COLUMN_TRL.AD_LANGUAGE=e.AD_LANGUAGE AND AD_COLUMN_TRL.Name<>e.Name)
 ;
 
diff --git a/org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java b/org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java
index 770ec26b71..90ae5a868a 100644
--- a/org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java
+++ b/org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java
@@ -816,6 +816,40 @@ public class SynchronizeTerminology extends SvrProcess
 			if (log.isLoggable(Level.INFO)) log.info("  rows updated: "+no);
 			trx.commit(true);
 
+			//	Sync Names = InfoWindow
+			log.info("Synchronizing Menu with InfoWindow");
+			sql="UPDATE	AD_MENU m"
+					+" SET Name = (SELECT Name FROM AD_InfoWindow f WHERE m.AD_InfoWindow_ID=f.AD_InfoWindow_ID),"
+					+" Description = (SELECT Description FROM AD_InfoWindow f WHERE m.AD_InfoWindow_ID=f.AD_InfoWindow_ID)"
+					+" WHERE m.AD_InfoWindow_ID IS NOT NULL"
+					+" AND m.Action = 'I'"
+					+" AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y'"
+					;
+			no = DB.executeUpdate(sql, false, get_TrxName());	  	
+			if (log.isLoggable(Level.INFO)) log.info("  rows updated: "+no);
+			trx.commit(true);
+
+			sql="UPDATE	AD_MENU_TRL mt"
+					+" SET Name = (SELECT ft.Name FROM AD_InfoWindow_TRL ft, AD_MENU m"
+					+" WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID"
+					+" AND mt.AD_LANGUAGE=ft.AD_LANGUAGE),"
+					+" Description = (SELECT ft.Description FROM AD_InfoWindow_TRL ft, AD_MENU m"
+					+" WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID"
+					+" AND mt.AD_LANGUAGE=ft.AD_LANGUAGE),"
+					+" IsTranslated = (SELECT ft.IsTranslated FROM AD_InfoWindow_TRL ft, AD_MENU m"
+					+" WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID"
+					+" AND mt.AD_LANGUAGE=ft.AD_LANGUAGE)"
+					+" WHERE EXISTS (SELECT 1 FROM AD_InfoWindow_TRL ft, AD_MENU m"
+					+" WHERE mt.AD_Menu_ID=m.AD_Menu_ID AND m.AD_InfoWindow_ID=ft.AD_InfoWindow_ID"
+					+" AND mt.AD_LANGUAGE=ft.AD_LANGUAGE"
+					+" AND m.AD_InfoWindow_ID IS NOT NULL"
+					+" AND m.Action = 'I'"
+					+" AND m.IsCentrallyMaintained='Y' AND m.IsActive='Y'"
+					+")";
+			no = DB.executeUpdate(sql, false, get_TrxName());	  	
+			if (log.isLoggable(Level.INFO)) log.info("  rows updated: "+no);
+			trx.commit(true);
+
 			//  Column Name + Element
 			sql="UPDATE AD_COLUMN_TRL ct"
 				+" SET Name = (SELECT e.Name"
diff --git a/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java b/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
index 08a4f0f8f4..a0714f2884 100644
--- a/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
+++ b/org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
@@ -300,19 +300,6 @@ public class UUIDGenerator extends SvrProcess {
 				}
 			}
 
-			if (no != -1)
-			{
-				StringBuilder indexName = new StringBuilder().append(column.getColumnName()).append("_idx");
-				if (indexName.length() > 30) {
-					int i = indexName.length() - 31;
-					indexName = new StringBuilder().append(column.getColumnName().substring(0, column.getColumnName().length() - i));
-					indexName.append("_uu_idx");
-				}
-				StringBuilder indexSql = new StringBuilder("CREATE UNIQUE INDEX ").append(indexName).append(" ON ").append(tableName)
-					.append("(").append(column.getColumnName()).append(")");
-				DB.executeUpdateEx(indexSql.toString(), null);
-			}
-
 			if (no == -1)
 			{
 				StringBuilder msg = new StringBuilder("@Error@ ");
diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java
index 325b9010f8..769be5cb51 100644
--- a/org.adempiere.base/src/org/compiere/model/MColumn.java
+++ b/org.adempiere.base/src/org/compiere/model/MColumn.java
@@ -543,7 +543,17 @@ public class MColumn extends X_AD_Column
 				+ " FOREIGN KEY (" + getColumnName() + ") REFERENCES "
 				+ AD_Table(AD_Table_ID) ON DELETE CASCADE
 		**/
-		
+		// IDEMPIERE-965
+		if (getColumnName().equals(PO.getUUIDColumnName(tableName))) {
+			StringBuilder indexName = new StringBuilder().append(getColumnName()).append("_idx");
+			if (indexName.length() > 30) {
+				int i = indexName.length() - 31;
+				indexName = new StringBuilder().append(getColumnName().substring(0, getColumnName().length() - i));
+				indexName.append("_uu_idx");
+			}
+			StringBuilder msgreturn = new StringBuilder("CONSTRAINT ").append(indexName).append(" UNIQUE (").append(getColumnName()).append(")");
+			return msgreturn.toString();
+		}
 		return "";
 	}	//	getConstraint
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MForm.java b/org.adempiere.base/src/org/compiere/model/MForm.java
index c685b7489b..ab74fe5df5 100644
--- a/org.adempiere.base/src/org/compiere/model/MForm.java
+++ b/org.adempiere.base/src/org/compiere/model/MForm.java
@@ -72,6 +72,20 @@ public class MForm extends X_AD_Form
 			MFormAccess pa = new MFormAccess(this, AD_Role_ID);
 			pa.saveEx();
 		}
+		//	Menu
+		else if (is_ValueChanged("IsActive") || is_ValueChanged("Name") 
+			|| is_ValueChanged("Description"))
+		{
+			MMenu[] menues = MMenu.get(getCtx(), "AD_Form_ID=" + getAD_Form_ID(), get_TrxName());
+			for (int i = 0; i < menues.length; i++)
+			{
+				menues[i].setName(getName());
+				menues[i].setDescription(getDescription());
+				menues[i].setIsActive(isActive());
+				menues[i].saveEx();
+			}
+			//
+		}
 		return success;
 	}	//	afterSave
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MInfoWindow.java b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
index 9d73720a53..6b7c9b7570 100644
--- a/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
+++ b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java
@@ -34,7 +34,7 @@ public class MInfoWindow extends X_AD_InfoWindow
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 4040291733093824436L;
+	private static final long serialVersionUID = -8062633099053363108L;
 
 	/**
 	 * 	Standard Constructor
@@ -130,7 +130,7 @@ public class MInfoWindow extends X_AD_InfoWindow
 
 	@Override
 	protected boolean afterSave(boolean newRecord, boolean success) {
-		if (newRecord && success)	//	Add to all automatic roles
+		if (newRecord)	//	Add to all automatic roles
 		{
 			MRole[] roles = MRole.getOf(getCtx(), "IsManual='N'");
 			for (int i = 0; i < roles.length; i++)
@@ -139,6 +139,20 @@ public class MInfoWindow extends X_AD_InfoWindow
 				wa.saveEx();
 			}
 		}
+		//	Menu
+		else if (is_ValueChanged("IsActive") || is_ValueChanged("Name") 
+			|| is_ValueChanged("Description"))
+		{
+			MMenu[] menues = MMenu.get(getCtx(), "AD_InfoWindow_ID=" + getAD_InfoWindow_ID(), get_TrxName());
+			for (int i = 0; i < menues.length; i++)
+			{
+				menues[i].setName(getName());
+				menues[i].setDescription(getDescription());
+				menues[i].setIsActive(isActive());
+				menues[i].saveEx();
+			}
+			//
+		}
 		return super.afterSave(newRecord, success);
 	}
 	
diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java
index 1be6a7be87..c762d01750 100644
--- a/org.adempiere.base/src/org/compiere/model/MInvoice.java
+++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java
@@ -66,7 +66,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 6821562060687417857L;
+	private static final long serialVersionUID = -1223767990636657474L;
 
 	/**
 	 * 	Get Payments Of BPartner
@@ -1132,11 +1132,11 @@ public class MInvoice extends X_C_Invoice implements DocAction
 	 * 	Test Allocation (and set paid flag)
 	 *	@return true if updated
 	 */
-	public boolean testAllocation()
+	public boolean testAllocation(boolean beingCompleted)
 	{
 		boolean change = false;
 
-		if ( isProcessed() ) {
+		if ( isProcessed() || beingCompleted) {
 			BigDecimal alloc = getAllocatedAmt();	//	absolute
 			if (alloc == null)
 				alloc = Env.ZERO;
@@ -1156,6 +1156,10 @@ public class MInvoice extends X_C_Invoice implements DocAction
 		return change;
 	}	//	testAllocation
 
+	public boolean testAllocation() {
+		return testAllocation(false);
+	}
+
 	/**
 	 * 	Set Paid Flag for invoices
 	 * 	@param ctx context
@@ -1386,13 +1390,13 @@ public class MInvoice extends X_C_Invoice implements DocAction
 			m_processMsg = "@NoLines@";
 			return DocAction.STATUS_Invalid;
 		}
-		//	No Cash Book
-		if (PAYMENTRULE_Cash.equals(getPaymentRule())
-			&& MCashBook.get(getCtx(), getAD_Org_ID(), getC_Currency_ID()) == null)
-		{
-			m_processMsg = "@NoCashBook@";
-			return DocAction.STATUS_Invalid;
-		}
+		//	No Cash Book // deprecated with IDEMPIERE-170 Complete Cash as Payment functionality 
+//		if (PAYMENTRULE_Cash.equals(getPaymentRule())
+//			&& MCashBook.get(getCtx(), getAD_Org_ID(), getC_Currency_ID()) == null)
+//		{
+//			m_processMsg = "@NoCashBook@";
+//			return DocAction.STATUS_Invalid;
+//		}
 
 		//	Convert/Check DocType
 		if (getC_DocType_ID() != getC_DocTypeTarget_ID() )
@@ -1733,10 +1737,16 @@ public class MInvoice extends X_C_Invoice implements DocAction
 				m_processMsg = "@NoAccountOrgCurrency@";
 				return DocAction.STATUS_Invalid;
 			}
-
-			MDocType[] doctypes = MDocType.getOfDocBaseType(getCtx(), MDocType.DOCBASETYPE_ARReceipt);
+			
+			String docBaseType = "";
+			if (isSOTrx())
+				docBaseType=MDocType.DOCBASETYPE_ARReceipt;
+			else
+				docBaseType=MDocType.DOCBASETYPE_APPayment;
+			
+			MDocType[] doctypes = MDocType.getOfDocBaseType(getCtx(), docBaseType);
 			if (doctypes == null || doctypes.length == 0) {
-				m_processMsg = "No document type for AR Receipt";
+				m_processMsg = "No document type ";
 				return DocAction.STATUS_Invalid;
 			}
 			MDocType doctype = null;
@@ -1767,7 +1777,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
 
 			payment.setDocAction(MPayment.DOCACTION_Complete);
 			if (!payment.processIt(MPayment.DOCACTION_Complete)) {
-				m_processMsg = "Cannot Complete the Payment :" + payment;
+				m_processMsg = "Cannot Complete the Payment : [" + payment.getProcessMsg() + "] " + payment;
 				return DocAction.STATUS_Invalid;
 			}
 
@@ -2074,6 +2084,11 @@ public class MInvoice extends X_C_Invoice implements DocAction
 			}
 		}
 
+		if (PAYMENTRULE_Cash.equals(getPaymentRule())) {
+			if (testAllocation(true)) {
+				saveEx();
+			}
+		}
 		//	User Validation
 		String valid = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_COMPLETE);
 		if (valid != null)
diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java
index cd804f57c9..e71c3fcf75 100644
--- a/org.adempiere.base/src/org/compiere/model/MOrder.java
+++ b/org.adempiere.base/src/org/compiere/model/MOrder.java
@@ -2290,11 +2290,6 @@ public class MOrder extends X_C_Order implements DocAction
 		// end added
 		invoice.saveEx(get_TrxName());
 		setC_CashLine_ID(invoice.getC_CashLine_ID());
-		if (PAYMENTRULE_Cash.equals(invoice.getPaymentRule()) && getC_POS_ID() == 0) {
-			if (invoice.testAllocation()) {
-				invoice.saveEx();
-			}
-		}
 		if (!DOCSTATUS_Completed.equals(invoice.getDocStatus()))
 		{
 			m_processMsg = "@C_Invoice_ID@: " + invoice.getProcessMsg();
diff --git a/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
index 9386417a2c..803d0a6408 100644
--- a/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
+++ b/org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
@@ -108,9 +108,9 @@ public final class MPaySelectionCheck extends X_C_PaySelectionCheck
 			PaymentRule = PAYMENTRULE_DirectDebit;
 		else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_DirectDeposit))
 			PaymentRule = PAYMENTRULE_DirectDeposit;
-	//	else if (payment.getTenderType().equals(MPayment.TENDERTYPE_Check))
-	//		PaymentRule = MPaySelectionCheck.PAYMENTRULE_Check;
-		
+		else if (payment.getTenderType().equals(X_C_Payment.TENDERTYPE_Cash))
+			PaymentRule = PAYMENTRULE_Cash;
+
 		//	Create new PaySelection
 		MPaySelection ps = new MPaySelection(ctx, 0, trxName);
 		ps.setAD_Org_ID(payment.getAD_Org_ID());
diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java
index 8474d4d83c..e97e24ccb2 100644
--- a/org.adempiere.base/src/org/compiere/model/MPayment.java
+++ b/org.adempiere.base/src/org/compiere/model/MPayment.java
@@ -1459,7 +1459,7 @@ public final class MPayment extends X_C_Payment
 		{
 			String sql = "SELECT idt.IsSOTrx "
 				+ "FROM C_Invoice i"
-				+ " INNER JOIN C_DocType idt ON (i.C_DocType_ID=idt.C_DocType_ID) "
+				+ " INNER JOIN C_DocType idt ON (CASE WHEN i.C_DocType_ID=0 THEN i.C_DocTypeTarget_ID ELSE i.C_DocType_ID END=idt.C_DocType_ID) "
 				+ "WHERE i.C_Invoice_ID=?";
 			PreparedStatement pstmt = null;
 			ResultSet rs = null;
diff --git a/org.adempiere.base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
index 7e9ba4d630..f52cb31bb4 100644
--- a/org.adempiere.base/src/org/compiere/model/MSysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
@@ -42,7 +42,7 @@ public class MSysConfig extends X_AD_SysConfig
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3368661022903012786L;
+	private static final long serialVersionUID = 1880114058462268002L;
 
 	public final static String PDF_FONT_DIR = "PDF_FONT_DIR";
 	public final static String TWOPACK_HANDLE_TRANSLATIONS = "2PACK_HANDLE_TRANSLATIONS";
@@ -117,6 +117,7 @@ public class MSysConfig extends X_AD_SysConfig
 	public static final String DOCACTIONBUTTON_SHOWACTIONNAME = "DOCACTIONBUTTON_SHOWACTIONNAME";
 	public static final String ZK_MAX_UPLOAD_SIZE = "ZK_MAX_UPLOAD_SIZE";
 	public static final String CALENDAR_ALTERNATE_TIMEZONE = "CALENDAR_ALTERNATE_TIMEZONE";
+	public static final String ZK_REPORT_JASPER_OUTPUT_TYPE = "ZK_REPORT_JASPER_OUTPUT_TYPE";
 
 	/**
 	 * 	Standard Constructor
diff --git a/org.adempiere.base/src/org/compiere/model/MTable.java b/org.adempiere.base/src/org/compiere/model/MTable.java
index c14d0b7f5c..ed8563babc 100644
--- a/org.adempiere.base/src/org/compiere/model/MTable.java
+++ b/org.adempiere.base/src/org/compiere/model/MTable.java
@@ -55,7 +55,7 @@ public class MTable extends X_AD_Table
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -8904670462021706436L;
+	private static final long serialVersionUID = 3743087295968040894L;
 
 	public final static int MAX_OFFICIAL_ID = 999999;
 
@@ -335,6 +335,27 @@ public class MTable extends X_AD_Table
 		retValue = list.toArray(retValue);
 		return retValue;
 	}	//	getKeyColumns
+	
+	/**
+	 * 	Get Identifier Columns of Table
+	 *	@return Identifier columns
+	 */
+	public String[] getIdentifierColumns()
+	{
+		getColumns(false);
+		ArrayList<String> list = new ArrayList<String>();
+		//
+		for (int i = 0; i < m_columns.length; i++)
+		{
+			MColumn column = m_columns[i];
+			if (column.isIdentifier())
+				list.add(column.getColumnName());
+		}
+		String[] retValue = new String[list.size()];
+		retValue = list.toArray(retValue);
+		return retValue;
+	}	//	getIdentifierColumns
+
 
 	/**************************************************************************
 	 * 	Get PO Class Instance
diff --git a/org.adempiere.base/src/org/compiere/model/MTask.java b/org.adempiere.base/src/org/compiere/model/MTask.java
index 81c42f4697..e687b84b87 100644
--- a/org.adempiere.base/src/org/compiere/model/MTask.java
+++ b/org.adempiere.base/src/org/compiere/model/MTask.java
@@ -35,7 +35,7 @@ public class MTask extends X_AD_Task
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -3798377076931060582L;
+	private static final long serialVersionUID = 5286481246615520755L;
 
 	/**
 	 * 	Standard Constructor
@@ -143,5 +143,34 @@ public class MTask extends X_AD_Task
 			.append ("]");
 		return sb.toString ();
 	}	//	toString
-	
+
+	/**
+	 *  After Save.
+	 *  @param newRecord new record
+	 *  @param success success
+	 *  @return true if save complete (if not overwritten true)
+	 */
+	protected boolean afterSave (boolean newRecord, boolean success)
+	{
+		if (log.isLoggable(Level.FINE)) log.fine("Success=" + success);
+		if (! newRecord)
+		{
+			//	Menu/Workflow
+			if (is_ValueChanged("IsActive") || is_ValueChanged("Name") 
+				|| is_ValueChanged("Description"))
+			{
+				MMenu[] menues = MMenu.get(getCtx(), "AD_Task_ID=" + getAD_Task_ID(), get_TrxName());
+				for (int i = 0; i < menues.length; i++)
+				{
+					menues[i].setIsActive(isActive());
+					menues[i].setName(getName());
+					menues[i].setDescription(getDescription());
+					menues[i].saveEx();
+				}
+			}
+		}
+
+		return success;
+	}   //  afterSave
+
 }	//	MTask
diff --git a/org.adempiere.base/src/org/compiere/model/MUserDefField.java b/org.adempiere.base/src/org/compiere/model/MUserDefField.java
index 6b30e29138..782f8e26e7 100644
--- a/org.adempiere.base/src/org/compiere/model/MUserDefField.java
+++ b/org.adempiere.base/src/org/compiere/model/MUserDefField.java
@@ -14,12 +14,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Properties;
 import java.util.logging.Level;
 
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
+import org.compiere.util.Msg;
 
 
 /**
@@ -32,8 +35,7 @@ public class MUserDefField extends X_AD_UserDef_Field
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 20120403114400L;
-
+	private static final long serialVersionUID = 2522038599257589829L;
 
 	/**
 	 * 	Standard constructor.
@@ -116,5 +118,23 @@ public class MUserDefField extends X_AD_UserDef_Field
 
 		return retValue;
 	}
+	
+	/**
+	 * 	Before Save
+	 *	@param newRecord new
+	 *	@return true
+	 */
+	protected boolean beforeSave (boolean newRecord)
+	{
+		if (is_ValueChanged("AD_Reference_ID")) {
+			MField field = new MField(getCtx(), getAD_Field_ID(), get_TrxName());
+			MColumn column = (MColumn) field.getAD_Column();
+			if (column.isEncrypted() || field.isEncrypted() || field.getObscureType() != null) {
+				log.saveError("Error", Msg.getMsg(getCtx(), "NotChangeReference"));
+				return false;
+			}
+		}
+		return true;
+	}
 		
-}	//	MyModelExample
+}	//	MUserDefField
diff --git a/org.adempiere.base/src/org/compiere/report/FinReport.java b/org.adempiere.base/src/org/compiere/report/FinReport.java
index 272ca234e9..7dc87371da 100644
--- a/org.adempiere.base/src/org/compiere/report/FinReport.java
+++ b/org.adempiere.base/src/org/compiere/report/FinReport.java
@@ -1252,7 +1252,7 @@ public class FinReport extends SvrProcess
 		if (m_lines[line] == null || m_lines[line].getSources().length == 0)
 			return;
 		String variable = m_lines[line].getSourceColumnName();
-		if (variable == null)
+		if (variable == null || variable.equals("") )
 			return;
 		if (log.isLoggable(Level.FINE)) log.fine("Variable=" + variable);
 
diff --git a/org.adempiere.base/src/org/compiere/wf/MWorkflow.java b/org.adempiere.base/src/org/compiere/wf/MWorkflow.java
index 24bdc4fa9d..f8c20b4b20 100644
--- a/org.adempiere.base/src/org/compiere/wf/MWorkflow.java
+++ b/org.adempiere.base/src/org/compiere/wf/MWorkflow.java
@@ -55,8 +55,7 @@ public class MWorkflow extends X_AD_Workflow
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 4925514638954671534L;
-
+	private static final long serialVersionUID = 1905448790453650036L;
 
 	/**
 	 * 	Get Workflow from Cache
@@ -637,7 +636,7 @@ public class MWorkflow extends X_AD_Workflow
 		}
 		//	Menu/Workflow
 		else if (is_ValueChanged("IsActive") || is_ValueChanged(COLUMNNAME_Name) 
-			|| is_ValueChanged(COLUMNNAME_Description) || is_ValueChanged(COLUMNNAME_Help))
+			|| is_ValueChanged(COLUMNNAME_Description))
 		{
 			MMenu[] menues = MMenu.get(getCtx(), "AD_Workflow_ID=" + getAD_Workflow_ID(), get_TrxName());
 			for (int i = 0; i < menues.length; i++)
@@ -647,26 +646,6 @@ public class MWorkflow extends X_AD_Workflow
 				menues[i].setDescription(getDescription());
 				menues[i].saveEx();
 			}
-// TODO: teo_sarca: why do we need to sync node name with workflow name? - see BF 2665963
-//			X_AD_WF_Node[] nodes = MWindow.getWFNodes(getCtx(), "AD_Workflow_ID=" + getAD_Workflow_ID(), get_TrxName());
-//			for (int i = 0; i < nodes.length; i++)
-//			{
-//				boolean changed = false;
-//				if (nodes[i].isActive() != isActive())
-//				{
-//					nodes[i].setIsActive(isActive());
-//					changed = true;
-//				}
-//				if (nodes[i].isCentrallyMaintained())
-//				{
-//					nodes[i].setName(getName());
-//					nodes[i].setDescription(getDescription());
-//					nodes[i].setHelp(getHelp());
-//					changed = true;
-//				}
-//				if (changed)
-//					nodes[i].saveEx();
-//			}
 		}
 
 		return success;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
index 50913be80f..78cf925f4e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java
@@ -1232,14 +1232,16 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
 				if (ti.getPage() == null) {
 					Events.echoEvent(ON_DEFER_SET_SELECTED_NODE, this, null);
 				}
-				
+
 				boolean changed = false;
-				String name = (String) gridTab.getValue("Name");
-				if (name != null && !name.equals(data.getName())) {
-					data.setName(name);
-					changed = true;
-				}				
-				
+				if (Env.isBaseLanguage(Env.getCtx(), "AD_Menu")) {
+					String name = (String) gridTab.getValue("Name");
+					if (name != null && !name.equals(data.getName())) {
+						data.setName(name);
+						changed = true;
+					}				
+				}
+
 				Boolean summary = (Boolean) gridTab.getValue("IsSummary");
 				if (summary != null && !summary.booleanValue() == data.isSummary()) {
 					data.setSummary(summary);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java
index 28e207260e..b9d64b9dc7 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ProcessButtonPopup.java
@@ -27,6 +27,7 @@ public class ProcessButtonPopup extends Window {
 		setBorder("normal");
 		
 		Vbox vbox = new Vbox();
+		vbox.setHflex("true");
 		appendChild(vbox);
 		vbox.setSclass("toolbar-popup-window-cnt");
 		vbox.setAlign("stretch");
@@ -35,6 +36,7 @@ public class ProcessButtonPopup extends Window {
 			if (button.getPage() != null) {
 				button.detach();
 			}
+			button.setHflex("1");
 			vbox.appendChild(button);
 		}
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
index c27ce6f787..7ea413b0a6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessModalDialog.java
@@ -511,6 +511,8 @@ public class ProcessModalDialog extends Window implements EventListener<Event>,
 			try {
 				if (log.isLoggable(Level.INFO))log.log(Level.INFO, "Process Info="+m_pi+" AD_Client_ID="+Env.getAD_Client_ID(Env.getCtx()));
 				WProcessCtl.process(ProcessModalDialog.this, m_WindowNo, parameterPanel, m_pi, null);
+			} catch (Exception ex) {
+				FDialog.error(m_WindowNo, ex.getLocalizedMessage());
 			} finally {
 				Executions.schedule(getDesktop(), ProcessModalDialog.this, new Event(ON_COMPLETE, ProcessModalDialog.this, null));
 			}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
index d091df1011..10c8ae394a 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFileImport.java
@@ -454,8 +454,12 @@ public class WFileImport extends ADForm implements EventListener<Event>
 		
 		String formatName = (String)listitem.getLabel();
 		
-		if (formatName.equals(s_none))
+		if (formatName.equals(s_none)) {
+			confirmPanel.getButton("Ok").setEnabled(false);
+			m_format=null;
 			return;
+		}
+			
 
 		int formatId = (Integer)listitem.getValue();
 		m_format = ImpFormat.load (formatId);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
index e26bec1d38..f542c5ee05 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
@@ -383,7 +383,8 @@ public class WGenForm extends ADForm implements EventListener<Event>, WTableMode
 		if (log.isLoggable(Level.CONFIG)) log.config("PrintItems=" + ids.length);
 		
 		m_ids = ids;
-		Clients.response(new AuEcho(this, "onAfterProcess", null));
+		if (!genForm.getProcessInfo().isError())
+			Clients.response(new AuEcho(this, "onAfterProcess", null));
 		
 	}   //  generateShipments_complete
 	
@@ -559,7 +560,7 @@ public class WGenForm extends ADForm implements EventListener<Event>, WTableMode
 				tr.appendChild(td);
 			}
 			
-			if (msgPresents) {
+			if (msgPresents && !genForm.getProcessInfo().isError()) {
 				Td td = new Td();
 				if (log.getP_Msg() != null) {
 					if (log.getAD_Table_ID() > 0 && log.getRecord_ID() > 0) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java
index c48fb34e89..0446cb4d21 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/AutoComplete.java
@@ -36,7 +36,7 @@ public class AutoComplete extends Combobox
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2642639623099513816L;
+	private static final long serialVersionUID = -6440285742490532737L;
 
 	/** comboItems	All menu labels	 */
 	private String[] comboItems;
@@ -46,6 +46,8 @@ public class AutoComplete extends Combobox
 	
 	private String[] images;
 
+	private String[] contents;
+
 	/**
 	 * Set menu labels
 	 * 
@@ -73,6 +75,17 @@ public class AutoComplete extends Combobox
 		strDescription = vals;
 	}
 	
+	/**
+	 * Set content of menu items
+	 * 
+	 * @param vals	Content of menu items
+	 */
+	
+	public void setContents(String[] vals)
+	{
+		contents = vals;
+	}
+
 	public void setImages(String[] images)
 	{
 		this.images = images;
@@ -151,10 +164,15 @@ public class AutoComplete extends Combobox
 
 				comboitem.setLabel(comboItems[i]);
 				comboitem.setDescription(strDescription[i]);
+
 				if (images != null && i < images.length && images[i] != null && images[i].trim().length() > 0)
 				{
 					comboitem.setImage(images[i]);
 				}
+				if (contents != null && i < contents.length && contents[i] != null && contents[i].trim().length() > 0)
+				{
+					comboitem.setContent(contents[i]);
+				}
 			}
 		}
 		while (it != null && it.hasNext()) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
index d3f57e0549..0162d0dd82 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/NumberBox.java
@@ -355,6 +355,7 @@ public class NumberBox extends Div
         vbox.appendChild(row4);
 
         popup.appendChild(vbox);
+        popup.setWidgetListener("onOpen", "calc.clearAll('" + txtCalcId + "')");
         return popup;
     }
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
index 713409957e..abcd8a7703 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/RequestWindow.java
@@ -75,6 +75,7 @@ public class RequestWindow extends Window implements EventListener<Event> {
 	private ConfirmPanel confirmPanel;
 	
 	private Window parent;
+	private Calendar calBegin,calEnd;
 	
 	public RequestWindow(CalendarsEvent ce, Window parent) {
 		
@@ -282,7 +283,7 @@ public class RequestWindow extends Window implements EventListener<Event> {
 				throw new WrongValueException(entryConfidentialField.getComponent(), fillMandatory);
 			if (dbxStartPlan.getValue().compareTo(dbxCompletePlan.getValue()) > 0) 
 				throw new WrongValueException(dbxCompletePlan, Msg.translate(Env.getCtx(), "DateCompletePlan"));	
-			if (checkTime() && (dbxStartPlan.getValue().compareTo(dbxCompletePlan.getValue()) == 0)) 
+			if (checkTime()) 
 				throw new WrongValueException(tbxStartTime, Msg.translate(Env.getCtx(), "CheckTime"));	
 					
 			MRequest request = new MRequest(Env.getCtx(), 0, null);
@@ -294,10 +295,10 @@ public class RequestWindow extends Window implements EventListener<Event> {
 			request.setConfidentialType((String) confidentialField.getValue());
 			request.setSalesRep_ID((Integer) salesRepField.getValue());
 			request.setConfidentialTypeEntry((String) entryConfidentialField.getValue());
-			request.setDateStartPlan(new Timestamp(dbxStartPlan.getValue().getTime()));
-			request.setDateCompletePlan(new Timestamp(dbxCompletePlan.getValue().getTime()));
-			request.setStartTime(new Timestamp(tbxStartTime.getValue().getTime()));
-			request.setEndTime(new Timestamp(tbxEndTime.getValue().getTime()));
+			request.setDateStartPlan(new Timestamp(calBegin.getTimeInMillis()));
+			request.setDateCompletePlan(new Timestamp(calEnd.getTimeInMillis()));
+			request.setStartTime(new Timestamp(calBegin.getTimeInMillis()));
+			request.setEndTime(new Timestamp(calEnd.getTimeInMillis()));
 			
 			if (request.save())
 			{
@@ -320,13 +321,28 @@ public class RequestWindow extends Window implements EventListener<Event> {
 	//Check, Start time is not  >=  End time, when Start Plan == Complete Plan
 	private boolean checkTime()
 	{
-		Calendar cal =Calendar.getInstance();
-		cal.setTimeInMillis(tbxStartTime.getValue().getTime());		
+		calBegin = Calendar.getInstance();
+		calBegin.setTime(dbxStartPlan.getValue());
+		Calendar cal1 = Calendar.getInstance();
+		cal1.setTimeInMillis(tbxStartTime.getValue().getTime());
+		calBegin.set(Calendar.HOUR_OF_DAY, cal1.get(Calendar.HOUR_OF_DAY));
+		calBegin.set(Calendar.MINUTE, cal1.get(Calendar.MINUTE));
+		calBegin.set(Calendar.SECOND, 0);
+		calBegin.set(Calendar.MILLISECOND, 0);
+		
+		calEnd = Calendar.getInstance();
+		calEnd.setTime(dbxCompletePlan.getValue());
 		Calendar cal2 = Calendar.getInstance();
-		cal2.setTimeInMillis(tbxEndTime.getValue().getTime());		
-		if ((cal.get(Calendar.HOUR_OF_DAY) >= cal2.get(Calendar.HOUR_OF_DAY)))
-			return true;		
-		else
+		cal2.setTimeInMillis(tbxEndTime.getValue().getTime());
+		calEnd.set(Calendar.HOUR_OF_DAY, cal2.get(Calendar.HOUR_OF_DAY));
+		calEnd.set(Calendar.MINUTE, cal2.get(Calendar.MINUTE));
+		calEnd.set(Calendar.SECOND, 0);
+		calEnd.set(Calendar.MILLISECOND, 0);
+
+		if ((cal1.get(Calendar.HOUR_OF_DAY) >= cal2.get(Calendar.HOUR_OF_DAY)) && (dbxStartPlan.getValue().compareTo(dbxCompletePlan.getValue()) == 0)) {
+			return true;
+		} else {
 			return false;
+		}	
 	}
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
index 42852e99e6..e79384a71d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
@@ -117,7 +117,10 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
         }
         else
         {
-        	String trxName = this.gridField.getGridTab().getTableModel().get_TrxName(); 
+        	String trxName = null; // could be null if called from a form
+        	if (this.gridField != null)
+        		trxName = this.gridField.getGridTab().getTableModel().get_TrxName();
+
             m_value = m_Location.getLocation(value, trxName);
             if (m_value == null)
                 getComponent().setText("<" + value + ">");
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
index cd213fe197..17039b22c1 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java
@@ -170,7 +170,7 @@ public class WNumberEditor extends WEditor implements ContextMenuListener
 	        
 	        ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue);
 	        super.fireValueChange(changeEvent);
-	        oldValue = newValue;
+	        oldValue = getComponent().getValue(); // IDEMPIERE-963 - check again the value could be changed by callout
     	}
     }
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
index 3fcd4a7d87..22deb99f3b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
@@ -172,7 +172,7 @@ public class WStringEditor extends WEditor implements ContextMenuListener
 	        }
 	        ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue);
 	        super.fireValueChange(changeEvent);
-	        oldValue = newValue;
+	        oldValue = getComponent().getValue(); // IDEMPIERE-963 - check again the value could be changed by callout
     	}
     }
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
index 50e92b6523..3d2ad55fd4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WQuickEntry.java
@@ -345,7 +345,7 @@ public class WQuickEntry extends Window implements EventListener<Event>, ValueCh
 
 				boolean changed = (value != null && initialValue == null)
 						|| (value == null && initialValue != null)
-						|| (value != null && initialValue != null && value != initialValue);
+						|| (value != null && initialValue != null && !value.equals(initialValue));
 		
 				boolean thisMandatoryError = false;
 				if (field.isMandatory(true)) {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
index b05d61dafd..fe9d84a848 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoGeneralPanel.java
@@ -37,6 +37,7 @@ import org.adempiere.webui.window.FDialog;
 import org.compiere.minigrid.ColumnInfo;
 import org.compiere.minigrid.IDColumn;
 import org.compiere.model.I_C_ElementValue;
+import org.compiere.model.MTable;
 import org.compiere.util.DB;
 import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
@@ -120,17 +121,22 @@ public class InfoGeneralPanel extends InfoPanel implements EventListener<Event>
 
 		if (queryValue != null && queryValue.length() > 0)
         {
-			String separator = I_C_ElementValue.Table_Name.equalsIgnoreCase(p_tableName) ? "-" : "_";
-			if (txt2.isVisible())
+			MTable table = MTable.get(Env.getCtx(), p_tableName);
+			if (table.getIdentifierColumns().length > 1) 
 			{
-				String[] values = queryValue.split("["+separator+"]");
-				if (values != null && values.length == 2) 
+				String separator = I_C_ElementValue.Table_Name.equalsIgnoreCase(p_tableName) ? "-" : "_";
+				if (txt2.isVisible())
 				{
-					txt1.setValue(values[0]);
-					txt2.setValue(values[1]);
+					String[] values = queryValue.split("["+separator+"]");
+					if (values != null && values.length == 2) 
+					{
+						txt1.setValue(values[0]);
+						txt2.setValue(values[1]);
+					}
 				}
-			}
 
+			}			
+			
             executeQuery();
             renderItems();
         }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
index 42f7d848df..ddb1886a67 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
@@ -488,22 +488,26 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 				{
 					String display = rs.getString(colIndex);
 					int key = rs.getInt(colIndex+1);
-	                value = new KeyNamePair(key, display);
+					if (! rs.wasNull()) {
+		                value = new KeyNamePair(key, display);
+					}
 	
 					colOffset++;
 				}
 				else
 				{
 					int key = rs.getInt(colIndex);
-					WEditor editor = editorMap.get(p_layout[col].getColSQL());
-					if (editor != null)
-					{
-						editor.setValue(key);
-						value = new KeyNamePair(key, editor.getDisplayTextForGridView(key));
-					}					
-					else
-					{
-						value = new KeyNamePair(key, Integer.toString(key));
+					if (! rs.wasNull()) {
+						WEditor editor = editorMap.get(p_layout[col].getColSQL());
+						if (editor != null)
+						{
+							editor.setValue(key);
+							value = new KeyNamePair(key, editor.getDisplayTextForGridView(key));
+						}					
+						else
+						{
+							value = new KeyNamePair(key, Integer.toString(key));
+						}
 					}
 				}
 			}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java
index 0fec6fd65e..98a52a54a6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuTreeSearchPanel.java
@@ -41,11 +41,11 @@ import org.zkoss.zul.Treeitem;
  *
  */
 public class MenuTreeSearchPanel extends TreeSearchPanel {
-
 	/**
-	 * generated serial id
+	 * 
 	 */
-	private static final long serialVersionUID = 8785295166415073971L;
+	private static final long serialVersionUID = 3127547233019932429L;
+
 	protected Toolbarbutton newBtn;
 	protected Toolbarbutton openBtn;
 	protected boolean isNew = false;
@@ -143,6 +143,7 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
 		List<String> valueList = new ArrayList<String>();
 		List<String> descriptionList = new ArrayList<String>();
 		List<String> imageList = new ArrayList<String>();
+		List<String> typeList = new ArrayList<String>();
 
         for (Object value : treeNodeItemMap.values())
         {        	
@@ -160,6 +161,7 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
         		
         		valueList.add(getLabel(treeItem));
         		descriptionList.add(treeItem.getTooltiptext());
+        		typeList.add(String.valueOf(treeItem.getAttribute("menu.type")));
         		String image = getImage(treeItem);
         		if (image == null || image.length() == 0)
         		{
@@ -189,10 +191,13 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
         treeDescription = descriptionList.toArray(new String[0]);
         treeValues = valueList.toArray(new String[0]);
         treeImages = imageList.toArray(new String[0]);
-        
+        treeTypes = typeList.toArray(new String[0]);               
+        orderArrays();
+
         cmbSearch.setDescription(treeDescription);
         cmbSearch.setDict(treeValues);
         cmbSearch.setImages(treeImages);
+        cmbSearch.setContents(treeTypes);
         cmbSearch.refresh("");
 	}
 	
@@ -216,4 +221,33 @@ public class MenuTreeSearchPanel extends TreeSearchPanel {
     	Events.postEvent(event);
     	Events.echoEvent(ON_POST_FIRE_TREE_EVENT, this, null);
     }
+
+	protected void orderArrays()
+	{
+		String aux;
+		for (int i = 1; i < treeValues.length; i++)
+		{
+			for (int j = 0; j < treeValues.length-i; j++)
+			{
+				if (treeValues[j].compareTo(treeValues[j+1]) > 0)
+				{
+					aux = treeValues[j];
+					treeValues[j] = treeValues[j+1];
+					treeValues[j+1]=aux;
+
+					aux = treeDescription[j];
+					treeDescription[j] = treeDescription[j+1];
+					treeDescription[j+1]=aux;
+
+					aux = treeTypes[j];
+					treeTypes[j] = treeTypes[j+1];
+					treeTypes[j+1]=aux;
+
+					aux = treeImages[j];
+					treeImages[j] = treeImages[j+1];
+					treeImages[j+1]=aux;
+				}
+			}
+		}
+	}
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
index 70d21e73a0..070f1bdde0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
@@ -63,15 +63,17 @@ import org.zkoss.zul.impl.LabelImageElement;
  */
 public class TreeSearchPanel extends Panel implements EventListener<Event>, TreeDataListener, IdSpace
 {
-	private static final String ON_COMBO_SELECT_ECHO_EVENT = "onComboSelectEcho";
-	private static final String ON_POST_SELECT_TREEITEM_EVENT = "onPostSelectTreeitem";
-	protected static final String ON_POST_FIRE_TREE_EVENT = "onPostFireTreeEvent";
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 3478451169922775667L;
+	private static final long serialVersionUID = -1659100374345282774L;
+
+	private static final String ON_COMBO_SELECT_ECHO_EVENT = "onComboSelectEcho";
+	private static final String ON_POST_SELECT_TREEITEM_EVENT = "onPostSelectTreeitem";
+	protected static final String ON_POST_FIRE_TREE_EVENT = "onPostFireTreeEvent";
 	protected TreeMap<String, Object> treeNodeItemMap = new TreeMap<String, Object>();
     protected String[] treeValues;
+    protected String[] treeTypes;
     protected String[] treeDescription;
     protected String[] treeImages;
 
@@ -176,8 +178,8 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
 
     protected void addTreeItem(Treeitem treeItem)
     {
-        String key = getLabel(treeItem);
-        treeNodeItemMap.put(key, treeItem);
+        StringBuilder key = new StringBuilder(getLabel(treeItem)).append(".").append(treeItem.getAttribute("menu.type"));
+        treeNodeItemMap.put(key.toString(), treeItem);
     }
 
     protected void addTreeItem(DefaultTreeNode<?> node) {
@@ -221,9 +223,9 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
     	treeValues = new String[treeNodeItemMap.size()];
     	treeDescription = new String[treeNodeItemMap.size()];
     	treeImages = new String[treeNodeItemMap.size()];
+    	treeTypes = new String[treeNodeItemMap.size()];
 
     	int i = -1;
-
         for (Object value : treeNodeItemMap.values())
         {
         	i++;
@@ -231,6 +233,7 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         	{
         		Treeitem treeItem = (Treeitem) value;
         		treeValues[i] = getLabel(treeItem);
+        		treeTypes[i]= String.valueOf(treeItem.getAttribute("menu.type")); 
         		treeDescription[i] = treeItem.getTooltiptext();
         		treeImages[i] = getImage(treeItem);
         		if ((treeImages[i] == null || treeImages[i].trim().length() == 0) && isFolder(treeItem))
@@ -267,6 +270,7 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         cmbSearch.setDescription(treeDescription);
         cmbSearch.setDict(treeValues);
         cmbSearch.setImages(treeImages);
+        cmbSearch.setContents(treeTypes);
 	}
 
 	protected boolean isFolder(Treeitem treeItem) {
@@ -354,7 +358,8 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
         			{
         				Comboitem item = (Comboitem) comp;
         				String value = item.getLabel();
-        				selectTreeitem(value);
+        				String type = item.getContent();
+        				selectTreeitem(value+"."+type);
         			}
         		}	        	
         	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
index bf8b4d0b13..9d4b7cca60 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
@@ -88,6 +88,7 @@ public class ReportAction implements EventListener<Event>
 	
 	public void show() 
 	{
+		final boolean isCanExport=MRole.getDefault().isCanExport();
 		if(winReport == null)
 		{
 			winReport = new Window();
@@ -119,10 +120,13 @@ public class ReportAction implements EventListener<Event>
 			
 			chkCurrentRowOnly.setLabel(Msg.getMsg(Env.getCtx(), "CurrentRowOnly"));
 			chkCurrentRowOnly.setSelected(false);
-
-			chkExport.setLabel(Msg.getMsg(Env.getCtx(), "Export"));
-			chkExport.setSelected(false);
-
+			
+			if( isCanExport )
+			{
+				chkExport.setLabel(Msg.getMsg(Env.getCtx(), "Export"));
+				chkExport.setSelected(false);
+		        }
+			
 			chkAllColumns.setLabel(Msg.getMsg(Env.getCtx(), "AllColumns"));
 			chkAllColumns.setSelected(false);
 			li = cboPrintFormat.getSelectedItem();
@@ -151,13 +155,21 @@ public class ReportAction implements EventListener<Event>
 
 			vb.appendChild(chkCurrentRowOnly);
 			
-			hb = new Hbox();
-			hb.setAlign("center");
-			hb.appendChild(chkExport);
-			chkExport.addEventListener(Events.ON_CHECK, this);
-			hb.appendChild(cboExportType);
-			cboExportType.setWidth("100%");
-			vb.appendChild(hb);
+		
+			
+			if ( isCanExport )
+			{
+				hb = new Hbox();
+				hb.setAlign("center");
+				hb.appendChild(chkExport);
+				chkExport.addEventListener(Events.ON_CHECK, this);
+				hb.appendChild(cboExportType);
+				cboExportType.setWidth("100%");
+				vb.appendChild(hb);
+			}
+			
+	
+			
 			
 			vb.appendChild(chkAllColumns);
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
index df7e52ebfe..2efae15810 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java
@@ -1,5 +1,7 @@
 package org.adempiere.webui.window;
 
+import static org.compiere.model.MSysConfig.ZK_REPORT_JASPER_OUTPUT_TYPE;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.logging.Level;
@@ -24,7 +26,10 @@ import org.adempiere.webui.component.Tabpanel;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.panel.ITabOnCloseHandler;
 import org.adempiere.webui.session.SessionManager;
+import org.compiere.model.MRole;
+import org.compiere.model.MSysConfig;
 import org.compiere.util.CLogger;
+import org.compiere.util.Env;
 import org.zkoss.util.media.AMedia;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
@@ -49,6 +54,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 	private Listbox previewType = new Listbox();
 	private Iframe iframe;
 	private AMedia media;
+	private String defaultType;
 	/**	Logger			*/
 	private static CLogger log = CLogger.getCLogger(ZkJRViewer.class);
 	
@@ -64,6 +70,10 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 	}
 	
 	private void init() {
+		final boolean isCanExport=MRole.getDefault().isCanExport();
+		defaultType = MSysConfig.getValue(ZK_REPORT_JASPER_OUTPUT_TYPE, "PDF",
+				Env.getAD_Client_ID(Env.getCtx()), Env.getAD_Org_ID(Env.getCtx()));//It gets default Jasper output type
+
 		Borderlayout layout = new Borderlayout();
 		layout.setStyle("position: absolute; height: 99%; width: 99%");
 		this.appendChild(layout);
@@ -73,10 +83,40 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		toolbar.setHeight("26px");
 
 		previewType.setMold("select");
-		previewType.appendItem("PDF", "PDF");
-		previewType.appendItem("HTML", "HTML");
-		previewType.appendItem("Excel", "XLS");
-		previewType.appendItem("CSV", "CSV");
+		if (isCanExport) {
+			previewType.appendItem("PDF", "PDF");
+			previewType.appendItem("HTML", "HTML");
+			previewType.appendItem("Excel", "XLS");
+			previewType.appendItem("CSV", "CSV");	
+			if ("PDF".equals(defaultType)) {
+				previewType.setSelectedIndex(0);
+			} else if ("HTML".equals(defaultType)) {
+				previewType.setSelectedIndex(1);
+			} else if ("XLS".equals(defaultType)) {
+				previewType.setSelectedIndex(2);
+			} else if ("CSV".equals(defaultType)) {
+				previewType.setSelectedIndex(3);
+			} else {
+				previewType.setSelectedIndex(0);
+				log.info("Format not Valid: "+defaultType);
+			}
+		} else {
+			previewType.appendItem("PDF", "PDF");
+			previewType.appendItem("HTML", "HTML");
+			if ("PDF".equals(defaultType)) {
+				previewType.setSelectedIndex(0);
+			} else if ("HTML".equals(defaultType)) {
+				previewType.setSelectedIndex(1);
+			} else if ("XLS".equals(defaultType)) {
+				previewType.setSelectedIndex(0); // default to PDF if cannot export
+			} else if ("CSV".equals(defaultType)) {
+				previewType.setSelectedIndex(0); // default to PDF if cannot export
+			} else {
+				previewType.setSelectedIndex(0);
+				log.info("Format not Valid: "+defaultType);
+			}
+		}
+
 		toolbar.appendChild(previewType);
 		previewType.addEventListener(Events.ON_SELECT, this);
 		
@@ -112,7 +152,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 				prefix.append(ch);
 			} else {
 				prefix.append("_");
-			}
+			} 
 		}
 		return prefix.toString();
 	}
@@ -129,7 +169,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 
 	private void cmd_render() {
 		try {
-			renderReport();
+			renderReport(); 
 		} catch (Exception e) {
 			throw new AdempiereException("Failed to render report", e);
 		}
@@ -141,11 +181,14 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 	}
 	
 	private void renderReport() throws Exception {
+		String reportType;
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
 		try {			
 			Thread.currentThread().setContextClassLoader(JasperReport.class.getClassLoader());
 			Listitem selected = previewType.getSelectedItem();
-			if (selected == null || "PDF".equals(selected.getValue())) {
+			reportType=selected.getValue();
+			if ( "PDF".equals( reportType ) ) 
+			{
 				String path = System.getProperty("java.io.tmpdir");
 				String prefix = makePrefix(jasperPrint.getName());
 				if (log.isLoggable(Level.FINE))
@@ -162,7 +205,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 				media = new AMedia(getTitle(), "pdf", "application/pdf", file, true);
 							
 				
-			} else if ("HTML".equals(previewType.getSelectedItem().getValue())) {
+			} else if ("HTML".equals(reportType)) {
 				String path = System.getProperty("java.io.tmpdir");
 				String prefix = makePrefix(jasperPrint.getName());
 				if (log.isLoggable(Level.FINE))
@@ -181,7 +224,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 		         exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, request.getContextPath()+"/images/report/");
 		 	     exporter.exportReport();			
 				media = new AMedia(getTitle(), "html", "text/html", file, false);
-			} else if ("XLS".equals(previewType.getSelectedItem().getValue())) {
+			} else if ("XLS".equals(reportType)) {
 				String path = System.getProperty("java.io.tmpdir");
 				String prefix = makePrefix(jasperPrint.getName());
 				if (log.isLoggable(Level.FINE))
@@ -199,7 +242,7 @@ public class ZkJRViewer extends Window implements EventListener<Event>, ITabOnCl
 				exporterXLS.exportReport();			
 				media = new AMedia(getTitle(), "xls", "application/vnd.ms-excel", file, true);						
 				
-			}else if ("CSV".equals(previewType.getSelectedItem().getValue())) {
+			}else if ("CSV".equals(reportType)) {
 				String path = System.getProperty("java.io.tmpdir");
 				String prefix = makePrefix(jasperPrint.getName());
 				if (log.isLoggable(Level.FINE))
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
index d4642d5c03..f29419248d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
@@ -234,9 +234,14 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		toolBar.setWidth("100%");
 		
 		previewType.setMold("select");
-		previewType.appendItem("PDF", "PDF");
 		previewType.appendItem("HTML", "HTML");
-		previewType.appendItem("Excel", "XLS");
+		
+		if ( m_isCanExport )
+		{
+			previewType.appendItem("PDF", "PDF");
+			previewType.appendItem("Excel", "XLS");
+		}
+		
 		toolBar.appendChild(previewType);		
 		previewType.addEventListener(Events.ON_SELECT, this);
 		toolBar.appendChild(new Separator("vertical"));
@@ -247,16 +252,16 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 				? MSysConfig.getValue(MSysConfig.ZK_REPORT_FORM_OUTPUT_TYPE,"PDF",Env.getAD_Client_ID(m_ctx),Env.getAD_Org_ID(m_ctx))
 				: MSysConfig.getValue(MSysConfig.ZK_REPORT_TABLE_OUTPUT_TYPE,"PDF",Env.getAD_Client_ID(m_ctx),Env.getAD_Org_ID(m_ctx));
 
-		if ("PDF".equals(type))
+		if ("HTML".equals(type)) {
 			previewType.setSelectedIndex(0);
-		else if ("HTML".equals(type))
+		} else if ("PDF".equals(type) && m_isCanExport) {
 			previewType.setSelectedIndex(1);
-		else if ("XLS".equals(type))
+		} else if ("XLS".equals(type) && m_isCanExport) {
 			previewType.setSelectedIndex(2);
-		else
+		} else {
 			// XXX - provide hint if unexpected value
-			previewType.setSelectedIndex(0); //fall back to PDF
-			
+			previewType.setSelectedIndex(0); //fall back to HTML
+		}
 		
 		labelDrill.setValue(Msg.getMsg(Env.getCtx(), "Drill") + ": ");
 		toolBar.appendChild(labelDrill);
@@ -306,7 +311,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		toolBar.appendChild(bArchive);
 		bArchive.addEventListener(Events.ON_CLICK, this);
 		
-		if (m_isCanExport)
+		if ( m_isCanExport )
 		{
 			bExport.setName("Export");
 			bExport.setImage(ThemeManager.getThemeResource("images/Export24.png"));
diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
index e754a4ec96..a2cbf1cf79 100644
--- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp
@@ -1074,7 +1074,7 @@ tr.z-group {
 	font-family: Helvetica,Arial,sans-serif;
 }
 
-.z-textbox-readonly, .z-intbox-readonly, .z-longbox-readonly, .z-doublebox-readonly, .z-decimalbox-readonly {
+.z-textbox-readonly, .z-intbox-readonly, .z-longbox-readonly, .z-doublebox-readonly, .z-decimalbox-readonly, .z-datebox-readonly {
 	background-color: #F0F0F0;
 }