From 161faf21998f159bb524791a5391aef156e48c38 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 24 Sep 2019 16:51:33 +0200 Subject: [PATCH] IDEMPIERE-3971 Process Customization / peer review --- .../oracle/201905160920_IDEMPIERE-3971.sql | 14 +---- .../oracle/201909241631_IDEMPIERE-3971.sql | 63 +++++++++++++++++++ .../201905160920_IDEMPIERE-3971.sql | 12 +--- .../201909241631_IDEMPIERE-3971.sql | 60 ++++++++++++++++++ .../src/org/compiere/model/GridFieldVO.java | 3 +- .../org/compiere/model/I_AD_UserDef_Proc.java | 21 ++----- .../model/I_AD_UserDef_Proc_Parameter.java | 25 ++------ .../org/compiere/model/X_AD_UserDef_Proc.java | 43 +++++-------- .../model/X_AD_UserDef_Proc_Parameter.java | 56 +++++------------ 9 files changed, 171 insertions(+), 126 deletions(-) create mode 100644 migration/i6.2z/oracle/201909241631_IDEMPIERE-3971.sql create mode 100644 migration/i6.2z/postgresql/201909241631_IDEMPIERE-3971.sql diff --git a/migration/i6.2z/oracle/201905160920_IDEMPIERE-3971.sql b/migration/i6.2z/oracle/201905160920_IDEMPIERE-3971.sql index 99d7b60c19..d66919f1ec 100644 --- a/migration/i6.2z/oracle/201905160920_IDEMPIERE-3971.sql +++ b/migration/i6.2z/oracle/201905160920_IDEMPIERE-3971.sql @@ -1,10 +1,9 @@ SET SQLBLANKLINES ON SET DEFINE OFF -alter table ad_table add column cof_Processing varchar(1); -- Development of Process Customization -- 24/11/2017 9h47min49s BRST -INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView,cof_Processing) VALUES (200232,'User defined Process','User defined Process','User defined Process','AD_UserDef_Proc',0,'3',0,0,'Y',TO_DATE('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','33449b20-f6cc-4e48-afad-bcbe5d0dd92e','N','N','N','N') +INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView) VALUES (200232,'User defined Process','User defined Process','User defined Process','AD_UserDef_Proc',0,'3',0,0,'Y',TO_DATE('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','33449b20-f6cc-4e48-afad-bcbe5d0dd92e','N','N','N') ; -- 24/11/2017 9h47min49s BRST @@ -255,7 +254,7 @@ ALTER TABLE AD_UserDef_Proc ADD IsUserUpdateable CHAR(1) DEFAULT NULL CHECK (Is ; -- 24/11/2017 10h45min14s BRST -INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView,cof_Processing) VALUES (200233,'User defined Process Parameter','User defined Process Parameter','User defined Process Parameter','AD_UserDef_Proc_Parameter',0,'3',0,0,'Y',TO_DATE('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','cf6639d3-ed90-4fe4-9b52-9f323f7c0677','N','N','N','N') +INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView) VALUES (200233,'User defined Process Parameter','User defined Process Parameter','User defined Process Parameter','AD_UserDef_Proc_Parameter',0,'3',0,0,'Y',TO_DATE('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','cf6639d3-ed90-4fe4-9b52-9f323f7c0677','N','N','N') ; -- 24/11/2017 10h45min14s BRST @@ -1191,11 +1190,6 @@ DELETE FROM AD_Field WHERE AD_Field_ID=205257 UPDATE AD_Column SET AD_Reference_ID=19, FKConstraintType=NULL,Updated=TO_DATE('2017-11-30 14:56:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213270 ; -alter table ad_table drop column cof_Processing; - - - --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator -- May 16, 2019, 9:25:26 AM BRT UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=SysDate WHERE AD_Tree_ID=10 AND Node_ID=218 ; @@ -1404,7 +1398,5 @@ UPDATE AD_Tab SET Name='Process Customization',Updated=TO_DATE('2019-05-16 09:26 UPDATE AD_Table SET Name='Process Customization',Updated=TO_DATE('2019-05-16 09:26:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200232 ; - - SELECT register_migration_script('201905160920_IDEMPIERE-3971.sql') FROM dual -; \ No newline at end of file +; diff --git a/migration/i6.2z/oracle/201909241631_IDEMPIERE-3971.sql b/migration/i6.2z/oracle/201909241631_IDEMPIERE-3971.sql new file mode 100644 index 0000000000..ef016c625f --- /dev/null +++ b/migration/i6.2z/oracle/201909241631_IDEMPIERE-3971.sql @@ -0,0 +1,63 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-3971 Copy the link to this issue Process Customization +-- Sep 24, 2019, 4:23:34 PM CEST +UPDATE AD_Table SET AccessLevel='6',Updated=TO_DATE('2019-09-24 16:23:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200232 +; + +-- Sep 24, 2019, 4:23:37 PM CEST +UPDATE AD_Table SET AccessLevel='6',Updated=TO_DATE('2019-09-24 16:23:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200233 +; + +-- Sep 24, 2019, 4:25:21 PM CEST +UPDATE AD_Window SET Description='Define Process Customization for Role/User', Help='The customization values defined here overwrite/replace the default system definition if defined.',Updated=TO_DATE('2019-09-24 16:25:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=200095 +; + +-- Sep 24, 2019, 4:25:21 PM CEST +UPDATE AD_Menu SET Name='Process Customization', Description='Define Process Customization for Role/User', IsActive='Y',Updated=TO_DATE('2019-09-24 16:25:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=200150 +; + +-- Sep 24, 2019, 4:29:43 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2019-09-24 16:29:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205274 +; + +-- Sep 24, 2019, 4:29:43 PM CEST +UPDATE AD_Field SET SeqNo=60, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2019-09-24 16:29:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205261 +; + +-- Sep 24, 2019, 4:35:49 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_DATE('2019-09-24 16:35:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205275 +; + +-- Sep 24, 2019, 4:35:52 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_DATE('2019-09-24 16:35:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205270 +; + +-- Sep 24, 2019, 4:35:54 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_DATE('2019-09-24 16:35:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205276 +; + +-- Sep 24, 2019, 4:35:56 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_DATE('2019-09-24 16:35:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205269 +; + +-- Sep 24, 2019, 4:38:44 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_DATE('2019-09-24 16:38:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5052 +; + +-- Sep 24, 2019, 4:40:10 PM CEST +UPDATE AD_Column SET DefaultValue=NULL, AD_Reference_ID=17, AD_Reference_Value_ID=319,Updated=TO_DATE('2019-09-24 16:40:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213291 +; + +-- Sep 24, 2019, 4:40:12 PM CEST +ALTER TABLE AD_UserDef_Proc_Parameter MODIFY IsDisplayed CHAR(1) DEFAULT NULL +; + +-- Sep 24, 2019, 4:45:30 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2019-09-24 16:45:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205267 +; + +SELECT register_migration_script('201909241631_IDEMPIERE-3971.sql') FROM dual +; + diff --git a/migration/i6.2z/postgresql/201905160920_IDEMPIERE-3971.sql b/migration/i6.2z/postgresql/201905160920_IDEMPIERE-3971.sql index 323e98e9d7..e97d1c1bbf 100644 --- a/migration/i6.2z/postgresql/201905160920_IDEMPIERE-3971.sql +++ b/migration/i6.2z/postgresql/201905160920_IDEMPIERE-3971.sql @@ -1,8 +1,6 @@ - -alter table ad_table add column cof_Processing varchar(1); -- Development of Process Customization -- 24/11/2017 9h47min49s BRST -INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView,cof_Processing) VALUES (200232,'User defined Process','User defined Process','User defined Process','AD_UserDef_Proc',0,'3',0,0,'Y',TO_TIMESTAMP('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','33449b20-f6cc-4e48-afad-bcbe5d0dd92e','N','N','N','N') +INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView) VALUES (200232,'User defined Process','User defined Process','User defined Process','AD_UserDef_Proc',0,'3',0,0,'Y',TO_TIMESTAMP('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-11-24 09:47:49','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','33449b20-f6cc-4e48-afad-bcbe5d0dd92e','N','N','N') ; -- 24/11/2017 9h47min49s BRST @@ -253,7 +251,7 @@ ALTER TABLE AD_UserDef_Proc ADD COLUMN IsUserUpdateable CHAR(1) DEFAULT NULL CHE ; -- 24/11/2017 10h45min14s BRST -INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView,cof_Processing) VALUES (200233,'User defined Process Parameter','User defined Process Parameter','User defined Process Parameter','AD_UserDef_Proc_Parameter',0,'3',0,0,'Y',TO_TIMESTAMP('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','cf6639d3-ed90-4fe4-9b52-9f323f7c0677','N','N','N','N') +INSERT INTO AD_Table (AD_Table_ID,Name,Description,Help,TableName,LoadSeq,AccessLevel,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsSecurityEnabled,IsDeleteable,IsHighVolume,IsView,EntityType,ImportTable,IsChangeLog,ReplicationType,CopyColumnsFromTable,IsCentrallyMaintained,AD_Table_UU,Processing,DatabaseViewDrop,CopyComponentsFromView) VALUES (200233,'User defined Process Parameter','User defined Process Parameter','User defined Process Parameter','AD_UserDef_Proc_Parameter',0,'3',0,0,'Y',TO_TIMESTAMP('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2017-11-24 10:45:14','YYYY-MM-DD HH24:MI:SS'),100,'N','Y','N','N','D','N','Y','L','N','Y','cf6639d3-ed90-4fe4-9b52-9f323f7c0677','N','N','N') ; -- 24/11/2017 10h45min14s BRST @@ -1189,9 +1187,6 @@ DELETE FROM AD_Field WHERE AD_Field_ID=205257 UPDATE AD_Column SET AD_Reference_ID=19, FKConstraintType=NULL,Updated=TO_TIMESTAMP('2017-11-30 14:56:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213270 ; -alter table ad_table drop column cof_Processing; - --- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator -- May 16, 2019, 9:25:26 AM BRT UPDATE AD_TreeNodeMM SET Parent_ID=0, SeqNo=0, Updated=statement_timestamp() WHERE AD_Tree_ID=10 AND Node_ID=218 ; @@ -1400,6 +1395,5 @@ UPDATE AD_Tab SET Name='Process Customization',Updated=TO_TIMESTAMP('2019-05-16 UPDATE AD_Table SET Name='Process Customization',Updated=TO_TIMESTAMP('2019-05-16 09:26:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200232 ; - SELECT register_migration_script('201905160920_IDEMPIERE-3971.sql') FROM dual -; \ No newline at end of file +; diff --git a/migration/i6.2z/postgresql/201909241631_IDEMPIERE-3971.sql b/migration/i6.2z/postgresql/201909241631_IDEMPIERE-3971.sql new file mode 100644 index 0000000000..cd7b8c63f9 --- /dev/null +++ b/migration/i6.2z/postgresql/201909241631_IDEMPIERE-3971.sql @@ -0,0 +1,60 @@ +-- IDEMPIERE-3971 Copy the link to this issue Process Customization +-- Sep 24, 2019, 4:23:34 PM CEST +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2019-09-24 16:23:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200232 +; + +-- Sep 24, 2019, 4:23:37 PM CEST +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2019-09-24 16:23:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Table_ID=200233 +; + +-- Sep 24, 2019, 4:25:21 PM CEST +UPDATE AD_Window SET Description='Define Process Customization for Role/User', Help='The customization values defined here overwrite/replace the default system definition if defined.',Updated=TO_TIMESTAMP('2019-09-24 16:25:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Window_ID=200095 +; + +-- Sep 24, 2019, 4:25:21 PM CEST +UPDATE AD_Menu SET Name='Process Customization', Description='Define Process Customization for Role/User', IsActive='Y',Updated=TO_TIMESTAMP('2019-09-24 16:25:21','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Menu_ID=200150 +; + +-- Sep 24, 2019, 4:29:43 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=50, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2019-09-24 16:29:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205274 +; + +-- Sep 24, 2019, 4:29:43 PM CEST +UPDATE AD_Field SET SeqNo=60, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2019-09-24 16:29:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205261 +; + +-- Sep 24, 2019, 4:35:49 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_TIMESTAMP('2019-09-24 16:35:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205275 +; + +-- Sep 24, 2019, 4:35:52 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_TIMESTAMP('2019-09-24 16:35:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205270 +; + +-- Sep 24, 2019, 4:35:54 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_TIMESTAMP('2019-09-24 16:35:54','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205276 +; + +-- Sep 24, 2019, 4:35:56 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_TIMESTAMP('2019-09-24 16:35:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205269 +; + +-- Sep 24, 2019, 4:38:44 PM CEST +UPDATE AD_Field SET AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL, IsAdvancedField='Y',Updated=TO_TIMESTAMP('2019-09-24 16:38:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=5052 +; + +-- Sep 24, 2019, 4:40:10 PM CEST +UPDATE AD_Column SET DefaultValue=NULL, AD_Reference_ID=17, AD_Reference_Value_ID=319,Updated=TO_TIMESTAMP('2019-09-24 16:40:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=213291 +; + +-- Sep 24, 2019, 4:40:12 PM CEST +INSERT INTO t_alter_column values('ad_userdef_proc_parameter','IsDisplayed','CHAR(1)',null,'NULL') +; + +-- Sep 24, 2019, 4:45:30 PM CEST +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=130, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2019-09-24 16:45:30','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=205267 +; + +SELECT register_migration_script('201909241631_IDEMPIERE-3971.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java index 344848b2b5..b0aad3fbe5 100644 --- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java +++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java @@ -404,7 +404,8 @@ public class GridFieldVO implements Serializable vo.DisplayLogic = userDef.getDisplayLogic(); if(userDef.getMandatoryLogic() != null) vo.MandatoryLogic = userDef.getMandatoryLogic(); - vo.IsDisplayed = userDef.isDisplayed(); + if (userDef.getIsDisplayed()!= null) + vo.IsDisplayed = "Y".equals(userDef.getIsDisplayed()); } } //fim devCoffee - 3858 diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc.java index 24c4d2931e..aba78d0b71 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Product: BrERP Gestão Empresarial Completa (http://brerp.org) * + * Product: iDempiere ERP & CRM Smart Business Solution * * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved. * * This program is free software, you can redistribute it and/or modify it * * under the terms version 2 of the GNU General Public License as published * @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for AD_UserDef_Proc * @author iDempiere (generated) - * @version Release 5.1 + * @version Release 6.2 */ public interface I_AD_UserDef_Proc { @@ -35,9 +35,9 @@ public interface I_AD_UserDef_Proc KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = 6 - System - Client */ - BigDecimal accessLevel = BigDecimal.valueOf(3); + BigDecimal accessLevel = BigDecimal.valueOf(6); /** Load Meta Data */ @@ -197,19 +197,6 @@ public interface I_AD_UserDef_Proc */ public boolean isActive(); - /** Column name IsDefault */ - public static final String COLUMNNAME_IsDefault = "IsDefault"; - - /** Set Default. - * Default value - */ - public void setIsDefault (boolean IsDefault); - - /** Get Default. - * Default value - */ - public boolean isDefault(); - /** Column name IsUserUpdateable */ public static final String COLUMNNAME_IsUserUpdateable = "IsUserUpdateable"; diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc_Parameter.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc_Parameter.java index 03650ba2d7..4a24fd4e3c 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc_Parameter.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Proc_Parameter.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Product: BrERP Gestão Empresarial Completa (http://brerp.org) * + * Product: iDempiere ERP & CRM Smart Business Solution * * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved. * * This program is free software, you can redistribute it and/or modify it * * under the terms version 2 of the GNU General Public License as published * @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for AD_UserDef_Proc_Parameter * @author iDempiere (generated) - * @version Release 5.1 + * @version Release 6.2 */ public interface I_AD_UserDef_Proc_Parameter { @@ -35,9 +35,9 @@ public interface I_AD_UserDef_Proc_Parameter KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 3 - Client - Org + /** AccessLevel = 6 - System - Client */ - BigDecimal accessLevel = BigDecimal.valueOf(3); + BigDecimal accessLevel = BigDecimal.valueOf(6); /** Load Meta Data */ @@ -199,25 +199,12 @@ public interface I_AD_UserDef_Proc_Parameter /** Set Displayed. * Determines, if this field is displayed */ - public void setIsDisplayed (boolean IsDisplayed); + public void setIsDisplayed (String IsDisplayed); /** Get Displayed. * Determines, if this field is displayed */ - public boolean isDisplayed(); - - /** Column name IsReadOnly */ - public static final String COLUMNNAME_IsReadOnly = "IsReadOnly"; - - /** Set Read Only. - * Field is read only - */ - public void setIsReadOnly (boolean IsReadOnly); - - /** Get Read Only. - * Field is read only - */ - public boolean isReadOnly(); + public String getIsDisplayed(); /** Column name MandatoryLogic */ public static final String COLUMNNAME_MandatoryLogic = "MandatoryLogic"; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java index c76f4c07cb..ab3360d410 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Product: BrERP Gestão Empresarial Completa (http://brerp.org) * + * Product: iDempiere ERP & CRM Smart Business Solution * * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved. * * This program is free software, you can redistribute it and/or modify it * * under the terms version 2 of the GNU General Public License as published * @@ -19,17 +19,18 @@ package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; +import org.compiere.util.KeyNamePair; /** Generated Model for AD_UserDef_Proc - * @author BrERP Gestão Empresarial Completa (generated) - * @version Release 5.1 - $Id$ */ + * @author iDempiere (generated) + * @version Release 6.2 - $Id$ */ public class X_AD_UserDef_Proc extends PO implements I_AD_UserDef_Proc, I_Persistent { /** * */ - private static final long serialVersionUID = 20171124L; + private static final long serialVersionUID = 20190924L; /** Standard Constructor */ public X_AD_UserDef_Proc (Properties ctx, int AD_UserDef_Proc_ID, String trxName) @@ -49,7 +50,7 @@ public class X_AD_UserDef_Proc extends PO implements I_AD_UserDef_Proc, I_Persis } /** AccessLevel - * @return 3 - Client - Org + * @return 6 - System - Client */ protected int get_AccessLevel() { @@ -245,30 +246,6 @@ public class X_AD_UserDef_Proc extends PO implements I_AD_UserDef_Proc, I_Persis return (String)get_Value(COLUMNNAME_Help); } - /** Set Default. - @param IsDefault - Default value - */ - public void setIsDefault (boolean IsDefault) - { - set_Value (COLUMNNAME_IsDefault, Boolean.valueOf(IsDefault)); - } - - /** Get Default. - @return Default value - */ - public boolean isDefault () - { - Object oo = get_Value(COLUMNNAME_IsDefault); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - /** Set User updatable. @param IsUserUpdateable The field can be updated by the user @@ -309,4 +286,12 @@ public class X_AD_UserDef_Proc extends PO implements I_AD_UserDef_Proc, I_Persis { return (String)get_Value(COLUMNNAME_Name); } + + /** Get Record ID/ColumnName + @return ID/ColumnName pair + */ + public KeyNamePair getKeyNamePair() + { + return new KeyNamePair(get_ID(), getName()); + } } \ No newline at end of file diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java index 2b2609fe8c..3c4fc11eb2 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Proc_Parameter.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Product: BrERP Gestão Empresarial Completa (http://brerp.org) * + * Product: iDempiere ERP & CRM Smart Business Solution * * Copyright (C) 1999-2012 ComPiere, Inc. All Rights Reserved. * * This program is free software, you can redistribute it and/or modify it * * under the terms version 2 of the GNU General Public License as published * @@ -22,15 +22,15 @@ import java.util.Properties; import org.compiere.util.KeyNamePair; /** Generated Model for AD_UserDef_Proc_Parameter - * @author BrERP Gestão Empresarial Completa (generated) - * @version Release 5.1 - $Id$ */ + * @author iDempiere (generated) + * @version Release 6.2 - $Id$ */ public class X_AD_UserDef_Proc_Parameter extends PO implements I_AD_UserDef_Proc_Parameter, I_Persistent { /** * */ - private static final long serialVersionUID = 20171129L; + private static final long serialVersionUID = 20190924L; /** Standard Constructor */ public X_AD_UserDef_Proc_Parameter (Properties ctx, int AD_UserDef_Proc_Parameter_ID, String trxName) @@ -51,7 +51,7 @@ public class X_AD_UserDef_Proc_Parameter extends PO implements I_AD_UserDef_Proc } /** AccessLevel - * @return 3 - Client - Org + * @return 6 - System - Client */ protected int get_AccessLevel() { @@ -230,52 +230,28 @@ public class X_AD_UserDef_Proc_Parameter extends PO implements I_AD_UserDef_Proc return (String)get_Value(COLUMNNAME_Help); } + /** IsDisplayed AD_Reference_ID=319 */ + public static final int ISDISPLAYED_AD_Reference_ID=319; + /** Yes = Y */ + public static final String ISDISPLAYED_Yes = "Y"; + /** No = N */ + public static final String ISDISPLAYED_No = "N"; /** Set Displayed. @param IsDisplayed Determines, if this field is displayed */ - public void setIsDisplayed (boolean IsDisplayed) + public void setIsDisplayed (String IsDisplayed) { - set_Value (COLUMNNAME_IsDisplayed, Boolean.valueOf(IsDisplayed)); + + set_Value (COLUMNNAME_IsDisplayed, IsDisplayed); } /** Get Displayed. @return Determines, if this field is displayed */ - public boolean isDisplayed () + public String getIsDisplayed () { - Object oo = get_Value(COLUMNNAME_IsDisplayed); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; - } - - /** Set Read Only. - @param IsReadOnly - Field is read only - */ - public void setIsReadOnly (boolean IsReadOnly) - { - set_Value (COLUMNNAME_IsReadOnly, Boolean.valueOf(IsReadOnly)); - } - - /** Get Read Only. - @return Field is read only - */ - public boolean isReadOnly () - { - Object oo = get_Value(COLUMNNAME_IsReadOnly); - if (oo != null) - { - if (oo instanceof Boolean) - return ((Boolean)oo).booleanValue(); - return "Y".equals(oo); - } - return false; + return (String)get_Value(COLUMNNAME_IsDisplayed); } /** Set Mandatory Logic.