From 60d2583f21b01595cb67eaf8bc16fcd18644fee6 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 28 May 2014 14:49:27 -0500 Subject: [PATCH] IDEMPIERE-1334 Run one or more processes from Info Window / peer review - work in progress --- .../oracle/201405261604_IDEMPIERE-1334.sql | 49 ++++++++-------- .../201405261604_IDEMPIERE-1334.sql | 57 +++++++------------ .../src/org/adempiere/model/MInfoProcess.java | 9 +-- .../org/compiere/model/I_AD_InfoProcess.java | 8 +-- .../org/compiere/model/I_AD_InfoWindow.java | 13 ----- .../src/org/compiere/model/MInfoWindow.java | 3 +- .../src/org/compiere/model/MSysConfig.java | 4 +- .../org/compiere/model/X_AD_InfoProcess.java | 24 ++++---- .../org/compiere/model/X_AD_InfoWindow.java | 26 +-------- .../webui/apps/AbstractProcessDialog.java | 4 +- .../webui/component/ConfirmPanel.java | 3 +- .../adempiere/webui/component/WListbox.java | 4 +- .../webui/desktop/DefaultDesktop.java | 2 +- .../org/adempiere/webui/info/InfoWindow.java | 27 ++------- .../org/adempiere/webui/panel/InfoPanel.java | 2 +- 15 files changed, 79 insertions(+), 156 deletions(-) diff --git a/migration/i2.0z/oracle/201405261604_IDEMPIERE-1334.sql b/migration/i2.0z/oracle/201405261604_IDEMPIERE-1334.sql index 95918b6808..8eeddb55ce 100644 --- a/migration/i2.0z/oracle/201405261604_IDEMPIERE-1334.sql +++ b/migration/i2.0z/oracle/201405261604_IDEMPIERE-1334.sql @@ -2,7 +2,7 @@ SET SQLBLANKLINES ON SET DEFINE OFF -- May 26, 2014 10:31:26 PM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-1334 Run one or more processes from Info Window INSERT INTO AD_Table (ImportTable,CopyColumnsFromTable,IsSecurityEnabled,AccessLevel,LoadSeq,AD_Window_ID,AD_Table_ID,IsHighVolume,IsView,IsChangeLog,EntityType,ReplicationType,AD_Table_UU,IsCentrallyMaintained,IsDeleteable,TableName,Description,Name,IsActive,AD_Org_ID,CreatedBy,Updated,UpdatedBy,Processing,DatabaseViewDrop,AD_Client_ID,Created) VALUES ('N','N','N','4',0,385,200129,'N','N','Y','D','L','399fcb47-f46c-4789-9e45-962cc5379c16','Y','Y','AD_InfoProcess','define process for info window','Info Process','Y',0,100,TO_DATE('2014-05-26 22:31:25','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,TO_DATE('2014-05-26 22:31:25','YYYY-MM-DD HH24:MI:SS')) ; @@ -154,43 +154,43 @@ ALTER TABLE AD_InfoProcess ADD Help VARCHAR2(2000) DEFAULT NULL ; -- May 26, 2014 10:31:41 PM ICT -INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,Name,Description,PrintName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType,Created,Updated) VALUES ('LayoutType',202714,'Process info can display as button list, drop down list, dialog button,...','LayoutType','Layout type of info process','Layout Type','913eafda-0cdc-4c44-85f8-487d77a3787c',0,100,100,'Y',0,'D',TO_DATE('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS')) +INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,Name,Description,PrintName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType,Created,Updated) VALUES ('LayoutType',202714,'Process info can display as button, list, menu','LayoutType','Layout type of info process','Layout Type','913eafda-0cdc-4c44-85f8-487d77a3787c',0,100,100,'Y',0,'D',TO_DATE('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS')) ; -- May 26, 2014 10:31:42 PM ICT -INSERT INTO AD_Reference (AD_Reference_ID,Name,EntityType,AD_Reference_UU,IsOrderByValue,Description,ValidationType,AD_Org_ID,CreatedBy,Updated,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (200083,'ad_info_process layout type','D','2171ebd2-e11a-4612-9885-128f155d65e8','N','define layout type of info process button','L',0,100,TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),'Y',TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,0) +INSERT INTO AD_Reference (AD_Reference_ID,Name,EntityType,AD_Reference_UU,IsOrderByValue,Description,ValidationType,AD_Org_ID,CreatedBy,Updated,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (200083,'AD_InfoProcess LayoutType','D','2171ebd2-e11a-4612-9885-128f155d65e8','N','Define layout type of info process button','L',0,100,TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),'Y',TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,0) ; -- May 26, 2014 10:31:43 PM ICT -INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200185,200083,'info process display as muilti buttons','Button','6884dcd1-bc9a-4d16-9b2c-fe40968747f8','Button',TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200185,200083,'Display as button','Button','6884dcd1-bc9a-4d16-9b2c-fe40968747f8','B',TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) ; -- May 26, 2014 10:31:44 PM ICT -INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200186,200083,'Each info process is a menu item, when click a button process, this menu is show','Menu','7b539591-296a-43ee-916c-c87c35acc84d','Menu',TO_DATE('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200186,200083,'Display as menu on a gear button','Menu','7b539591-296a-43ee-916c-c87c35acc84d','M',TO_DATE('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) ; -- May 26, 2014 10:31:44 PM ICT -INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200187,200083,'info process is display as drop down list','Drop List','ff0cba3e-e82c-4aa8-9f9b-bedf681b822d','Drop List',TO_DATE('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200187,200083,'Display as list','List','ff0cba3e-e82c-4aa8-9f9b-bedf681b822d','L',TO_DATE('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) ; -- May 26, 2014 10:31:45 PM ICT -INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,'Y',0,211257,'N','N','N',0,'N',10,'N','N','N','Y','a0e8f5b5-ac5f-44ba-a2c9-060dd3231c4e','Y','LayoutType','Layout type of info process','Process info can display as button list, drop down list, dialog button,...','LayoutType','Y',TO_DATE('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',202714,17,200083,200129) +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,'Y',0,211257,'N','N','N',0,'N',1,'N','N','N','Y','a0e8f5b5-ac5f-44ba-a2c9-060dd3231c4e','Y','LayoutType','Layout type of info process','Process info can display as button, list, menu','LayoutType','Y',TO_DATE('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',202714,17,200083,200129) ; -- May 26, 2014 10:31:45 PM ICT -ALTER TABLE AD_InfoProcess ADD LayoutType VARCHAR2(10) DEFAULT NULL +ALTER TABLE AD_InfoProcess ADD LayoutType VARCHAR2(1) DEFAULT NULL ; --- May 26, 2014 10:31:46 PM ICT -INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,'Y',0,211258,'N','N','N',0,'N',10,'N','N','N','Y','663fed7f-bda5-4602-9e9a-b2a45c02020c','Y','LayoutType','Layout type of info process','Process info can display as button list, drop down list, dialog button,...','LayoutType','Y',TO_DATE('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',202714,17,200083,895) +-- 28/05/2014 01:24:40 PM COT +UPDATE AD_Column SET IsMandatory='Y', DefaultValue='B',Updated=TO_DATE('2014-05-28 13:24:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211257 ; --- May 26, 2014 10:31:46 PM ICT -ALTER TABLE AD_InfoWindow ADD LayoutType VARCHAR2(10) DEFAULT NULL +-- 28/05/2014 01:24:44 PM COT +ALTER TABLE AD_InfoProcess MODIFY LayoutType VARCHAR2(10) DEFAULT 'B' ; --- May 26, 2014 10:31:47 PM ICT -INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',842,0,'N','N',220,'Y',203025,'N','Process info can display as button list, drop down list, dialog button,...','Layout type of info process','LayoutType','f447274d-3c6b-42e1-a2ae-85f641a91a2c','Y','N',100,0,100,TO_DATE('2014-05-26 22:31:47','YYYY-MM-DD HH24:MI:SS'),'Y','Y',130,1,'N',0,1,1,'N','N',211258,'D',TO_DATE('2014-05-26 22:31:47','YYYY-MM-DD HH24:MI:SS')) +-- 28/05/2014 01:24:44 PM COT +ALTER TABLE AD_InfoProcess MODIFY LayoutType NOT NULL ; -- May 26, 2014 10:31:48 PM ICT @@ -242,7 +242,7 @@ INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,S ; -- May 26, 2014 10:31:56 PM ICT -INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',200142,0,'N','N',100,'Y',203037,'N','Process info can display as button list, drop down list, dialog button,...','Layout type of info process','LayoutType','106b208d-b39b-4ab0-b839-7d0c95951bea','Y','N',100,0,100,TO_DATE('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS'),'Y','Y',90,1,'N',0,2,1,'N','N',211257,'D',TO_DATE('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS')) +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',200142,0,'N','N',100,'Y',203037,'N','Process info can display as button, list, menu','Layout type of info process','LayoutType','106b208d-b39b-4ab0-b839-7d0c95951bea','Y','N',100,0,100,TO_DATE('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS'),'Y','Y',90,1,'N',0,2,1,'N','N',211257,'D',TO_DATE('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS')) ; -- May 26, 2014 10:31:57 PM ICT @@ -252,13 +252,16 @@ There are two reasons for de-activating and not deleting records: (2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are invoices for this partner record existing. You de-activate the Business Partner and prevent that this record is used for future entries.','The record is active in the system','Active','e45bfa22-f210-4a87-9b0c-b3ab2da35161','Y','N',100,0,100,TO_DATE('2014-05-26 22:31:56','YYYY-MM-DD HH24:MI:SS'),'Y','Y',70,5,'N',0,2,1,'N','N',211245,'D',TO_DATE('2014-05-26 22:31:56','YYYY-MM-DD HH24:MI:SS')) ; - -- migrate for anyone use red1 process in info panel start --- MISS SCRIPT THAN POSTGRES +INSERT INTO AD_InfoProcess +(ad_infoprocess_id, ad_infowindow_id, ad_client_id, ad_org_id, isactive,createdby, updatedby, seqno, name, ad_process_id, description, help, ad_infoprocess_uu) +(SELECT nextidfunc(200176,'N'), ad_infowindow_id, iw.ad_client_id, iw.ad_org_id, 'Y', 100, 100, 10, pr.name, iw.ad_process_id, pr.description, pr.help, generate_uuid() +FROM ad_infowindow iw INNER JOIN ad_process pr ON pr.ad_process_ID = iw.ad_process_ID +WHERE iw.ad_process_ID IS NOT NULL +); -- May 23, 2014 4:01:30 PM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator -DELETE FROM AD_Field_Trl WHERE AD_Field_ID=202596 +DELETE FROM AD_Field_Trl WHERE AD_Field_ID=202596 ; -- May 23, 2014 4:01:30 PM ICT @@ -266,14 +269,8 @@ DELETE FROM AD_Field WHERE AD_Field_ID=202596 ; -- May 23, 2014 4:01:51 PM ICT -DELETE FROM AD_Column_Trl WHERE AD_Column_ID=210944 +UPDATE AD_Column SET IsActive='N' WHERE AD_Column_ID=210944 ; --- May 23, 2014 4:01:51 PM ICT -DELETE FROM AD_Column WHERE AD_Column_ID=210944 -; - --- migrate for anyone use red1 process in info panel end - SELECT register_migration_script('201405261604_IDEMPIERE-1334.sql') FROM dual ; diff --git a/migration/i2.0z/postgresql/201405261604_IDEMPIERE-1334.sql b/migration/i2.0z/postgresql/201405261604_IDEMPIERE-1334.sql index a2aeecf073..efa6450cda 100644 --- a/migration/i2.0z/postgresql/201405261604_IDEMPIERE-1334.sql +++ b/migration/i2.0z/postgresql/201405261604_IDEMPIERE-1334.sql @@ -1,5 +1,5 @@ -- May 26, 2014 10:31:26 PM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator +-- IDEMPIERE-1334 Run one or more processes from Info Window INSERT INTO AD_Table (ImportTable,CopyColumnsFromTable,IsSecurityEnabled,AccessLevel,LoadSeq,AD_Window_ID,AD_Table_ID,IsHighVolume,IsView,IsChangeLog,EntityType,ReplicationType,AD_Table_UU,IsCentrallyMaintained,IsDeleteable,TableName,Description,Name,IsActive,AD_Org_ID,CreatedBy,Updated,UpdatedBy,Processing,DatabaseViewDrop,AD_Client_ID,Created) VALUES ('N','N','N','4',0,385,200129,'N','N','Y','D','L','399fcb47-f46c-4789-9e45-962cc5379c16','Y','Y','AD_InfoProcess','define process for info window','Info Process','Y',0,100,TO_TIMESTAMP('2014-05-26 22:31:25','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,TO_TIMESTAMP('2014-05-26 22:31:25','YYYY-MM-DD HH24:MI:SS')) ; @@ -151,43 +151,43 @@ ALTER TABLE AD_InfoProcess ADD COLUMN Help VARCHAR(2000) DEFAULT NULL ; -- May 26, 2014 10:31:41 PM ICT -INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,Name,Description,PrintName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType,Created,Updated) VALUES ('LayoutType',202714,'Process info can display as button list, drop down list, dialog button,...','LayoutType','Layout type of info process','Layout Type','913eafda-0cdc-4c44-85f8-487d77a3787c',0,100,100,'Y',0,'D',TO_TIMESTAMP('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS')) +INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,Name,Description,PrintName,AD_Element_UU,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType,Created,Updated) VALUES ('LayoutType',202714,'Process info can display as button, list, menu','LayoutType','Layout type of info process','Layout Type','913eafda-0cdc-4c44-85f8-487d77a3787c',0,100,100,'Y',0,'D',TO_TIMESTAMP('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2014-05-26 22:31:41','YYYY-MM-DD HH24:MI:SS')) ; -- May 26, 2014 10:31:42 PM ICT -INSERT INTO AD_Reference (AD_Reference_ID,Name,EntityType,AD_Reference_UU,IsOrderByValue,Description,ValidationType,AD_Org_ID,CreatedBy,Updated,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (200083,'ad_info_process layout type','D','2171ebd2-e11a-4612-9885-128f155d65e8','N','define layout type of info process button','L',0,100,TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),'Y',TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,0) +INSERT INTO AD_Reference (AD_Reference_ID,Name,EntityType,AD_Reference_UU,IsOrderByValue,Description,ValidationType,AD_Org_ID,CreatedBy,Updated,IsActive,Created,UpdatedBy,AD_Client_ID) VALUES (200083,'AD_InfoProcess LayoutType','D','2171ebd2-e11a-4612-9885-128f155d65e8','N','Define layout type of info process button','L',0,100,TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),'Y',TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,0) ; -- May 26, 2014 10:31:43 PM ICT -INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200185,200083,'info process display as muilti buttons','Button','6884dcd1-bc9a-4d16-9b2c-fe40968747f8','Button',TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200185,200083,'Display as button','Button','6884dcd1-bc9a-4d16-9b2c-fe40968747f8','B',TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-05-26 22:31:42','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) ; -- May 26, 2014 10:31:44 PM ICT -INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200186,200083,'Each info process is a menu item, when click a button process, this menu is show','Menu','7b539591-296a-43ee-916c-c87c35acc84d','Menu',TO_TIMESTAMP('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200186,200083,'Display as menu on a gear button','Menu','7b539591-296a-43ee-916c-c87c35acc84d','M',TO_TIMESTAMP('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-05-26 22:31:43','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) ; -- May 26, 2014 10:31:44 PM ICT -INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200187,200083,'info process is display as drop down list','Drop List','ff0cba3e-e82c-4aa8-9f9b-bedf681b822d','Drop List',TO_TIMESTAMP('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) +INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,EntityType,AD_Client_ID,AD_Org_ID) VALUES (200187,200083,'Display as list','List','ff0cba3e-e82c-4aa8-9f9b-bedf681b822d','L',TO_TIMESTAMP('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2014-05-26 22:31:44','YYYY-MM-DD HH24:MI:SS'),100,'Y','D',0,0) ; -- May 26, 2014 10:31:45 PM ICT -INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,'Y',0,211257,'N','N','N',0,'N',10,'N','N','N','Y','a0e8f5b5-ac5f-44ba-a2c9-060dd3231c4e','Y','LayoutType','Layout type of info process','Process info can display as button list, drop down list, dialog button,...','LayoutType','Y',TO_TIMESTAMP('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',202714,17,200083,200129) +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,'Y',0,211257,'N','N','N',0,'N',1,'N','N','N','Y','a0e8f5b5-ac5f-44ba-a2c9-060dd3231c4e','Y','LayoutType','Layout type of info process','Process info can display as button, list, menu','LayoutType','Y',TO_TIMESTAMP('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',202714,17,200083,200129) ; -- May 26, 2014 10:31:45 PM ICT -ALTER TABLE AD_InfoProcess ADD COLUMN LayoutType VARCHAR(10) DEFAULT NULL +ALTER TABLE AD_InfoProcess ADD COLUMN LayoutType VARCHAR(1) DEFAULT NULL ; --- May 26, 2014 10:31:46 PM ICT -INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,IsSecure,FKConstraintType,AD_Element_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID) VALUES (0,'Y',0,211258,'N','N','N',0,'N',10,'N','N','N','Y','663fed7f-bda5-4602-9e9a-b2a45c02020c','Y','LayoutType','Layout type of info process','Process info can display as button list, drop down list, dialog button,...','LayoutType','Y',TO_TIMESTAMP('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2014-05-26 22:31:45','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N','N','N',202714,17,200083,895) +-- 28/05/2014 01:24:40 PM COT +UPDATE AD_Column SET IsMandatory='Y', DefaultValue='B',Updated=TO_TIMESTAMP('2014-05-28 13:24:40','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=211257 ; --- May 26, 2014 10:31:46 PM ICT -ALTER TABLE AD_InfoWindow ADD COLUMN LayoutType VARCHAR(10) DEFAULT NULL +-- 28/05/2014 01:24:44 PM COT +INSERT INTO t_alter_column values('ad_infoprocess','LayoutType','VARCHAR(10)',null,'B') ; --- May 26, 2014 10:31:47 PM ICT -INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',842,0,'N','N',220,'Y',203025,'N','Process info can display as button list, drop down list, dialog button,...','Layout type of info process','LayoutType','f447274d-3c6b-42e1-a2ae-85f641a91a2c','Y','N',100,0,100,TO_TIMESTAMP('2014-05-26 22:31:47','YYYY-MM-DD HH24:MI:SS'),'Y','Y',130,1,'N',0,1,1,'N','N',211258,'D',TO_TIMESTAMP('2014-05-26 22:31:47','YYYY-MM-DD HH24:MI:SS')) +-- 28/05/2014 01:24:44 PM COT +INSERT INTO t_alter_column values('ad_infoprocess','LayoutType',null,'NOT NULL',null) ; -- May 26, 2014 10:31:48 PM ICT @@ -239,7 +239,7 @@ INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,S ; -- May 26, 2014 10:31:56 PM ICT -INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',200142,0,'N','N',100,'Y',203037,'N','Process info can display as button list, drop down list, dialog button,...','Layout type of info process','LayoutType','106b208d-b39b-4ab0-b839-7d0c95951bea','Y','N',100,0,100,TO_TIMESTAMP('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS'),'Y','Y',90,1,'N',0,2,1,'N','N',211257,'D',TO_TIMESTAMP('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS')) +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,AD_Client_ID,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Column_ID,EntityType,Created) VALUES (0,'N',200142,0,'N','N',100,'Y',203037,'N','Process info can display as button, list, menu','Layout type of info process','LayoutType','106b208d-b39b-4ab0-b839-7d0c95951bea','Y','N',100,0,100,TO_TIMESTAMP('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS'),'Y','Y',90,1,'N',0,2,1,'N','N',211257,'D',TO_TIMESTAMP('2014-05-26 22:31:55','YYYY-MM-DD HH24:MI:SS')) ; -- May 26, 2014 10:31:57 PM ICT @@ -252,22 +252,12 @@ There are two reasons for de-activating and not deleting records: -- migrate for anyone use red1 process in info panel start INSERT INTO AD_InfoProcess (ad_infoprocess_id, ad_infowindow_id, ad_client_id, ad_org_id, isactive,createdby, updatedby, seqno, name, ad_process_id, description, help, ad_infoprocess_uu) - -(SELECT - (SELECT max (ad_infoprocess_id) + 1 FROM ad_infoprocess), ad_infowindow_id, iw.ad_client_id, iw.ad_org_id, 'Y', 100, 100, 10, pr.name, iw.ad_process_id, pr.description, pr.help, generate_uuid() -FROM - ad_infowindow iw INNER JOIN ad_process pr ON pr.ad_process_ID = iw.ad_process_ID -WHERE - iw.ad_process_ID IS NOT NULL +(SELECT nextidfunc(200176,'N'), ad_infowindow_id, iw.ad_client_id, iw.ad_org_id, 'Y', 100, 100, 10, pr.name, iw.ad_process_id, pr.description, pr.help, generate_uuid() +FROM ad_infowindow iw INNER JOIN ad_process pr ON pr.ad_process_ID = iw.ad_process_ID +WHERE iw.ad_process_ID IS NOT NULL ); -UPDATE ad_sequence - SET currentnext = (SELECT max (ad_infoprocess_id) + 1 FROM ad_infoprocess) -WHERE - name = 'AD_InfoProcess' AND EXISTS (SELECT * FROM ad_infoprocess); - -- May 23, 2014 4:01:30 PM ICT --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator DELETE FROM AD_Field_Trl WHERE AD_Field_ID=202596 ; @@ -276,17 +266,8 @@ DELETE FROM AD_Field WHERE AD_Field_ID=202596 ; -- May 23, 2014 4:01:51 PM ICT -DELETE FROM AD_Column_Trl WHERE AD_Column_ID=210944 +UPDATE AD_Column SET IsActive='N' WHERE AD_Column_ID=210944 ; --- May 23, 2014 4:01:51 PM ICT -DELETE FROM AD_Column WHERE AD_Column_ID=210944 -; - - -ALTER TABLE ad_infowindow DROP COLUMN ad_process_id; - --- migrate for anyone use red1 process in info panel end - SELECT register_migration_script('201405261604_IDEMPIERE-1334.sql') FROM dual ; diff --git a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java index 9758877567..101eb3f568 100644 --- a/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java +++ b/org.adempiere.base/src/org/adempiere/model/MInfoProcess.java @@ -25,12 +25,11 @@ import org.compiere.model.X_AD_InfoProcess; * */ public class MInfoProcess extends X_AD_InfoProcess { - /** * */ - private static final long serialVersionUID = -819673985356394056L; - + private static final long serialVersionUID = 4978433930748011554L; + /** * {@inheritDoc} * @param ctx @@ -53,8 +52,4 @@ public class MInfoProcess extends X_AD_InfoProcess { } - public static final String INFO_PROCESS_LAYOUT_TYPE_menu = "Menu"; - public static final String INFO_PROCESS_LAYOUT_TYPE_bt = "Button"; - public static final String INFO_PROCESS_LAYOUT_TYPE_drop_list = "Drop List"; - } diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java index 464078a763..5447ba5e7e 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoProcess.java @@ -30,8 +30,8 @@ public interface I_AD_InfoProcess /** TableName=AD_InfoProcess */ public static final String Table_Name = "AD_InfoProcess"; - /** AD_Table_ID=1000000 */ - public static final int Table_ID = MTable.getTable_ID(Table_Name); + /** AD_Table_ID=200129 */ + public static final int Table_ID = 200129; KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); @@ -181,12 +181,12 @@ public interface I_AD_InfoProcess /** Column name LayoutType */ public static final String COLUMNNAME_LayoutType = "LayoutType"; - /** Set Layout Type. + /** Set LayoutType. * Layout type of info process */ public void setLayoutType (String LayoutType); - /** Get Layout Type. + /** Get LayoutType. * Layout type of info process */ public String getLayoutType(); diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java index 8d7717cdca..d0b848e1b6 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java @@ -258,19 +258,6 @@ public interface I_AD_InfoWindow */ public boolean isValid(); - /** Column name LayoutType */ - public static final String COLUMNNAME_LayoutType = "LayoutType"; - - /** Set Layout Type. - * Layout type of info process - */ - public void setLayoutType (String LayoutType); - - /** Get Layout Type. - * Layout type of info process - */ - public String getLayoutType(); - /** Column name MaxQueryRecords */ public static final String COLUMNNAME_MaxQueryRecords = "MaxQueryRecords"; diff --git a/org.adempiere.base/src/org/compiere/model/MInfoWindow.java b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java index e5ba927b71..ee9a3b7d67 100644 --- a/org.adempiere.base/src/org/compiere/model/MInfoWindow.java +++ b/org.adempiere.base/src/org/compiere/model/MInfoWindow.java @@ -19,7 +19,6 @@ package org.compiere.model; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; @@ -43,7 +42,7 @@ public class MInfoWindow extends X_AD_InfoWindow /** * */ - private static final long serialVersionUID = -4228782755777501270L; + private static final long serialVersionUID = -3099366897275960300L; /** * Standard Constructor diff --git a/org.adempiere.base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java index 52831db1ed..8f628ff26d 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 = -2008818748067665365L; + private static final long serialVersionUID = 8799369533278239017L; public final static String PDF_FONT_DIR = "PDF_FONT_DIR"; public final static String TWOPACK_HANDLE_TRANSLATIONS = "2PACK_HANDLE_TRANSLATIONS"; @@ -130,8 +130,6 @@ public class MSysConfig extends X_AD_SysConfig public static final String BACKGROUND_JOB_MAX_PER_USER = "BACKGROUND_JOB_MAX_PER_USER"; public static final String DPVIEWS_SHOWINFOACCOUNT = "DPViews_ShowInfoAccount"; public static final String DPVIEWS_SHOWINFOSCHEDULE = "DPViews_ShowInfoSchedule"; - // setting key for default value of info process layout - public static final String INFO_PROCESS_LAYOUT_DEFAULT = "PROCESS_BUTTON_LAYOUT"; /** * Standard Constructor diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java index 8b9a6e0fb6..cae0406839 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoProcess.java @@ -29,7 +29,7 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste /** * */ - private static final long serialVersionUID = 20140523L; + private static final long serialVersionUID = 20140528L; /** Standard Constructor */ public X_AD_InfoProcess (Properties ctx, int AD_InfoProcess_ID, String trxName) @@ -40,6 +40,8 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste setAD_InfoProcess_ID (0); setAD_InfoProcess_UU (null); setAD_Process_ID (0); + setLayoutType (null); +// B setName (null); setSeqNo (0); // @SQL=SELECT NVL(MAX(SeqNo),0)+10 AS DefaultValue FROM AD_InfoProcess WHERE AD_InfoWindow_ID=@AD_InfoWindow_ID@ @@ -204,7 +206,7 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste */ public void setImageURL (String ImageURL) { - set_ValueNoCheck (COLUMNNAME_ImageURL, ImageURL); + set_Value (COLUMNNAME_ImageURL, ImageURL); } /** Get Image URL. @@ -215,13 +217,15 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste return (String)get_Value(COLUMNNAME_ImageURL); } - /** button list = bt list */ - public static final String LAYOUTTYPE_ButtonList = "bt list"; - /** drop down list = drop list */ - public static final String LAYOUTTYPE_DropDownList = "drop list"; - /** button dialog = bt dialog */ - public static final String LAYOUTTYPE_ButtonDialog = "bt dialog"; - /** Set Layout Type. + /** LayoutType AD_Reference_ID=200083 */ + public static final int LAYOUTTYPE_AD_Reference_ID=200083; + /** Button = B */ + public static final String LAYOUTTYPE_Button = "B"; + /** Menu = M */ + public static final String LAYOUTTYPE_Menu = "M"; + /** List = L */ + public static final String LAYOUTTYPE_List = "L"; + /** Set LayoutType. @param LayoutType Layout type of info process */ @@ -231,7 +235,7 @@ public class X_AD_InfoProcess extends PO implements I_AD_InfoProcess, I_Persiste set_Value (COLUMNNAME_LayoutType, LayoutType); } - /** Get Layout Type. + /** Get LayoutType. @return Layout type of info process */ public String getLayoutType () diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java index 335c221533..8d8d8efc40 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java @@ -30,7 +30,7 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent /** * */ - private static final long serialVersionUID = 20140523L; + private static final long serialVersionUID = 20140528L; /** Standard Constructor */ public X_AD_InfoWindow (Properties ctx, int AD_InfoWindow_ID, String trxName) @@ -359,30 +359,6 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent return false; } - /** Button = Button */ - public static final String LAYOUTTYPE_Button = "Button"; - /** Menu = Menu */ - public static final String LAYOUTTYPE_Menu = "Menu"; - /** Drop List = Drop List */ - public static final String LAYOUTTYPE_DropList = "Drop List"; - /** Set Layout Type. - @param LayoutType - Layout type of info process - */ - public void setLayoutType (String LayoutType) - { - - set_Value (COLUMNNAME_LayoutType, LayoutType); - } - - /** Get Layout Type. - @return Layout type of info process - */ - public String getLayoutType () - { - return (String)get_Value(COLUMNNAME_LayoutType); - } - /** Set Max Query Records. @param MaxQueryRecords If defined, you cannot query more records as defined - the query criteria needs to be changed to query less records diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java index ed4c2d45a5..d0331f7974 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java @@ -83,8 +83,8 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI /** * */ - private static final long serialVersionUID = 2190456247109646320L; - + private static final long serialVersionUID = 761285757875594250L; + private static final String ON_COMPLETE = "onComplete"; private static final String ON_STATUS_UPDATE = "onStatusUpdate"; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java index 0109938bfd..09ff75ef3c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/ConfirmPanel.java @@ -40,7 +40,8 @@ public final class ConfirmPanel extends Div /** * */ - private static final long serialVersionUID = -6050634074454659578L; + private static final long serialVersionUID = 3257542169107223645L; + /** Action String OK. */ public static final String A_OK = "Ok"; /** Action String Cancel. */ diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java index d1739bb3f7..e4e8ce0c88 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java @@ -55,11 +55,11 @@ import org.zkoss.zul.ListModel; * @author Sendy Yagambrum */ public class WListbox extends Listbox implements IMiniTable, TableValueChangeListener, WTableModelListener -{ +{ /** * */ - private static final long serialVersionUID = 8717707799347994189L; + private static final long serialVersionUID = -706774424788688953L; /** Logger. */ private static CLogger logger = CLogger.getCLogger(WListbox.class); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java index 4e9d1200de..a40928b7d9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java @@ -104,7 +104,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria /** * */ - private static final long serialVersionUID = -7495898481342426458L; + private static final long serialVersionUID = 4209181029836503344L; private static final String IMAGES_UPARROW_PNG = "images/collapse-header.png"; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 391bea05cd..adda53069c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -57,7 +57,6 @@ import org.compiere.model.MInfoWindow; import org.compiere.model.MLookupFactory; import org.compiere.model.MLookupInfo; import org.compiere.model.MRole; -import org.compiere.model.MSysConfig; import org.compiere.model.MTable; import org.compiere.model.X_AD_InfoColumn; import org.compiere.util.DB; @@ -97,7 +96,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL /** * */ - private static final long serialVersionUID = -5198550045241794995L; + private static final long serialVersionUID = -3154640457502223300L; protected Grid parameterGrid; private Borderlayout layout; @@ -196,28 +195,14 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } MInfoProcess [] infoProcessList = infoWindow.getInfoProcess(false); - // get default value of infoProcessLayout from sysConfig, when no config, select bt_list - String infoProcessLayoutDefault = MSysConfig.getValue(MSysConfig.INFO_PROCESS_LAYOUT_DEFAULT, MInfoProcess.INFO_PROCESS_LAYOUT_TYPE_bt); - - // when default layout set in infowindow use it - if (infoWindow.getLayoutType() != null){ - infoProcessLayoutDefault = infoWindow.getLayoutType(); - } - - // when infoprocess have non layout type, set layout type default for it - for (MInfoProcess infoProcess : infoProcessList){ - if (infoProcess.getLayoutType() == null){ - infoProcess.setLayoutType(infoProcessLayoutDefault); - } - } - + // ** layout info process flow order (button list, drop down, dialog,...) // each layout type in a loop to ensure this order // make list process button for (MInfoProcess infoProcess : infoProcessList){ - // just add info process have layout is bt - if (!MInfoProcess.INFO_PROCESS_LAYOUT_TYPE_bt.equals(infoProcess.getLayoutType())){ + // just add info process have layout is button + if (!MInfoProcess.LAYOUTTYPE_Button.equals(infoProcess.getLayoutType())){ continue; } Button btProcess = confirmPanel.addProcessButton(infoProcess.getName(), infoProcess.getImageURL()); @@ -234,7 +219,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL // filte just infoprocess have layout type is drop list for model of combobox List infoProcessDropList = new ArrayList(); for (MInfoProcess infoProcess : infoProcessList){ - if (!MInfoProcess.INFO_PROCESS_LAYOUT_TYPE_drop_list.equals(infoProcess.getLayoutType())){ + if (!MInfoProcess.LAYOUTTYPE_List.equals(infoProcess.getLayoutType())){ continue; } infoProcessDropList.add(infoProcess); @@ -268,7 +253,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL Menupopup ipMenu = null; for (MInfoProcess infoProcess : infoProcessList){ // just add info process have layout is bt_menu - if (!MInfoProcess.INFO_PROCESS_LAYOUT_TYPE_menu.equals(infoProcess.getLayoutType())){ + if (!MInfoProcess.LAYOUTTYPE_Menu.equals(infoProcess.getLayoutType())){ continue; } 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 a1d28fd06b..b52693ef2b 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 @@ -106,7 +106,7 @@ public abstract class InfoPanel extends Window implements EventListener, /** * */ - private static final long serialVersionUID = 2823393272482373014L; + private static final long serialVersionUID = -8099535175635558899L; private final static int PAGE_SIZE = 100; protected List