Merge 8e223c142e06

migration/i1.0c-release/oracle/201307052208_IDEMPIERE-1151.sql

@@ -0,0 +1,339 @@
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Element SET Help=NULL, Description='Defines whether content must be treated as secure',Updated=TO_DATE('2013-07-05 21:52:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=2991
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Column SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Element_ID=2991
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Process_Para SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL, AD_Element_ID=2991 WHERE UPPER(ColumnName)='ISSECURE' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Process_Para SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Element_ID=2991 AND IsCentrallyMaintained='Y'
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_InfoColumn SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Element_ID=2991 AND IsCentrallyMaintained='Y'
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Field SET Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=2991) AND IsCentrallyMaintained='Y'
+;
+
+-- Jul 5, 2013 9:55:26 PM COT
+INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,DefaultValue,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID) VALUES (0,'N',0,101,210596,'Y','N','N',0,'N',1,'N',20,'N','N','Y','4390c065-55a1-4f20-b5dd-fbd2b50ee66d','Y','IsSecure','Defines whether content must be treated as secure','N','Secure content','Y',TO_DATE('2013-07-05 21:55:24','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-07-05 21:55:24','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',2991)
+;
+
+-- Jul 5, 2013 9:55:26 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=210596 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Jul 5, 2013 9:55:33 PM COT
+ALTER TABLE AD_Column ADD IsSecure CHAR(1) DEFAULT 'N' CHECK (IsSecure IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2013 9:57:16 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,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',101,0,'N','N',210596,420,'Y',202257,'N','D','Defines whether content must be treated as secure','Secure content','16162fa3-3425-4e4b-b1bc-d620bdf72ba4','Y','N',100,0,TO_DATE('2013-07-05 21:57:15','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-07-05 21:57:15','YYYY-MM-DD HH24:MI:SS'),'Y','Y',430,1,'N',0,1,1)
+;
+
+-- Jul 5, 2013 9:57:16 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=202257 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)
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=280, IsDisplayed='Y', XPosition=5, ColumnSpan=2,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202257
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=290, IsDisplayed='Y', XPosition=2,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2370
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=300,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10128
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=310,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=160
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=320,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5122
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=330,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4941
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50188
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_DATE('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=168
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=159
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4940
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200288
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56317
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62467
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=167
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_DATE('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=825
+;
+
+-- Jul 5, 2013 10:13:17 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:13:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6560
+;
+
+-- Jul 5, 2013 10:15:16 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:15:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6559
+;
+
+-- Jul 5, 2013 10:15:42 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:15:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4771
+;
+
+-- Jul 5, 2013 10:20:07 PM COT
+UPDATE R_RequestProcessor SET DateLastRun=TO_DATE('2013-07-05 22:20:07','YYYY-MM-DD HH24:MI:SS'), DateNextRun=TO_DATE('2013-07-05 22:35:07','YYYY-MM-DD HH24:MI:SS'),Updated=TO_DATE('2013-07-05 22:20:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE R_RequestProcessor_ID=1000003
+;
+
+-- Jul 5, 2013 10:29:14 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:29:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200972
+;
+
+-- Jul 5, 2013 10:29:21 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:29:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200974
+;
+
+-- Jul 5, 2013 10:29:27 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:29:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200971
+;
+
+-- Jul 5, 2013 10:29:32 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:29:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200973
+;
+
+-- Jul 5, 2013 10:30:23 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:30:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12943
+;
+
+-- Jul 5, 2013 10:31:04 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:31:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=9885
+;
+
+-- Jul 5, 2013 10:31:11 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:31:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12402
+;
+
+-- Jul 5, 2013 10:31:14 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:31:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12409
+;
+
+-- Jul 5, 2013 10:31:38 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:31:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7806
+;
+
+-- Jul 5, 2013 10:31:50 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:31:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14856
+;
+
+-- Jul 5, 2013 10:32:00 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:32:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12944
+;
+
+-- Jul 5, 2013 10:32:35 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:32:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200458
+;
+
+-- Jul 5, 2013 10:32:52 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:32:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7793
+;
+
+-- Jul 5, 2013 10:32:55 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:32:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7794
+;
+
+-- Jul 5, 2013 10:33:28 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:33:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200409
+;
+
+-- Jul 5, 2013 10:33:35 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:33:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12401
+;
+
+-- Jul 5, 2013 10:33:43 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:33:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=417
+;
+
+-- Jul 5, 2013 10:33:55 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:33:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61756
+;
+
+-- Jul 5, 2013 10:33:58 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:33:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200457
+;
+
+-- Jul 5, 2013 10:34:08 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:34:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=52066
+;
+
+-- Jul 5, 2013 10:35:02 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:35:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200895
+;
+
+-- Jul 5, 2013 10:35:15 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:35:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200898
+;
+
+-- Jul 5, 2013 10:35:26 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:35:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200897
+;
+
+-- Jul 5, 2013 10:35:30 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:35:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200896
+;
+
+-- Jul 5, 2013 10:36:19 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10365
+;
+
+-- Jul 5, 2013 10:36:26 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10354
+;
+
+-- Jul 5, 2013 10:36:30 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10345
+;
+
+-- Jul 5, 2013 10:36:37 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10350
+;
+
+-- Jul 5, 2013 10:36:42 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10356
+;
+
+-- Jul 5, 2013 10:36:46 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10367
+;
+
+-- Jul 5, 2013 10:36:56 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:36:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10360
+;
+
+-- Jul 5, 2013 10:37:32 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:37:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5060
+;
+
+-- Jul 5, 2013 10:37:42 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:37:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5062
+;
+
+-- Jul 5, 2013 10:37:45 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:37:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5064
+;
+
+-- Jul 5, 2013 10:37:48 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:37:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5065
+;
+
+-- Jul 5, 2013 10:38:29 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:38:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54537
+;
+
+-- Jul 5, 2013 10:38:36 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:38:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54540
+;
+
+-- Jul 5, 2013 10:39:10 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:39:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54587
+;
+
+-- Jul 5, 2013 10:39:18 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:39:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54590
+;
+
+-- Jul 5, 2013 10:39:32 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:39:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54589
+;
+
+-- Jul 5, 2013 10:39:43 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:39:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54539
+;
+
+-- Jul 5, 2013 10:40:34 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:40:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=13618
+;
+
+-- Jul 5, 2013 10:41:49 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:41:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200612
+;
+
+-- Jul 5, 2013 10:43:21 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:43:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201024
+;
+
+-- Jul 5, 2013 10:43:24 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:43:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201025
+;
+
+-- Jul 5, 2013 10:43:37 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:43:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201034
+;
+
+-- Jul 5, 2013 10:43:51 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:43:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202058
+;
+
+-- Jul 5, 2013 10:44:00 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:44:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202064
+;
+
+-- Jul 5, 2013 10:44:03 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:44:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202065
+;
+
+-- Jul 5, 2013 10:44:06 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:44:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202066
+;
+
+-- Jul 5, 2013 10:45:06 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:45:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202216
+;
+
+-- Jul 5, 2013 10:45:41 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:45:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201176
+;
+
+-- Jul 5, 2013 10:45:43 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:45:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201177
+;
+
+-- Jul 5, 2013 10:46:00 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_DATE('2013-07-05 22:46:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201174
+;
+
+SELECT register_migration_script('201307052208_IDEMPIERE-1151.sql') FROM dual
+;
+

migration/i1.0c-release/oracle/20130717091459_IDEMPIERE-984.sql

@@ -0,0 +1,12 @@
+-- Jul 17, 2013 9:14:59 AM COT
+-- IDEMPIERE-984 Change Role and Logout must check for unsaved records on open windows
+INSERT INTO AD_Message (MsgType,MsgText,MsgTip,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','There are records that haven''t been saved yet. ','Do you still want to proceed?',200207,'D','78553b48-d536-4366-90ee-7fc69e80f35a','ProceedWithTask?','Y',TO_DATE('2013-07-17 09:14:58','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-07-17 09:14:58','YYYY-MM-DD HH24:MI:SS'),0)
+;
+
+-- Jul 17, 2013 9:14:59 AM COT
+-- IDEMPIERE-984 Change Role and Logout must check for unsaved records on open windows
+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=200207 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('20130717091459_IDEMPIERE-984.sql') FROM dual
+;

migration/i1.0c-release/oracle/201307171313_IDEMPIERE-347.sql

@@ -0,0 +1,8 @@
+-- Jul 17, 2013 1:10:17 PM COT
+-- IDEMPIERE-347 passwords hash
+UPDATE AD_Column SET ReadOnlyLogic='@AD_User_ID@=0',Updated=TO_DATE('2013-07-17 13:10:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=417
+;
+
+SELECT register_migration_script('201307171313_IDEMPIERE-347.sql') FROM dual
+;
+

migration/i1.0c-release/postgresql/201307052208_IDEMPIERE-1151.sql

@@ -0,0 +1,339 @@
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Element SET Help=NULL, Description='Defines whether content must be treated as secure',Updated=TO_TIMESTAMP('2013-07-05 21:52:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=2991
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Column SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Element_ID=2991
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Process_Para SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL, AD_Element_ID=2991 WHERE UPPER(ColumnName)='ISSECURE' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Process_Para SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Element_ID=2991 AND IsCentrallyMaintained='Y'
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_InfoColumn SET ColumnName='IsSecure', Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Element_ID=2991 AND IsCentrallyMaintained='Y'
+;
+
+-- Jul 5, 2013 9:52:28 PM COT
+UPDATE AD_Field SET Name='Secure content', Description='Defines whether content must be treated as secure', Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=2991) AND IsCentrallyMaintained='Y'
+;
+
+-- Jul 5, 2013 9:55:26 PM COT
+INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,DefaultValue,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID) VALUES (0,'N',0,101,210596,'Y','N','N',0,'N',1,'N',20,'N','N','Y','4390c065-55a1-4f20-b5dd-fbd2b50ee66d','Y','IsSecure','Defines whether content must be treated as secure','N','Secure content','Y',TO_TIMESTAMP('2013-07-05 21:55:24','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-07-05 21:55:24','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',2991)
+;
+
+-- Jul 5, 2013 9:55:26 PM COT
+INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=210596 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
+;
+
+-- Jul 5, 2013 9:55:33 PM COT
+ALTER TABLE AD_Column ADD COLUMN IsSecure CHAR(1) DEFAULT 'N' CHECK (IsSecure IN ('Y','N')) NOT NULL
+;
+
+-- Jul 5, 2013 9:57:16 PM COT
+INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,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',101,0,'N','N',210596,420,'Y',202257,'N','D','Defines whether content must be treated as secure','Secure content','16162fa3-3425-4e4b-b1bc-d620bdf72ba4','Y','N',100,0,TO_TIMESTAMP('2013-07-05 21:57:15','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-07-05 21:57:15','YYYY-MM-DD HH24:MI:SS'),'Y','Y',430,1,'N',0,1,1)
+;
+
+-- Jul 5, 2013 9:57:16 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=202257 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)
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=280, IsDisplayed='Y', XPosition=5, ColumnSpan=2,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202257
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=290, IsDisplayed='Y', XPosition=2,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=2370
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=300,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10128
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=310,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=160
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=320,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5122
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=330,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4941
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=340,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=50188
+;
+
+-- Jul 5, 2013 10:00:19 PM COT
+UPDATE AD_Field SET SeqNo=350,Updated=TO_TIMESTAMP('2013-07-05 22:00:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=168
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=360,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=159
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=370,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=4940
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=380,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200288
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=390,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=56317
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=400,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62467
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=410,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=167
+;
+
+-- Jul 5, 2013 10:00:20 PM COT
+UPDATE AD_Field SET SeqNo=420,Updated=TO_TIMESTAMP('2013-07-05 22:00:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=825
+;
+
+-- Jul 5, 2013 10:13:17 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:13:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6560
+;
+
+-- Jul 5, 2013 10:15:16 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:15:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=6559
+;
+
+-- Jul 5, 2013 10:15:42 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:15:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=4771
+;
+
+-- Jul 5, 2013 10:20:07 PM COT
+UPDATE R_RequestProcessor SET DateLastRun=TO_TIMESTAMP('2013-07-05 22:20:07','YYYY-MM-DD HH24:MI:SS'), DateNextRun=TO_TIMESTAMP('2013-07-05 22:35:07','YYYY-MM-DD HH24:MI:SS'),Updated=TO_TIMESTAMP('2013-07-05 22:20:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE R_RequestProcessor_ID=1000003
+;
+
+-- Jul 5, 2013 10:29:14 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:29:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200972
+;
+
+-- Jul 5, 2013 10:29:21 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:29:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200974
+;
+
+-- Jul 5, 2013 10:29:27 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:29:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200971
+;
+
+-- Jul 5, 2013 10:29:32 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:29:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200973
+;
+
+-- Jul 5, 2013 10:30:23 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:30:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12943
+;
+
+-- Jul 5, 2013 10:31:04 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:31:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=9885
+;
+
+-- Jul 5, 2013 10:31:11 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:31:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12402
+;
+
+-- Jul 5, 2013 10:31:14 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:31:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12409
+;
+
+-- Jul 5, 2013 10:31:38 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:31:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7806
+;
+
+-- Jul 5, 2013 10:31:50 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:31:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=14856
+;
+
+-- Jul 5, 2013 10:32:00 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:32:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12944
+;
+
+-- Jul 5, 2013 10:32:35 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:32:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200458
+;
+
+-- Jul 5, 2013 10:32:52 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:32:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7793
+;
+
+-- Jul 5, 2013 10:32:55 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:32:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=7794
+;
+
+-- Jul 5, 2013 10:33:28 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:33:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200409
+;
+
+-- Jul 5, 2013 10:33:35 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:33:35','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=12401
+;
+
+-- Jul 5, 2013 10:33:43 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:33:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=417
+;
+
+-- Jul 5, 2013 10:33:55 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:33:55','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=61756
+;
+
+-- Jul 5, 2013 10:33:58 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:33:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200457
+;
+
+-- Jul 5, 2013 10:34:08 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:34:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=52066
+;
+
+-- Jul 5, 2013 10:35:02 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:35:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200895
+;
+
+-- Jul 5, 2013 10:35:15 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:35:15','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200898
+;
+
+-- Jul 5, 2013 10:35:26 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:35:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200897
+;
+
+-- Jul 5, 2013 10:35:30 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:35:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200896
+;
+
+-- Jul 5, 2013 10:36:19 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10365
+;
+
+-- Jul 5, 2013 10:36:26 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10354
+;
+
+-- Jul 5, 2013 10:36:30 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10345
+;
+
+-- Jul 5, 2013 10:36:37 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10350
+;
+
+-- Jul 5, 2013 10:36:42 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10356
+;
+
+-- Jul 5, 2013 10:36:46 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10367
+;
+
+-- Jul 5, 2013 10:36:56 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:36:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=10360
+;
+
+-- Jul 5, 2013 10:37:32 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:37:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5060
+;
+
+-- Jul 5, 2013 10:37:42 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:37:42','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5062
+;
+
+-- Jul 5, 2013 10:37:45 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:37:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5064
+;
+
+-- Jul 5, 2013 10:37:48 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:37:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=5065
+;
+
+-- Jul 5, 2013 10:38:29 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:38:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54537
+;
+
+-- Jul 5, 2013 10:38:36 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:38:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54540
+;
+
+-- Jul 5, 2013 10:39:10 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:39:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54587
+;
+
+-- Jul 5, 2013 10:39:18 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:39:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54590
+;
+
+-- Jul 5, 2013 10:39:32 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:39:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54589
+;
+
+-- Jul 5, 2013 10:39:43 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:39:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54539
+;
+
+-- Jul 5, 2013 10:40:34 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:40:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=13618
+;
+
+-- Jul 5, 2013 10:41:49 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:41:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200612
+;
+
+-- Jul 5, 2013 10:43:21 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:43:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201024
+;
+
+-- Jul 5, 2013 10:43:24 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:43:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201025
+;
+
+-- Jul 5, 2013 10:43:37 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:43:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201034
+;
+
+-- Jul 5, 2013 10:43:51 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:43:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202058
+;
+
+-- Jul 5, 2013 10:44:00 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:44:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202064
+;
+
+-- Jul 5, 2013 10:44:03 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:44:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202065
+;
+
+-- Jul 5, 2013 10:44:06 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:44:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202066
+;
+
+-- Jul 5, 2013 10:45:06 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:45:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=202216
+;
+
+-- Jul 5, 2013 10:45:41 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:45:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201176
+;
+
+-- Jul 5, 2013 10:45:43 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:45:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201177
+;
+
+-- Jul 5, 2013 10:46:00 PM COT
+UPDATE AD_Column SET IsSecure='Y',Updated=TO_TIMESTAMP('2013-07-05 22:46:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=201174
+;
+
+SELECT register_migration_script('201307052208_IDEMPIERE-1151.sql') FROM dual
+;
+

migration/i1.0c-release/postgresql/20130717091459_IDEMPIERE-984.sql

@@ -0,0 +1,12 @@
+-- Jul 17, 2013 9:14:59 AM COT
+-- IDEMPIERE-984 Change Role and Logout must check for unsaved records on open windows
+INSERT INTO AD_Message (MsgType,MsgText,MsgTip,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','There are records that haven''t been saved yet. ','Do you still want to proceed?',200207,'D','78553b48-d536-4366-90ee-7fc69e80f35a','ProceedWithTask?','Y',TO_TIMESTAMP('2013-07-17 09:14:58','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-07-17 09:14:58','YYYY-MM-DD HH24:MI:SS'),0)
+;
+
+-- Jul 17, 2013 9:14:59 AM COT
+-- IDEMPIERE-984 Change Role and Logout must check for unsaved records on open windows
+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=200207 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('20130717091459_IDEMPIERE-984.sql') FROM dual
+;

migration/i1.0c-release/postgresql/201307171313_IDEMPIERE-347.sql

@@ -0,0 +1,8 @@
+-- Jul 17, 2013 1:10:17 PM COT
+-- IDEMPIERE-347 passwords hash
+UPDATE AD_Column SET ReadOnlyLogic='@AD_User_ID@=0',Updated=TO_TIMESTAMP('2013-07-17 13:10:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=417
+;
+
+SELECT register_migration_script('201307171313_IDEMPIERE-347.sql') FROM dual
+;
+

org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java

@@ -126,14 +126,19 @@ public class Doc_MatchPO extends Doc
 		ArrayList<Fact> facts = new ArrayList<Fact>();
 		//
 		if (getM_Product_ID() == 0		//  Nothing to do if no Product
-			|| getQty().signum() == 0
+			|| getQty().signum() == 0)
-			|| m_M_InOutLine_ID == 0)	//  No posting if not matched to Shipment
 		{
 			if (log.isLoggable(Level.FINE)) log.fine("No Product/Qty - M_Product_ID=" + getM_Product_ID()
 				+ ",Qty=" + getQty());
 			return facts;
 		}
 
+		if (m_M_InOutLine_ID == 0)	//  No posting if not matched to Shipment
+		{
+			p_Error = "No posting if not matched to Shipment";
+			return null;
+		}
+
 		//  create Fact Header
 		Fact fact = new Fact(this, as, Fact.POST_Actual);
 		setC_Currency_ID(as.getC_Currency_ID());

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

@@ -441,6 +441,19 @@ public interface I_AD_Column
 	  */
 	public boolean isParent();
 
+    /** Column name IsSecure */
+    public static final String COLUMNNAME_IsSecure = "IsSecure";
+
+	/** Set Secure content.
+	  * Defines whether content must be treated as secure
+	  */
+	public void setIsSecure (boolean IsSecure);
+
+	/** Get Secure content.
+	  * Defines whether content must be treated as secure
+	  */
+	public boolean isSecure();
+
     /** Column name IsSelectionColumn */
     public static final String COLUMNNAME_IsSelectionColumn = "IsSelectionColumn";
 

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

@@ -47,7 +47,7 @@ public class MColumn extends X_AD_Column
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 2344447703630569514L;
+	private static final long serialVersionUID = 4321132594207949196L;
 
 	/**
 	 * 	Get MColumn from Cache
@@ -67,6 +67,19 @@ public class MColumn extends X_AD_Column
 		return retValue;
 	}	//	get
 
+	/**
+	 * 	Get MColumn given TableName and ColumnName
+	 *	@param ctx context
+	 * 	@param TableName
+	 * 	@param ColumnName
+	 *	@return MColumn
+	 */
+	public static MColumn get (Properties ctx, String tableName, String columnName)
+	{
+		MTable table = MTable.get(ctx, tableName);
+		return  table.getColumn(columnName);
+	}	//	get
+
 	/**
 	 * 	Get Column Name
 	 *	@param ctx context

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

@@ -1628,6 +1628,10 @@ public class MInOut extends X_M_InOut implements DocAction
 						}
 						if (!po.isPosted())
 							addDocsPostProcess(po);
+						MMatchInv matchInvCreated = po.getMatchInvCreated();
+						if (matchInvCreated != null) {
+							addDocsPostProcess(matchInvCreated);
+						}
 					}
 					//	Update PO with ASI
 					if (   oLine != null && oLine.getM_AttributeSetInstance_ID() == 0

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

@@ -651,8 +651,12 @@ public class MInOutLine extends X_M_InOutLine
 			MInvoiceLine m_il = MInvoiceLine.getOfInOutLine(this);
 			if (m_il == null)
 			{
-				log.severe("No Invoice Line for: " + this.toString());
+				m_il = MInvoiceLine.getOfInOutLineFromMatchInv(this);
-				return Env.ZERO;
+				if (m_il == null)
+				{
+					log.severe("No Invoice Line for: " + this.toString());
+					return Env.ZERO;
+				}
 			}
 			return this.getMovementQty().multiply(m_il.getPriceActual());  // Actual delivery
 		}

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

@@ -1849,7 +1849,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
 							return DocAction.STATUS_Invalid;
 						}
 						matchPO++;
-						if (!po.isPosted())
+						if (!po.isPosted() && po.getM_InOutLine_ID() > 0) // match po don't post if receipt is not assigned, and it doesn't create avg po record
 							addDocsPostProcess(po);
 					}
 				}

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

@@ -52,7 +52,7 @@ public class MInvoiceLine extends X_C_InvoiceLine
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = -5113860437274708398L;
+	private static final long serialVersionUID = 6157080330492848409L;
 
 	/**
 	 * 	Get Invoice Line referencing InOut Line
@@ -78,6 +78,29 @@ public class MInvoiceLine extends X_C_InvoiceLine
 		return retValue;
 	}	//	getOfInOutLine
 
+	/**
+	 * 	Get Invoice Line referencing InOut Line - from MatchInv
+	 *	@param sLine shipment line
+	 *	@return (first) invoice line
+	 */
+	public static MInvoiceLine getOfInOutLineFromMatchInv(MInOutLine sLine) {
+		if (sLine == null)
+			return null;
+		final String whereClause = "C_InvoiceLine_ID IN (SELECT C_InvoiceLine_ID FROM M_MatchInv WHERE M_InOutLine_ID=?)";
+		List<MInvoiceLine> list = new Query(sLine.getCtx(),I_C_InvoiceLine.Table_Name,whereClause,sLine.get_TrxName())
+		.setParameters(sLine.getM_InOutLine_ID())
+		.list();
+		
+		MInvoiceLine retValue = null;
+		if (list.size() > 0) {
+			retValue = list.get(0);
+			if (list.size() > 1)
+				s_log.warning("More than one C_InvoiceLine of " + sLine);
+		}
+
+		return retValue;
+	}
+
 	/**	Static Logger	*/
 	private static CLogger	s_log	= CLogger.getCLogger (MInvoiceLine.class);
 
@@ -1053,9 +1076,9 @@ public class MInvoiceLine extends X_C_InvoiceLine
 					// end MZ
 					if (base.signum() != 0)
 					{
-						double result = getLineNetAmt().multiply(base).doubleValue();
+						BigDecimal result = getLineNetAmt().multiply(base);
-						result /= total.doubleValue();
+						result = result.divide(total, BigDecimal.ROUND_HALF_UP);
-						lca.setAmt(result, getPrecision());
+						lca.setAmt(result.doubleValue(), getPrecision());
 					}
 					if (!lca.save()){
 						msgreturn = new StringBuilder("Cannot save line Allocation = ").append(lca);
@@ -1079,6 +1102,8 @@ public class MInvoiceLine extends X_C_InvoiceLine
 				lca.setM_Product_ID(iol.getM_Product_ID());
 				lca.setM_AttributeSetInstance_ID(iol.getM_AttributeSetInstance_ID());
 				BigDecimal base = iol.getBase(lc.getLandedCostDistribution()); 
+				if (base.signum() == 0)
+					return "Base value is 0 - " + lc.getLandedCostDistribution();
 				lca.setBase(base);
 				lca.setAmt(getLineNetAmt());
 				// MZ Goodwill
@@ -1174,9 +1199,9 @@ public class MInvoiceLine extends X_C_InvoiceLine
 			// end MZ
 			if (base.signum() != 0)
 			{
-				double result = getLineNetAmt().multiply(base).doubleValue();
+				BigDecimal result = getLineNetAmt().multiply(base);
-				result /= total.doubleValue();
+				result = result.divide(total, BigDecimal.ROUND_HALF_UP);
-				lca.setAmt(result, getPrecision());
+				lca.setAmt(result.doubleValue(), getPrecision());
 			}
 			if (!lca.save()){
 				msgreturn = new StringBuilder("Cannot save line Allocation = ").append(lca);

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

@@ -23,6 +23,7 @@ import java.util.logging.Level;
 
 import org.compiere.util.CCache;
 import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  * 	Request Mail Template Model.
@@ -216,7 +217,13 @@ public class MMailText extends X_R_MailText
 			return msgreturn.toString();	//	keep for next
 		}	
 		//
-		Object value = po.get_Value(index);
+		MColumn col = MColumn.get(Env.getCtx(), po.get_TableName(), variable);
+		Object value = null;
+		if (col != null && col.isSecure()) {
+			value = "********";
+		} else {
+			value = po.get_Value(index);
+		}
 		if (value == null)
 			return "";
 		return value.toString();

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

@@ -59,8 +59,7 @@ public class MMatchPO extends X_M_MatchPO
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 7189366329684552916L;
+	private static final long serialVersionUID = -3669451656879485463L;
-
 
 	/**
 	 * 	Get PO Match with order/invoice
@@ -446,6 +445,7 @@ public class MMatchPO extends X_M_MatchPO
 								s_log.fine(msg);
 								continue;
 							}
+							mpo.setMatchInvCreated(matchInv);
 							if (savepoint != null) 
 							{
 								try {
@@ -549,7 +549,28 @@ public class MMatchPO extends X_M_MatchPO
 		return retValue;
 	}	//	create
 	
-	
+
+	private MMatchInv m_matchInv;
+
+	/**
+	 * Register the match inv created for immediate accounting purposes
+	 * @param matchInv
+	 */
+	private void setMatchInvCreated(MMatchInv matchInv) {
+		m_matchInv = matchInv;
+	}
+
+	/**
+	 * Get the match inv created for immediate accounting purposes
+	 * Is cleared after read, so if you read twice second time it returns null
+	 * @param matchInv
+	 */
+	public MMatchInv getMatchInvCreated() {
+		MMatchInv tmp = m_matchInv;
+		m_matchInv = null;
+		return tmp;
+	}
+
 	/**	Static Logger	*/
 	private static CLogger	s_log	= CLogger.getCLogger (MMatchPO.class);
 

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

@@ -118,8 +118,6 @@ public abstract class PaymentProcessor
 	 */
 	public String validate() throws IllegalArgumentException {
 		String msg = null;
-		if (p_mp.getC_BP_BankAccount_ID() != 0 || p_mp.getCustomerPaymentProfileID() != null)
-			return msg;		
 		if (MPayment.TENDERTYPE_CreditCard.equals(p_mp.getTenderType())) {
 			msg = validateCreditCard();
 		} else if (MPayment.TENDERTYPE_Check.equals(p_mp.getTenderType())) {
@@ -143,7 +141,10 @@ public abstract class PaymentProcessor
 	}
 
 	public String validateCreditCard() throws IllegalArgumentException {
-		String msg = MPaymentValidate.validateCreditCardNumber(p_mp.getCreditCardNumber(), p_mp.getCreditCardType());
+		String msg = null;
+		if (p_mp.getC_BP_BankAccount_ID() != 0 || (p_mp.getCustomerPaymentProfileID() != null && p_mp.getCustomerPaymentProfileID().length() > 0))
+			return msg;
+		msg = MPaymentValidate.validateCreditCardNumber(p_mp.getCreditCardNumber(), p_mp.getCreditCardType());
 		if (msg != null && msg.length() > 0)
 			throw new IllegalArgumentException(Msg.getMsg(Env.getCtx(), msg));
 		msg = MPaymentValidate.validateCreditCardExp(p_mp.getCreditCardExpMM(), p_mp.getCreditCardExpYY());

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

@@ -32,7 +32,7 @@ public class X_AD_Column extends PO implements I_AD_Column, I_Persistent
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = 20130626L;
+	private static final long serialVersionUID = 20130705L;
 
     /** Standard Constructor */
     public X_AD_Column (Properties ctx, int AD_Column_ID, String trxName)
@@ -59,6 +59,8 @@ public class X_AD_Column extends PO implements I_AD_Column, I_Persistent
 			setIsKey (false);
 			setIsMandatory (false);
 			setIsParent (false);
+			setIsSecure (false);
+// N
 			setIsSelectionColumn (false);
 			setIsToolbarButton (true);
 // Y
@@ -686,6 +688,30 @@ public class X_AD_Column extends PO implements I_AD_Column, I_Persistent
 		return false;
 	}
 
+	/** Set Secure content.
+		@param IsSecure 
+		Defines whether content must be treated as secure
+	  */
+	public void setIsSecure (boolean IsSecure)
+	{
+		set_Value (COLUMNNAME_IsSecure, Boolean.valueOf(IsSecure));
+	}
+
+	/** Get Secure content.
+		@return Defines whether content must be treated as secure
+	  */
+	public boolean isSecure () 
+	{
+		Object oo = get_Value(COLUMNNAME_IsSecure);
+		if (oo != null) 
+		{
+			 if (oo instanceof Boolean) 
+				 return ((Boolean)oo).booleanValue(); 
+			return "Y".equals(oo);
+		}
+		return false;
+	}
+
 	/** Set Selection Column.
 		@param IsSelectionColumn 
 		Is this column used for finding rows in windows

org.adempiere.base/src/org/compiere/util/Env.java

@@ -54,6 +54,7 @@ import org.compiere.db.CConnection;
 import org.compiere.model.GridWindowVO;
 import org.compiere.model.I_AD_Window;
 import org.compiere.model.MClient;
+import org.compiere.model.MColumn;
 import org.compiere.model.MLookupCache;
 import org.compiere.model.MRole;
 import org.compiere.model.MSession;
@@ -1459,9 +1460,9 @@ public final class Env
 				token = token.substring(0, f);
 			}
 
+			Properties ctx = po != null ? po.getCtx() : Env.getCtx();
 			if (token.startsWith("#") || token.startsWith("$")) {
 				//take from context
-				Properties ctx = po != null ? po.getCtx() : Env.getCtx();
 				String v = Env.getContext(ctx, token);
 				if (v != null && v.length() > 0)
 					outStr.append(v);
@@ -1476,8 +1477,13 @@ public final class Env
 							int tblIndex = format.indexOf(".");
 							String table = tblIndex > 0 ? format.substring(0, tblIndex) : token.substring(0, token.length() - 3);
 							String column = tblIndex > 0 ? format.substring(tblIndex + 1) : format;
-							outStr.append(DB.getSQLValueString(trxName,
+							MColumn col = MColumn.get(ctx, table, column);
-									"SELECT " + column + " FROM " + table + " WHERE " + table + "_ID = ?", (Integer)v));
+							if (col != null && col.isSecure()) {
+								outStr.append("********");
+							} else {
+								outStr.append(DB.getSQLValueString(trxName,
+										"SELECT " + column + " FROM " + table + " WHERE " + table + "_ID = ?", (Integer)v));
+							}
 						} else if (v instanceof Date) {
 							SimpleDateFormat df = new SimpleDateFormat(format);
 							outStr.append(df.format((Date)v));

org.adempiere.pipo/src/org/adempiere/pipo2/ReferenceUtils.java

@@ -85,7 +85,8 @@ public class ReferenceUtils {
 	public static String getTableReference(String tableName, String searchColumn, int id, AttributesImpl atts)
 	{
 		String keyColumn = tableName + "_ID";
-		if (id > 0 && id <= PackOut.MAX_OFFICIAL_ID)
+		if (   (id > 0 && id <= PackOut.MAX_OFFICIAL_ID)
+			|| (id == 0 && MTable.isZeroIDTable(tableName)))
 		{
 			//official id
 			atts.addAttribute("", "", "reference", "CDATA", "id");

org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCreditCard.java

@@ -274,7 +274,7 @@ public class VPaymentFormCreditCard extends PaymentFormCreditCard implements Act
 		ValueNamePair vp = (ValueNamePair)kTypeCombo.getSelectedItem();
 		String CCType = vp.getValue();
 		
-		boolean ok = processOnline(CCType, kNumberField.getText(), kExpField.getText());
+		boolean ok = processOnline(CCType, kNumberField.getText(), kApprovalField.getText(), kExpField.getText());
 		if (!ok)
 			ADialog.error(getWindowNo(), dialog, "PaymentError", processMsg);
 		else 

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADTabpanel.java

@@ -1216,14 +1216,7 @@ DataStatusListener, IADTabpanel, IdSpace, IFieldEditorContainer
         	}else if(e.isInserting() && gridTab.getRecord_ID() < 0 && gridTab.getTabLevel() > 0 )
         	{		
     			int AD_Tree_ID = Integer.parseInt(gridTab.getParentTab().getValue("AD_Tree_ID").toString());
-    			MTreeNode root = new MTree (Env.getCtx(), AD_Tree_ID, true, true, null).getRoot();
+    			treePanel.initTree(AD_Tree_ID, windowNo);
-    			SimpleTreeModel treeModel = SimpleTreeModel.createFrom(root);
-    			try {
-    				treePanel.getTree().setItemRenderer(treeModel);
-    				treePanel.getTree().setModel(treeModel);
-    			} catch (Exception treeExc) {
-    				logger.log(Level.SEVERE, "Failed to setup tree");
-    			}
     		}
         }
         if (listPanel.isVisible()) {

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java

@@ -2931,4 +2931,9 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
 			LayoutUtils.openEmbeddedWindow(getComponent().getParent(), findWindow, "overlap");
 		}
 	}
+
+	public boolean isPendingChanges() {
+		return boolChanges;
+	}
+
 }

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCreditCard.java

@@ -75,9 +75,13 @@ public class WPaymentFormCreditCard extends PaymentFormCreditCard implements Eve
 	
 	public void init() {
 		Grid kLayout = GridFactory.newGridLayout();
-		window.getPanel().appendChild(kLayout);
+		window.getPanel().appendChild(kLayout);		
+		kNumberField.setMaxlength(16);
 		kNumberField.setCols(16);
+		
+		kExpField.setMaxlength(4);
 		kExpField.setCols(4);
+		kApprovalField.setMaxlength(4);
 		kApprovalField.setCols(4);
 		kApprovalField.setType("password");
 		kTypeLabel.setText(Msg.translate(Env.getCtx(), "CreditCardType"));
@@ -291,7 +295,7 @@ public class WPaymentFormCreditCard extends PaymentFormCreditCard implements Eve
 		ValueNamePair vp = kTypeCombo.getSelectedItem().toValueNamePair();
 		String CCType = vp.getValue();
 		
-		boolean ok = processOnline(CCType, kNumberField.getText(), kExpField.getText());
+		boolean ok = processOnline(CCType, kNumberField.getText(), kApprovalField.getText(), kExpField.getText());
 		if (!ok)
 			FDialog.error(getWindowNo(), window, "PaymentNotProcessed", processMsg);
 		else 

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/AbstractDesktop.java

@@ -295,4 +295,9 @@ public abstract class AbstractDesktop extends AbstractUIPart implements IDesktop
 		win.setPage(page);
    		win.doHighlighted();
    	}   	
+
+    protected List<Object> getWindows(){
+    	return windows;
+    }
+
 }

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java

@@ -18,6 +18,7 @@
 package org.adempiere.webui.desktop;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -26,6 +27,7 @@ import org.adempiere.base.event.IEventManager;
 import org.adempiere.base.event.IEventTopics;
 import org.adempiere.model.MBroadcastMessage;
 import org.adempiere.util.ServerContext;
+import org.adempiere.webui.adwindow.ADWindow;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.apps.BusyDialog;
 import org.adempiere.webui.apps.ProcessDialog;
@@ -593,4 +595,19 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
 		super.openTask(taskId);
 		updateHelpContext(X_AD_CtxHelp.CTXTYPE_Task, taskId);
 	}
+
+    public boolean isPendingWindow() {
+        List<Object> windows = getWindows();
+        if (windows != null) {
+        	for (int idx = 0; idx < windows.size(); idx++) {
+                Object ad = windows.get(idx);
+                if (ad != null && ad instanceof ADWindow) {
+                	if ( ((ADWindow)ad).getADWindowContent().isPendingChanges()) {
+                		return true;
+                	}
+                }
+        	}
+        }
+        return false;
+    }
 }

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/IDesktop.java

@@ -204,4 +204,6 @@ public interface IDesktop extends UIPart {
 	public void updateHelpContext(String ctxType, int recordId);
 	
 	public void updateHelpTooltip(GridField gridField);
+
+	public boolean isPendingWindow();
 }

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

@@ -19,11 +19,13 @@ package org.adempiere.webui.panel;
 
 import java.util.Properties;
 
+import org.adempiere.util.Callback;
 import org.adempiere.webui.component.Label;
 import org.adempiere.webui.component.Menupopup;
 import org.adempiere.webui.component.Messagebox;
 import org.adempiere.webui.session.SessionManager;
 import org.adempiere.webui.util.FeedbackManager;
+import org.adempiere.webui.window.FDialog;
 import org.adempiere.webui.window.WPreference;
 import org.compiere.model.MClient;
 import org.compiere.model.MOrg;
@@ -63,7 +65,10 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 
 	protected Component component;
 
-    public UserPanel()
+	private static final String ON_DEFER_CHANGE_ROLE = "onDeferChangeRole";
+	private static final String ON_DEFER_LOGOUT = "onDeferLogout";
+
+	public UserPanel()
     {
     	super();
         this.ctx = Env.getCtx();
@@ -103,6 +108,9 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
     	
     	SessionManager.getSessionApplication().getKeylistener().addEventListener(Events.ON_CTRL_KEY, this);
     	component.addEventListener("onEmailSupport", this);
+
+    	component.addEventListener(ON_DEFER_LOGOUT, this);
+    	component.addEventListener(ON_DEFER_CHANGE_ROLE, this);
     }
 
     private String getUserName()
@@ -143,7 +151,21 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 
 		if (logout == event.getTarget())
         {
-            SessionManager.logoutSession();
+			if (SessionManager.getAppDesktop().isPendingWindow()) {
+				FDialog.ask(0, component, "ProceedWithTask?", new Callback<Boolean>() {
+
+					@Override
+					public void onCallback(Boolean result)
+					{
+						if (result)
+						{
+							Events.echoEvent(ON_DEFER_LOGOUT, component, null);
+						}
+					}
+				});
+			} else {
+				Events.echoEvent(ON_DEFER_LOGOUT, component, null);
+			}
         }
 		else if (lblUserNameValue == event.getTarget())
 		{
@@ -153,8 +175,21 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 		}
 		else if (changeRole == event.getTarget())
 		{
-			MUser user = MUser.get(ctx);
+			if (SessionManager.getAppDesktop().isPendingWindow()) {
-			SessionManager.changeRole(user);
+				FDialog.ask(0, component, "ProceedWithTask?", new Callback<Boolean>() {
+
+					@Override
+					public void onCallback(Boolean result)
+					{
+						if (result)
+						{
+							Events.echoEvent(ON_DEFER_CHANGE_ROLE, component, null);
+						}
+					}
+				});
+			} else {
+				Events.echoEvent(ON_DEFER_CHANGE_ROLE, component, null);
+			}
 		}
 		else if (preference == event.getTarget())
 		{
@@ -202,6 +237,16 @@ public class UserPanel implements EventListener<Event>, Composer<Component>
 				}
 			}
 		}
+		else if (ON_DEFER_LOGOUT.equals(event.getName()))
+		{
+			SessionManager.logoutSession();
+		}
+		else if (ON_DEFER_CHANGE_ROLE.equals(event.getName()))
+		{
+			MUser user = MUser.get(ctx);
+			SessionManager.changeRole(user);
+		}
+
 	}
 
 	@Override

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java

@@ -31,6 +31,7 @@ import javax.activation.FileDataSource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.adempiere.exceptions.AdempiereException;
+import org.adempiere.exceptions.DBException;
 import org.adempiere.pdf.Document;
 import org.adempiere.webui.LayoutUtils;
 import org.adempiere.webui.apps.AEnv;
@@ -125,7 +126,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 344552813342946104L;
+	private static final long serialVersionUID = 6208607687967139151L;
 
 	/** Window No					*/
 	private int                 m_WindowNo = -1;
@@ -296,6 +297,9 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		bFind.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(), "Find")));
 		toolBar.appendChild(bFind);
 		bFind.addEventListener(Events.ON_CLICK, this);
+		if (getAD_Tab_ID(m_reportEngine.getPrintFormat().getAD_Table_ID()) <= 0) {
+			bFind.setVisible(false); // IDEMPIERE-1185
+		}
 		
 		toolBar.appendChild(new Separator("vertical"));
 		
@@ -421,6 +425,22 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		init = true;
 	}
 
+	/**
+	 * Get the maintenance tab of the table associated to the report engine
+	 * @return AD_Tab_ID or -1 if not found
+	 */
+	private int getAD_Tab_ID(int AD_Table_ID) {
+		// Get Find Tab Info
+		final String sql = "SELECT t.AD_Tab_ID "
+				+ "FROM AD_Tab t"
+				+ " INNER JOIN AD_Window w ON (t.AD_Window_ID=w.AD_Window_ID)"
+				+ " INNER JOIN AD_Table tt ON (t.AD_Table_ID=tt.AD_Table_ID) "
+				+ "WHERE tt.AD_Table_ID=? "
+				+ "ORDER BY w.IsDefault DESC, t.SeqNo, ABS (tt.AD_Window_ID-t.AD_Window_ID)";
+		int AD_Tab_ID = DB.getSQLValueEx(null, sql, AD_Table_ID);
+		return AD_Tab_ID;
+	}
+
 	private void renderReport() throws Exception {
 		media = null;
 		Listitem selected = previewType.getSelectedItem();
@@ -448,8 +468,10 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 			m_reportEngine.createHTML(file, false, AEnv.getLanguage(Env.getCtx()), new HTMLExtension(Executions.getCurrent().getContextPath(), "rp", this.getUuid()));
 			media = new AMedia(file.getName(), "html", "text/html", file, false);
 			
-			labelDrill.setVisible(true);
+			if (comboDrill.getItemCount() > 1) {
-			comboDrill.setVisible(true);
+				labelDrill.setVisible(true);
+				comboDrill.setVisible(true);
+			}
 		} else if ("XLS".equals(previewType.getSelectedItem().getValue())) {
 			String path = System.getProperty("java.io.tmpdir");
 			String prefix = makePrefix(m_reportEngine.getName());
@@ -1008,20 +1030,11 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 	 */
 	private void cmd_find()
 	{
-		int AD_Table_ID = m_reportEngine.getPrintFormat().getAD_Table_ID();
-		
 		String title = null; 
 		String tableName = null;
 
-		//	Get Find Tab Info
+		int AD_Table_ID = m_reportEngine.getPrintFormat().getAD_Table_ID();
-		String sql = "SELECT t.AD_Tab_ID "
+		int AD_Tab_ID = getAD_Tab_ID(AD_Table_ID);
-			//	,w.Name, t.Name, w.IsDefault, t.SeqNo, ABS (tt.AD_Window_ID-t.AD_Window_ID)
-			+ "FROM AD_Tab t"
-			+ " INNER JOIN AD_Window w ON (t.AD_Window_ID=w.AD_Window_ID)"
-			+ " INNER JOIN AD_Table tt ON (t.AD_Table_ID=tt.AD_Table_ID) "
-			+ "WHERE tt.AD_Table_ID=? "
-			+ "ORDER BY w.IsDefault DESC, t.SeqNo, ABS (tt.AD_Window_ID-t.AD_Window_ID)";
-		int AD_Tab_ID = DB.getSQLValue(null, sql, AD_Table_ID);
 		// ASP
 		MClient client = MClient.get(Env.getCtx());
 		String ASPFilter = "";
@@ -1060,10 +1073,13 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 				+ "             AND ce.AD_Field_ID IS NULL "
 				+ "             AND ce.ASP_Status = 'H')"; // Hide
 		//
-		sql = "SELECT Name, TableName FROM AD_Tab_v WHERE AD_Tab_ID=? " + ASPFilter;
+		String sql = null;
-		if (!Env.isBaseLanguage(Env.getCtx(), "AD_Tab"))
+		if (!Env.isBaseLanguage(Env.getCtx(), "AD_Tab")) {
 			sql = "SELECT Name, TableName FROM AD_Tab_vt WHERE AD_Tab_ID=?"
-				+ " AND AD_Language='" + Env.getAD_Language(Env.getCtx()) + "' " + ASPFilter;
+					+ " AND AD_Language='" + Env.getAD_Language(Env.getCtx()) + "' " + ASPFilter;
+		} else {
+			sql = "SELECT Name, TableName FROM AD_Tab_v WHERE AD_Tab_ID=? " + ASPFilter;
+		}
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		try
@@ -1080,7 +1096,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
 		}
 		catch (SQLException e)
 		{
-			log.log(Level.SEVERE, sql, e);
+			throw new DBException(e);
 		}
 		finally
 		{

org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java

@@ -26,6 +26,7 @@ import org.compiere.model.MOrder;
 import org.compiere.model.MPayment;
 import org.compiere.model.MPaymentProcessor;
 import org.compiere.model.MPaymentTransaction;
+import org.compiere.model.MPaymentValidate;
 import org.compiere.process.DocAction;
 import org.compiere.util.Env;
 import org.compiere.util.Msg;
@@ -392,16 +393,16 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
 		return true;
 	}
 	
-	public boolean processOnline(String CCType, String CCNumber, String CCExp)
+	public boolean processOnline(String CCType, String CCNumber, String CCVV, String CCExp)
 	{
-		return processOnline(CCType, CCNumber, CCExp, 0);
+		return processOnline(CCType, CCNumber, CCVV, CCExp, 0);
 	}
 	
-	public boolean processOnline(String CCType, String CCNumber, String CCExp, int C_PaymentProcessor_ID)
+	public boolean processOnline(String CCType, String CCNumber, String CCVV, String CCExp, int C_PaymentProcessor_ID)
 	{
 		processMsg = null;
 		boolean error = false;
-
+		
 		int C_Order_ID = Env.getContextAsInt(Env.getCtx(), getWindowNo(), "C_Order_ID");
 		int C_Invoice_ID = Env.getContextAsInt(Env.getCtx(), getWindowNo(), "C_Invoice_ID");
 		if (C_Invoice_ID == 0 && m_DocStatus.equals(MInvoice.DOCSTATUS_Completed))
@@ -430,7 +431,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
 		
 		MPaymentTransaction mpt = new MPaymentTransaction(Env.getCtx(), 0, null);
 		mpt.setAD_Org_ID(m_AD_Org_ID);
-		mpt.setCreditCard(MPayment.TRXTYPE_Sales, CCType, CCNumber, "", CCExp);
+		mpt.setCreditCard(MPayment.TRXTYPE_Sales, CCType, CCNumber, CCVV != null ? CCVV : "", CCExp);
 		mpt.setAmount(m_C_Currency_ID, payAmount);
 		mpt.setC_PaymentProcessor_ID(C_PaymentProcessor_ID);
 		mpt.setPaymentProcessor();
@@ -461,10 +462,20 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
 		mpt.setC_Invoice_ID(C_Invoice_ID);
 		mpt.setDateTrx(m_DateAcct);
 		setCustomizeValues(mpt);
+		
+		// validate credit card
+		String msg = validateCreditCard(CCType, CCNumber, CCVV != null ? CCVV : "", CCExp, mpt.getC_BP_BankAccount_ID(), mpt.getCustomerPaymentProfileID());
+		if (msg != null && msg.trim().length() > 0)
+		{
+			processMsg = Msg.getMsg(Env.getCtx(), msg);
+			return false;
+		}
+		
 		if (!mpt.save()) {
 			processMsg = Msg.getMsg(Env.getCtx(), "PaymentNotCreated");
 			return false;
 		} else {
+			mpt.setCreditCardVV(CCVV != null ? CCVV : "");
 			approved = mpt.processOnline();
 			mpt.saveEx();
 			
@@ -507,4 +518,23 @@ public abstract class PaymentFormCreditCard extends PaymentForm {
 	public boolean isApproved() {
 		return m_mPayment.isApproved();
 	}
+	
+	public String validateCreditCard(String CCType, String CCNumber, String CCVV, String CCExp, int C_BP_BankAccount_ID, String CustomerPaymentProfileID) throws IllegalArgumentException {
+		String msg = null;
+		if (C_BP_BankAccount_ID != 0 || (CustomerPaymentProfileID != null && CustomerPaymentProfileID.length() > 0))
+			return msg;
+		msg = MPaymentValidate.validateCreditCardNumber(CCNumber, CCType);
+		if (msg != null && msg.length() > 0)
+			return Msg.getMsg(Env.getCtx(), msg);
+		msg = MPaymentValidate.validateCreditCardExp(MPaymentValidate.getCreditCardExpMM(CCExp), MPaymentValidate.getCreditCardExpYY(CCExp));
+		if (msg != null && msg.length() > 0)
+			return Msg.getMsg(Env.getCtx(), msg);
+		if (CCVV != null && CCVV.length() > 0)
+		{
+			msg = MPaymentValidate.validateCreditCardVV(CCVV, CCType);
+			if (msg != null && msg.length() > 0)
+				return Msg.getMsg(Env.getCtx(), msg);
+		}
+		return msg;
+	}
 }

org.idempiere.webservices/WEB-INF/src/org/idempiere/adinterface/ModelADServiceImpl.java

@@ -45,6 +45,7 @@ import javax.xml.ws.WebServiceContext;
 import org.apache.xmlbeans.StringEnumAbstractBase.Table;
 import org.compiere.model.Lookup;
 import org.compiere.model.MColumn;
+import org.compiere.model.MLookup;
 import org.compiere.model.MLookupFactory;
 import org.compiere.model.MRefTable;
 import org.compiere.model.MRole;
@@ -57,7 +58,9 @@ import org.compiere.model.X_WS_WebServiceFieldInput;
 import org.compiere.model.X_WS_WebService_Para;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
 import org.compiere.util.Env;
+import org.compiere.util.KeyNamePair;
 import org.compiere.util.Trx;
 import org.compiere.util.Util;
 import org.compiere.util.ValueNamePair;
@@ -1071,11 +1074,38 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic
 						"LookupResolutionFailed"));
 			}
 			
-			String sql = ADLookup.getDirectAccessSQL(lookup, lookupValue.toUpperCase());
+			int AD_Reference_ID = 0;
-			int id = DB.getSQLValue(localTrxName, sql); 
+			if(lookup instanceof MLookup){
-			if (id > 0)
+				AD_Reference_ID = ((MLookup)lookup).getDisplayType();
-				value = id;
+			}
-
+			
+			if(AD_Reference_ID==DisplayType.List)
+			{
+				if (lookup.getSize() == 0)
+					lookup.refresh();
+				Object[] list = lookup.getData(true, true, true, false,false).toArray(); // IDEMPIERE 90
+	
+				for (Object pair : list) {
+					if (pair instanceof KeyNamePair) {
+						KeyNamePair p = (KeyNamePair) pair;
+						if (p.getName().equalsIgnoreCase(lookupValue)) {
+							value = p.getID();
+							break;
+						}
+					} else {
+						ValueNamePair p = (ValueNamePair) pair;
+						if (p.getName().equalsIgnoreCase(lookupValue)) {
+							value = p.getValue();
+							break;
+						}
+					}
+				}
+			}else{
+				String sql = ADLookup.getDirectAccessSQL(lookup, lookupValue.toUpperCase());
+				int id = DB.getSQLValue(localTrxName, sql); 
+				if (id > 0)
+					value = id;
+			}
 			if (value == null) {
 				throw new IdempiereServiceFault(" Invalid Lookup value:" + lookupValue, new QName("LookupResolutionFailed"));
 			}

org.idempiere.webservices/testScripts/idempiere-composite-soapui-project.xml

@@ -557,6 +557,7 @@
                         <_0:field column="C_DocTypeTarget_ID">
                            <_0:val>132</_0:val>
                         </_0:field>
+                        <_0:field column="FreightCostRule" lval="Freight included"/>
                         <_0:field column="FreightAmt">
                            <_0:val>6</_0:val>
                         </_0:field>
@@ -647,4 +648,4 @@
          </_0:CompositeRequest>
       </_0:compositeOperation>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/CompositeService/compositeOperation"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://idempiere.org/ADInterface/1_0/CompositeService/compositeOperation"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>