From 22c238e0d2ef843133afdd58c9454826d7140cbc Mon Sep 17 00:00:00 2001 From: Nicolas Micoud <58596990+nmicoud@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:57:53 +0100 Subject: [PATCH] IDEMPIERE-5232 : Chart field at tenant level (#1249) * IDEMPIERE-5232 : Chart field at tenant level * IDEMPIERE-5232 : Chart field at tenant level - Change AccessLevel to System+Client * IDEMPIERE-5232 : Chart field at tenant level - migration scripts to iD10 * IDEMPIERE-5232 : Chart field at tenant level - DataSource tab must be advanced * IDEMPIERE-5232 : Chart field at tenant level - fix migration scripts * IDEMPIERE-5232 : Chart field at tenant level - fix script --- .../oracle/202203151430_IDEMPIERE-5232.sql | 155 ++++++++++++++++++ .../202203151430_IDEMPIERE-5232.sql | 135 +++++++++++++++ .../src/org/compiere/model/GridFieldVO.java | 2 + .../src/org/compiere/model/I_AD_Chart.java | 6 +- .../compiere/model/I_AD_ChartDatasource.java | 28 ++-- .../src/org/compiere/model/I_AD_Field.java | 57 ++++--- .../compiere/model/I_AD_UserDef_Field.java | 43 +++-- .../src/org/compiere/model/X_AD_Chart.java | 6 +- .../compiere/model/X_AD_ChartDatasource.java | 64 ++++---- .../src/org/compiere/model/X_AD_Field.java | 105 +++++++----- .../compiere/model/X_AD_UserDef_Field.java | 59 +++++-- 11 files changed, 514 insertions(+), 146 deletions(-) create mode 100644 migration/iD10/oracle/202203151430_IDEMPIERE-5232.sql create mode 100644 migration/iD10/postgresql/202203151430_IDEMPIERE-5232.sql diff --git a/migration/iD10/oracle/202203151430_IDEMPIERE-5232.sql b/migration/iD10/oracle/202203151430_IDEMPIERE-5232.sql new file mode 100644 index 0000000000..0b4c312435 --- /dev/null +++ b/migration/iD10/oracle/202203151430_IDEMPIERE-5232.sql @@ -0,0 +1,155 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-5232 +-- Mar 15, 2022, 2:30:49 PM CET +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType,IsHtml) VALUES (214712,0,'Chart',107,'AD_Chart_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_DATE('2022-03-15 14:30:49','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-03-15 14:30:49','YYYY-MM-DD HH24:MI:SS'),0,54268,'Y','N','D','N','N','N','Y','1f3620c0-0def-4180-a577-fc1e682ff8e6','Y',0,'N','N','N','N') +; + +-- Mar 15, 2022, 2:30:50 PM CET +UPDATE AD_Column SET FKConstraintName='ADChart_ADField', FKConstraintType='N',Updated=TO_DATE('2022-03-15 14:30:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214712 +; + +-- Mar 15, 2022, 2:30:50 PM CET +ALTER TABLE AD_Field ADD AD_Chart_ID NUMBER(10) DEFAULT NULL +; + +-- Mar 15, 2022, 2:30:50 PM CET +ALTER TABLE AD_Field ADD CONSTRAINT ADChart_ADField FOREIGN KEY (AD_Chart_ID) REFERENCES ad_chart(ad_chart_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Mar 15, 2022, 2:31:08 PM CET +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType,IsHtml) VALUES (214713,0,'Chart',464,'AD_Chart_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_DATE('2022-03-15 14:31:08','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-03-15 14:31:08','YYYY-MM-DD HH24:MI:SS'),0,54268,'Y','N','D','N','N','N','Y','bc6b9241-f8bf-49fb-8198-fcd53f80b047','Y',0,'N','N','N','N') +; + +-- Mar 15, 2022, 2:31:09 PM CET +UPDATE AD_Column SET FKConstraintName='ADChart_ADUserDefField', FKConstraintType='N',Updated=TO_DATE('2022-03-15 14:31:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214713 +; + +-- Mar 15, 2022, 2:31:09 PM CET +ALTER TABLE AD_UserDef_Field ADD AD_Chart_ID NUMBER(10) DEFAULT NULL +; + +-- Mar 15, 2022, 2:31:09 PM CET +ALTER TABLE AD_UserDef_Field ADD CONSTRAINT ADChart_ADUserDefField FOREIGN KEY (AD_Chart_ID) REFERENCES ad_chart(ad_chart_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Mar 15, 2022, 2:31:24 PM CET +INSERT INTO AD_Field (AD_Field_ID,Name,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206914,'Chart',107,214712,'Y',22,510,'N','N','N','N',0,0,'Y',TO_DATE('2022-03-15 14:31:24','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-03-15 14:31:24','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','df23d2db-b8ab-4e63-af6f-f5283b907f72','Y',500,2) +; + +-- Mar 15, 2022, 2:31:34 PM CET +UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=53370', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:31:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206914 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=450, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206914 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=460, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53280 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=470, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203500 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=480, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200836 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=490, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200835 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=500, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=136 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=510, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=139 +; + +-- Mar 15, 2022, 2:32:22 PM CET +INSERT INTO AD_Field (AD_Field_ID,Name,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206915,'Chart',395,214713,'Y',22,390,'N','N','N','N',0,0,'Y',TO_DATE('2022-03-15 14:32:22','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-03-15 14:32:22','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','b1b92474-66d4-40b3-9623-31c776bc0c3f','Y',360,2) +; + +-- Mar 15, 2022, 2:32:34 PM CET +UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=53370', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206915 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206915 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200852 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203499 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200854 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=380, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5051 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=390, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_DATE('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5057 +; + +-- Mar 15, 2022, 2:33:06 PM CET +UPDATE AD_ViewColumn SET ColumnSQL='COALESCE(f.ad_chart_id, c.ad_chart_id)',Updated=TO_DATE('2022-03-15 14:33:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_ViewColumn_ID=200277 +; + +-- Mar 15, 2022, 2:33:11 PM CET +CREATE OR REPLACE VIEW AD_Field_v(AD_Window_ID, AD_Tab_ID, AD_Field_ID, AD_Table_ID, AD_Column_ID, Name, Description, Help, IsDisplayed, DisplayLogic, DisplayLength, SeqNo, SortNo, IsSameLine, IsHeading, IsFieldOnly, IsReadOnly, isencryptedfield, ObscureType, ColumnName, ColumnSQL, FieldLength, VFormat, DefaultValue, IsKey, IsParent, IsMandatory, IsIdentifier, IsTranslated, AD_Reference_Value_ID, Callout, AD_Reference_ID, AD_Val_Rule_ID, AD_Process_ID, IsAlwaysUpdateable, ReadOnlyLogic, MandatoryLogic, IsUpdateable, isencryptedcolumn, IsSelectionColumn, TableName, ValueMin, ValueMax, fieldgroup, validationcode, Included_Tab_ID, FieldGroupType, IsCollapsedByDefault, InfoFactoryClass, IsAutocomplete, IsAllowCopy, IsDisplayedGrid, SeqNoGrid, SeqNoSelection, XPosition, ColumnSpan, NumLines, IsToolbarButton, FormatPattern, IsAdvancedField, IsDefaultFocus, AD_Chart_ID, AD_LabelStyle_ID, AD_FieldStyle_ID, PA_DashboardContent_ID, Placeholder, IsHtml, IsQuickForm, AD_Val_Rule_Lookup_ID, validationcodelookup) AS SELECT t.ad_window_id AS AD_Window_ID, f.ad_tab_id AS AD_Tab_ID, f.ad_field_id AS AD_Field_ID, tbl.ad_table_id AS AD_Table_ID, f.ad_column_id AS AD_Column_ID, f.name AS Name, f.description AS Description, f.help AS Help, f.isdisplayed AS IsDisplayed, f.displaylogic AS DisplayLogic, f.displaylength AS DisplayLength, f.seqno AS SeqNo, f.sortno AS SortNo, f.issameline AS IsSameLine, f.isheading AS IsHeading, f.isfieldonly AS IsFieldOnly, f.isreadonly AS IsReadOnly, f.isencrypted AS isencryptedfield, f.obscuretype AS ObscureType, c.columnname AS ColumnName, COALESCE(f.columnsql, c.columnsql) AS ColumnSQL, c.fieldlength AS FieldLength, COALESCE(f.vformat, c.vformat) AS VFormat, COALESCE(f.defaultvalue, c.defaultvalue) AS DefaultValue, c.iskey AS IsKey, c.isparent AS IsParent, COALESCE(f.ismandatory, c.ismandatory) AS IsMandatory, c.isidentifier AS IsIdentifier, c.istranslated AS IsTranslated, +COALESCE(f.ad_reference_value_id, c.ad_reference_value_id) AS AD_Reference_Value_ID, c.callout AS Callout, COALESCE(f.ad_reference_id, c.ad_reference_id) AS AD_Reference_ID, COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS AD_Val_Rule_ID, c.ad_process_id AS AD_Process_ID, COALESCE(f.isalwaysupdateable, c.isalwaysupdateable) AS IsAlwaysUpdateable, COALESCE(f.readonlylogic, c.readonlylogic) AS ReadOnlyLogic, COALESCE(f.mandatorylogic, c.mandatorylogic) AS MandatoryLogic, COALESCE(f.isupdateable, c.isupdateable) AS IsUpdateable, c.isencrypted AS isencryptedcolumn, COALESCE(f.isselectioncolumn, c.isselectioncolumn) AS IsSelectionColumn, tbl.tablename AS TableName, c.valuemin AS ValueMin, c.valuemax AS ValueMax, fg.name AS fieldgroup, vr.code AS validationcode, f.included_tab_id AS Included_Tab_ID, fg.fieldgrouptype AS FieldGroupType, fg.iscollapsedbydefault AS IsCollapsedByDefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS InfoFactoryClass, c.isautocomplete AS IsAutocomplete, COALESCE(f.isallowcopy, c.isallowcopy) AS IsAllowCopy, f.isdisplayedgrid AS IsDisplayedGrid, f.seqnogrid AS SeqNoGrid, c.seqnoselection AS SeqNoSelection, f.xposition AS XPosition, f.columnspan AS ColumnSpan, f.numlines AS NumLines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS IsToolbarButton, c.formatpattern AS FormatPattern, f.isadvancedfield AS IsAdvancedField, f.isdefaultfocus AS IsDefaultFocus, COALESCE(f.ad_chart_id, c.ad_chart_id) AS AD_Chart_ID, f.ad_labelstyle_id AS AD_LabelStyle_ID, f.ad_fieldstyle_id AS AD_FieldStyle_ID, c.pa_dashboardcontent_id AS PA_DashboardContent_ID, COALESCE(f.placeholder, c.placeholder) AS Placeholder, c.ishtml AS IsHtml, f.isquickform AS IsQuickForm, COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) AS AD_Val_Rule_Lookup_ID, vrf.code AS validationcodelookup FROM ad_field f +JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id +LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id +LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id +JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id +LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) +LEFT JOIN ad_val_rule vrf ON vrf.ad_val_rule_id = COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) WHERE f.isactive = 'Y' AND c.isactive = 'Y' +; + +-- Mar 15, 2022, 2:33:19 PM CET +UPDATE AD_ViewColumn SET ColumnSQL='COALESCE(f.ad_chart_id, c.ad_chart_id)',Updated=TO_DATE('2022-03-15 14:33:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_ViewColumn_ID=200348 +; + +-- Mar 15, 2022, 2:33:24 PM CET +CREATE OR REPLACE VIEW AD_Field_vt(AD_Language, AD_Window_ID, AD_Tab_ID, AD_Field_ID, AD_Table_ID, AD_Column_ID, Name, Description, Help, IsDisplayed, DisplayLogic, DisplayLength, SeqNo, SortNo, IsSameLine, IsHeading, IsFieldOnly, IsReadOnly, isencryptedfield, ObscureType, ColumnName, ColumnSQL, FieldLength, VFormat, DefaultValue, IsKey, IsParent, IsMandatory, IsIdentifier, IsTranslated, AD_Reference_Value_ID, Callout, AD_Reference_ID, AD_Val_Rule_ID, AD_Process_ID, IsAlwaysUpdateable, ReadOnlyLogic, MandatoryLogic, IsUpdateable, isencryptedcolumn, IsSelectionColumn, TableName, ValueMin, ValueMax, fieldgroup, validationcode, Included_Tab_ID, FieldGroupType, IsCollapsedByDefault, InfoFactoryClass, IsAutocomplete, IsAllowCopy, IsDisplayedGrid, SeqNoGrid, SeqNoSelection, XPosition, ColumnSpan, NumLines, IsToolbarButton, FormatPattern, IsAdvancedField, IsDefaultFocus, AD_Chart_ID, AD_LabelStyle_ID, AD_FieldStyle_ID, PA_DashboardContent_ID, Placeholder, IsHtml, IsQuickForm, AD_Val_Rule_Lookup_ID, validationcodelookup) AS SELECT trl.ad_language AS AD_Language, t.ad_window_id AS AD_Window_ID, f.ad_tab_id AS AD_Tab_ID, f.ad_field_id AS AD_Field_ID, tbl.ad_table_id AS AD_Table_ID, f.ad_column_id AS AD_Column_ID, trl.name AS Name, trl.description AS Description, trl.help AS Help, f.isdisplayed AS IsDisplayed, f.displaylogic AS DisplayLogic, f.displaylength AS DisplayLength, f.seqno AS SeqNo, f.sortno AS SortNo, f.issameline AS IsSameLine, f.isheading AS IsHeading, f.isfieldonly AS IsFieldOnly, f.isreadonly AS IsReadOnly, f.isencrypted AS isencryptedfield, f.obscuretype AS ObscureType, c.columnname AS ColumnName, COALESCE(f.columnsql, c.columnsql) AS ColumnSQL, c.fieldlength AS FieldLength, COALESCE(f.vformat, c.vformat) AS VFormat, COALESCE(f.defaultvalue, c.defaultvalue) AS DefaultValue, c.iskey AS IsKey, c.isparent AS IsParent, COALESCE(f.ismandatory, c.ismandatory) AS IsMandatory, c.isidentifier AS IsIdentifier, c.istranslated AS IsTranslated, +COALESCE(f.ad_reference_value_id, c.ad_reference_value_id) AS AD_Reference_Value_ID, c.callout AS Callout, COALESCE(f.ad_reference_id, c.ad_reference_id) AS AD_Reference_ID, COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS AD_Val_Rule_ID, c.ad_process_id AS AD_Process_ID, COALESCE(f.isalwaysupdateable, c.isalwaysupdateable) AS IsAlwaysUpdateable, COALESCE(f.readonlylogic, c.readonlylogic) AS ReadOnlyLogic, COALESCE(f.mandatorylogic, c.mandatorylogic) AS MandatoryLogic, COALESCE(f.isupdateable, c.isupdateable) AS IsUpdateable, c.isencrypted AS isencryptedcolumn, COALESCE(f.isselectioncolumn, c.isselectioncolumn) AS IsSelectionColumn, tbl.tablename AS TableName, c.valuemin AS ValueMin, c.valuemax AS ValueMax, fgt.name AS fieldgroup, vr.code AS validationcode, f.included_tab_id AS Included_Tab_ID, fg.fieldgrouptype AS FieldGroupType, fg.iscollapsedbydefault AS IsCollapsedByDefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS InfoFactoryClass, c.isautocomplete AS IsAutocomplete, COALESCE(f.isallowcopy, c.isallowcopy) AS IsAllowCopy, f.isdisplayedgrid AS IsDisplayedGrid, f.seqnogrid AS SeqNoGrid, c.seqnoselection AS SeqNoSelection, f.xposition AS XPosition, f.columnspan AS ColumnSpan, f.numlines AS NumLines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS IsToolbarButton, c.formatpattern AS FormatPattern, f.isadvancedfield AS IsAdvancedField, f.isdefaultfocus AS IsDefaultFocus, COALESCE(f.ad_chart_id, c.ad_chart_id) AS AD_Chart_ID, f.ad_labelstyle_id AS AD_LabelStyle_ID, f.ad_fieldstyle_id AS AD_FieldStyle_ID, c.pa_dashboardcontent_id AS PA_DashboardContent_ID, COALESCE(trl.placeholder, ct.placeholder) AS Placeholder, c.ishtml AS IsHtml, f.isquickform AS IsQuickForm, COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) AS AD_Val_Rule_Lookup_ID, vrf.code AS validationcodelookup FROM ad_field f +JOIN ad_field_trl trl ON f.ad_field_id = trl.ad_field_id +JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id +LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id +LEFT JOIN ad_fieldgroup_trl fgt ON f.ad_fieldgroup_id = fgt.ad_fieldgroup_id AND trl.ad_language = fgt.ad_language +LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id +LEFT JOIN ad_column_trl ct ON f.ad_column_id = ct.ad_column_id AND trl.ad_language = ct.ad_language +JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id +LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) +LEFT JOIN ad_val_rule vrf ON vrf.ad_val_rule_id = COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) WHERE f.isactive = 'Y' AND c.isactive = 'Y' +; + +-- Mar 16, 2022, 7:09:20 AM CET +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2022-03-16 07:09:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Table_ID=53284 +; + +-- Mar 16, 2022, 7:09:23 AM CET +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2022-03-16 07:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Table_ID=200122 +; + +-- Mar 16, 2022, 7:09:28 AM CET +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2022-03-16 07:09:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Table_ID=53282 +; + +-- Mar 22, 2022, 4:27:04 PM CET +UPDATE AD_Tab SET IsAdvancedTab='Y',Updated=TO_TIMESTAMP('2022-03-22 16:27:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=53340 +; + +SELECT register_migration_script('202203151430_IDEMPIERE-5232.sql') FROM dual +; diff --git a/migration/iD10/postgresql/202203151430_IDEMPIERE-5232.sql b/migration/iD10/postgresql/202203151430_IDEMPIERE-5232.sql new file mode 100644 index 0000000000..989adbd97e --- /dev/null +++ b/migration/iD10/postgresql/202203151430_IDEMPIERE-5232.sql @@ -0,0 +1,135 @@ +-- IDEMPIERE-5232 +-- Mar 15, 2022, 2:30:49 PM CET +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType,IsHtml) VALUES (214712,0,'Chart',107,'AD_Chart_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_TIMESTAMP('2022-03-15 14:30:49','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-03-15 14:30:49','YYYY-MM-DD HH24:MI:SS'),0,54268,'Y','N','D','N','N','N','Y','1f3620c0-0def-4180-a577-fc1e682ff8e6','Y',0,'N','N','N','N') +; + +-- Mar 15, 2022, 2:30:50 PM CET +UPDATE AD_Column SET FKConstraintName='ADChart_ADField', FKConstraintType='N',Updated=TO_TIMESTAMP('2022-03-15 14:30:50','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214712 +; + +-- Mar 15, 2022, 2:30:50 PM CET +ALTER TABLE AD_Field ADD COLUMN AD_Chart_ID NUMERIC(10) DEFAULT NULL +; + +-- Mar 15, 2022, 2:30:50 PM CET +ALTER TABLE AD_Field ADD CONSTRAINT ADChart_ADField FOREIGN KEY (AD_Chart_ID) REFERENCES ad_chart(ad_chart_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Mar 15, 2022, 2:31:08 PM CET +INSERT INTO AD_Column (AD_Column_ID,Version,Name,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Element_ID,IsUpdateable,IsSelectionColumn,EntityType,IsSyncDatabase,IsAlwaysUpdateable,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsAllowCopy,SeqNoSelection,IsToolbarButton,IsSecure,FKConstraintType,IsHtml) VALUES (214713,0,'Chart',464,'AD_Chart_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_TIMESTAMP('2022-03-15 14:31:08','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-03-15 14:31:08','YYYY-MM-DD HH24:MI:SS'),0,54268,'Y','N','D','N','N','N','Y','bc6b9241-f8bf-49fb-8198-fcd53f80b047','Y',0,'N','N','N','N') +; + +-- Mar 15, 2022, 2:31:09 PM CET +UPDATE AD_Column SET FKConstraintName='ADChart_ADUserDefField', FKConstraintType='N',Updated=TO_TIMESTAMP('2022-03-15 14:31:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214713 +; + +-- Mar 15, 2022, 2:31:09 PM CET +ALTER TABLE AD_UserDef_Field ADD COLUMN AD_Chart_ID NUMERIC(10) DEFAULT NULL +; + +-- Mar 15, 2022, 2:31:09 PM CET +ALTER TABLE AD_UserDef_Field ADD CONSTRAINT ADChart_ADUserDefField FOREIGN KEY (AD_Chart_ID) REFERENCES ad_chart(ad_chart_id) DEFERRABLE INITIALLY DEFERRED +; + +-- Mar 15, 2022, 2:31:24 PM CET +INSERT INTO AD_Field (AD_Field_ID,Name,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206914,'Chart',107,214712,'Y',22,510,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2022-03-15 14:31:24','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-03-15 14:31:24','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','df23d2db-b8ab-4e63-af6f-f5283b907f72','Y',500,2) +; + +-- Mar 15, 2022, 2:31:34 PM CET +UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=53370', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:31:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206914 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=450, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206914 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=460, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=53280 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=470, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203500 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=480, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200836 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=490, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200835 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=500, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=136 +; + +-- Mar 15, 2022, 2:32:10 PM CET +UPDATE AD_Field SET SeqNo=510, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=139 +; + +-- Mar 15, 2022, 2:32:22 PM CET +INSERT INTO AD_Field (AD_Field_ID,Name,AD_Tab_ID,AD_Column_ID,IsDisplayed,DisplayLength,SeqNo,IsSameLine,IsHeading,IsFieldOnly,IsEncrypted,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,IsReadOnly,IsCentrallyMaintained,EntityType,AD_Field_UU,IsDisplayedGrid,SeqNoGrid,ColumnSpan) VALUES (206915,'Chart',395,214713,'Y',22,390,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2022-03-15 14:32:22','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-03-15 14:32:22','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','b1b92474-66d4-40b3-9623-31c776bc0c3f','Y',360,2) +; + +-- Mar 15, 2022, 2:32:34 PM CET +UPDATE AD_Field SET DisplayLogic='@AD_Reference_ID@=53370', AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206915 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET IsDisplayed='Y', SeqNo=340, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=1, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206915 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=350, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200852 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=360, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=203499 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=370, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=200854 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=380, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5051 +; + +-- Mar 15, 2022, 2:32:49 PM CET +UPDATE AD_Field SET SeqNo=390, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-03-15 14:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=5057 +; + +-- Mar 15, 2022, 2:33:06 PM CET +UPDATE AD_ViewColumn SET ColumnSQL='COALESCE(f.ad_chart_id, c.ad_chart_id)',Updated=TO_TIMESTAMP('2022-03-15 14:33:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_ViewColumn_ID=200277 +; + +-- Mar 15, 2022, 2:33:11 PM CET +CREATE OR REPLACE VIEW AD_Field_v(AD_Window_ID, AD_Tab_ID, AD_Field_ID, AD_Table_ID, AD_Column_ID, Name, Description, Help, IsDisplayed, DisplayLogic, DisplayLength, SeqNo, SortNo, IsSameLine, IsHeading, IsFieldOnly, IsReadOnly, isencryptedfield, ObscureType, ColumnName, ColumnSQL, FieldLength, VFormat, DefaultValue, IsKey, IsParent, IsMandatory, IsIdentifier, IsTranslated, AD_Reference_Value_ID, Callout, AD_Reference_ID, AD_Val_Rule_ID, AD_Process_ID, IsAlwaysUpdateable, ReadOnlyLogic, MandatoryLogic, IsUpdateable, isencryptedcolumn, IsSelectionColumn, TableName, ValueMin, ValueMax, fieldgroup, validationcode, Included_Tab_ID, FieldGroupType, IsCollapsedByDefault, InfoFactoryClass, IsAutocomplete, IsAllowCopy, IsDisplayedGrid, SeqNoGrid, SeqNoSelection, XPosition, ColumnSpan, NumLines, IsToolbarButton, FormatPattern, IsAdvancedField, IsDefaultFocus, AD_Chart_ID, AD_LabelStyle_ID, AD_FieldStyle_ID, PA_DashboardContent_ID, Placeholder, IsHtml, IsQuickForm, AD_Val_Rule_Lookup_ID, validationcodelookup) AS SELECT t.ad_window_id AS AD_Window_ID, f.ad_tab_id AS AD_Tab_ID, f.ad_field_id AS AD_Field_ID, tbl.ad_table_id AS AD_Table_ID, f.ad_column_id AS AD_Column_ID, f.name AS Name, f.description AS Description, f.help AS Help, f.isdisplayed AS IsDisplayed, f.displaylogic AS DisplayLogic, f.displaylength AS DisplayLength, f.seqno AS SeqNo, f.sortno AS SortNo, f.issameline AS IsSameLine, f.isheading AS IsHeading, f.isfieldonly AS IsFieldOnly, f.isreadonly AS IsReadOnly, f.isencrypted AS isencryptedfield, f.obscuretype AS ObscureType, c.columnname AS ColumnName, COALESCE(f.columnsql, c.columnsql) AS ColumnSQL, c.fieldlength AS FieldLength, COALESCE(f.vformat, c.vformat) AS VFormat, COALESCE(f.defaultvalue, c.defaultvalue) AS DefaultValue, c.iskey AS IsKey, c.isparent AS IsParent, COALESCE(f.ismandatory, c.ismandatory) AS IsMandatory, c.isidentifier AS IsIdentifier, c.istranslated AS IsTranslated, COALESCE(f.ad_reference_value_id, c.ad_reference_value_id) AS AD_Reference_Value_ID, c.callout AS Callout, COALESCE(f.ad_reference_id, c.ad_reference_id) AS AD_Reference_ID, COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS AD_Val_Rule_ID, c.ad_process_id AS AD_Process_ID, COALESCE(f.isalwaysupdateable, c.isalwaysupdateable) AS IsAlwaysUpdateable, COALESCE(f.readonlylogic, c.readonlylogic) AS ReadOnlyLogic, COALESCE(f.mandatorylogic, c.mandatorylogic) AS MandatoryLogic, COALESCE(f.isupdateable, c.isupdateable) AS IsUpdateable, c.isencrypted AS isencryptedcolumn, COALESCE(f.isselectioncolumn, c.isselectioncolumn) AS IsSelectionColumn, tbl.tablename AS TableName, c.valuemin AS ValueMin, c.valuemax AS ValueMax, fg.name AS fieldgroup, vr.code AS validationcode, f.included_tab_id AS Included_Tab_ID, fg.fieldgrouptype AS FieldGroupType, fg.iscollapsedbydefault AS IsCollapsedByDefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS InfoFactoryClass, c.isautocomplete AS IsAutocomplete, COALESCE(f.isallowcopy, c.isallowcopy) AS IsAllowCopy, f.isdisplayedgrid AS IsDisplayedGrid, f.seqnogrid AS SeqNoGrid, c.seqnoselection AS SeqNoSelection, f.xposition AS XPosition, f.columnspan AS ColumnSpan, f.numlines AS NumLines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS IsToolbarButton, c.formatpattern AS FormatPattern, f.isadvancedfield AS IsAdvancedField, f.isdefaultfocus AS IsDefaultFocus, COALESCE(f.ad_chart_id, c.ad_chart_id) AS AD_Chart_ID, f.ad_labelstyle_id AS AD_LabelStyle_ID, f.ad_fieldstyle_id AS AD_FieldStyle_ID, c.pa_dashboardcontent_id AS PA_DashboardContent_ID, COALESCE(f.placeholder, c.placeholder) AS Placeholder, c.ishtml AS IsHtml, f.isquickform AS IsQuickForm, COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) AS AD_Val_Rule_Lookup_ID, vrf.code AS validationcodelookup FROM ad_field f JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) LEFT JOIN ad_val_rule vrf ON vrf.ad_val_rule_id = COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) WHERE f.isactive = 'Y' AND c.isactive = 'Y' +; + +-- Mar 15, 2022, 2:33:19 PM CET +UPDATE AD_ViewColumn SET ColumnSQL='COALESCE(f.ad_chart_id, c.ad_chart_id)',Updated=TO_TIMESTAMP('2022-03-15 14:33:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_ViewColumn_ID=200348 +; + +-- Mar 15, 2022, 2:33:24 PM CET +CREATE OR REPLACE VIEW AD_Field_vt(AD_Language, AD_Window_ID, AD_Tab_ID, AD_Field_ID, AD_Table_ID, AD_Column_ID, Name, Description, Help, IsDisplayed, DisplayLogic, DisplayLength, SeqNo, SortNo, IsSameLine, IsHeading, IsFieldOnly, IsReadOnly, isencryptedfield, ObscureType, ColumnName, ColumnSQL, FieldLength, VFormat, DefaultValue, IsKey, IsParent, IsMandatory, IsIdentifier, IsTranslated, AD_Reference_Value_ID, Callout, AD_Reference_ID, AD_Val_Rule_ID, AD_Process_ID, IsAlwaysUpdateable, ReadOnlyLogic, MandatoryLogic, IsUpdateable, isencryptedcolumn, IsSelectionColumn, TableName, ValueMin, ValueMax, fieldgroup, validationcode, Included_Tab_ID, FieldGroupType, IsCollapsedByDefault, InfoFactoryClass, IsAutocomplete, IsAllowCopy, IsDisplayedGrid, SeqNoGrid, SeqNoSelection, XPosition, ColumnSpan, NumLines, IsToolbarButton, FormatPattern, IsAdvancedField, IsDefaultFocus, AD_Chart_ID, AD_LabelStyle_ID, AD_FieldStyle_ID, PA_DashboardContent_ID, Placeholder, IsHtml, IsQuickForm, AD_Val_Rule_Lookup_ID, validationcodelookup) AS SELECT trl.ad_language AS AD_Language, t.ad_window_id AS AD_Window_ID, f.ad_tab_id AS AD_Tab_ID, f.ad_field_id AS AD_Field_ID, tbl.ad_table_id AS AD_Table_ID, f.ad_column_id AS AD_Column_ID, trl.name AS Name, trl.description AS Description, trl.help AS Help, f.isdisplayed AS IsDisplayed, f.displaylogic AS DisplayLogic, f.displaylength AS DisplayLength, f.seqno AS SeqNo, f.sortno AS SortNo, f.issameline AS IsSameLine, f.isheading AS IsHeading, f.isfieldonly AS IsFieldOnly, f.isreadonly AS IsReadOnly, f.isencrypted AS isencryptedfield, f.obscuretype AS ObscureType, c.columnname AS ColumnName, COALESCE(f.columnsql, c.columnsql) AS ColumnSQL, c.fieldlength AS FieldLength, COALESCE(f.vformat, c.vformat) AS VFormat, COALESCE(f.defaultvalue, c.defaultvalue) AS DefaultValue, c.iskey AS IsKey, c.isparent AS IsParent, COALESCE(f.ismandatory, c.ismandatory) AS IsMandatory, c.isidentifier AS IsIdentifier, c.istranslated AS IsTranslated, COALESCE(f.ad_reference_value_id, c.ad_reference_value_id) AS AD_Reference_Value_ID, c.callout AS Callout, COALESCE(f.ad_reference_id, c.ad_reference_id) AS AD_Reference_ID, COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) AS AD_Val_Rule_ID, c.ad_process_id AS AD_Process_ID, COALESCE(f.isalwaysupdateable, c.isalwaysupdateable) AS IsAlwaysUpdateable, COALESCE(f.readonlylogic, c.readonlylogic) AS ReadOnlyLogic, COALESCE(f.mandatorylogic, c.mandatorylogic) AS MandatoryLogic, COALESCE(f.isupdateable, c.isupdateable) AS IsUpdateable, c.isencrypted AS isencryptedcolumn, COALESCE(f.isselectioncolumn, c.isselectioncolumn) AS IsSelectionColumn, tbl.tablename AS TableName, c.valuemin AS ValueMin, c.valuemax AS ValueMax, fgt.name AS fieldgroup, vr.code AS validationcode, f.included_tab_id AS Included_Tab_ID, fg.fieldgrouptype AS FieldGroupType, fg.iscollapsedbydefault AS IsCollapsedByDefault, COALESCE(f.infofactoryclass, c.infofactoryclass) AS InfoFactoryClass, c.isautocomplete AS IsAutocomplete, COALESCE(f.isallowcopy, c.isallowcopy) AS IsAllowCopy, f.isdisplayedgrid AS IsDisplayedGrid, f.seqnogrid AS SeqNoGrid, c.seqnoselection AS SeqNoSelection, f.xposition AS XPosition, f.columnspan AS ColumnSpan, f.numlines AS NumLines, COALESCE(f.istoolbarbutton, c.istoolbarbutton) AS IsToolbarButton, c.formatpattern AS FormatPattern, f.isadvancedfield AS IsAdvancedField, f.isdefaultfocus AS IsDefaultFocus, COALESCE(f.ad_chart_id, c.ad_chart_id) AS AD_Chart_ID, f.ad_labelstyle_id AS AD_LabelStyle_ID, f.ad_fieldstyle_id AS AD_FieldStyle_ID, c.pa_dashboardcontent_id AS PA_DashboardContent_ID, COALESCE(trl.placeholder, ct.placeholder) AS Placeholder, c.ishtml AS IsHtml, f.isquickform AS IsQuickForm, COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) AS AD_Val_Rule_Lookup_ID, vrf.code AS validationcodelookup FROM ad_field f JOIN ad_field_trl trl ON f.ad_field_id = trl.ad_field_id JOIN ad_tab t ON f.ad_tab_id = t.ad_tab_id LEFT JOIN ad_fieldgroup fg ON f.ad_fieldgroup_id = fg.ad_fieldgroup_id LEFT JOIN ad_fieldgroup_trl fgt ON f.ad_fieldgroup_id = fgt.ad_fieldgroup_id AND trl.ad_language = fgt.ad_language LEFT JOIN ad_column c ON f.ad_column_id = c.ad_column_id LEFT JOIN ad_column_trl ct ON f.ad_column_id = ct.ad_column_id AND trl.ad_language = ct.ad_language JOIN ad_table tbl ON c.ad_table_id = tbl.ad_table_id LEFT JOIN ad_val_rule vr ON vr.ad_val_rule_id = COALESCE(f.ad_val_rule_id, c.ad_val_rule_id) LEFT JOIN ad_val_rule vrf ON vrf.ad_val_rule_id = COALESCE(f.ad_val_rule_lookup_id, c.ad_val_rule_lookup_id) WHERE f.isactive = 'Y' AND c.isactive = 'Y' +; + +-- Mar 16, 2022, 7:09:20 AM CET +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2022-03-16 07:09:20','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Table_ID=53284 +; + +-- Mar 16, 2022, 7:09:23 AM CET +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2022-03-16 07:09:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Table_ID=200122 +; + +-- Mar 16, 2022, 7:09:28 AM CET +UPDATE AD_Table SET AccessLevel='6',Updated=TO_TIMESTAMP('2022-03-16 07:09:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Table_ID=53282 +; + +-- Mar 22, 2022, 4:27:04 PM CET +UPDATE AD_Tab SET IsAdvancedTab='Y',Updated=TO_TIMESTAMP('2022-03-22 16:27:04','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Tab_ID=53340 +; + +SELECT register_migration_script('202203151430_IDEMPIERE-5232.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 7637c6e6a0..35c288f9c4 100644 --- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java +++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java @@ -198,6 +198,8 @@ public class GridFieldVO implements Serializable, Cloneable if (userDef.getIsAutocomplete() != null) vo.IsAutocomplete = "Y".equals(userDef.getIsAutocomplete()); + if (userDef.getAD_Chart_ID() > 0) + vo.AD_Chart_ID = userDef.getAD_Chart_ID(); } // vo.initFinish(); diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java b/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java index 0949c5a84a..443070fcf2 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_Chart.java @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for AD_Chart * @author iDempiere (generated) - * @version Release 9 + * @version Release 10 */ public interface I_AD_Chart { @@ -35,9 +35,9 @@ public interface I_AD_Chart KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 4 - System + /** AccessLevel = 6 - System - Client */ - BigDecimal accessLevel = BigDecimal.valueOf(4); + BigDecimal accessLevel = BigDecimal.valueOf(6); /** Load Meta Data */ diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java b/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java index c4487338f8..a7ad5f2f8d 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_ChartDatasource.java @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for AD_ChartDatasource * @author iDempiere (generated) - * @version Release 9 + * @version Release 10 */ public interface I_AD_ChartDatasource { @@ -35,12 +35,23 @@ public interface I_AD_ChartDatasource KeyNamePair Model = new KeyNamePair(Table_ID, Table_Name); - /** AccessLevel = 4 - System + /** AccessLevel = 6 - System - Client */ - BigDecimal accessLevel = BigDecimal.valueOf(4); + BigDecimal accessLevel = BigDecimal.valueOf(6); /** Load Meta Data */ + /** Column name AD_Chart_ID */ + public static final String COLUMNNAME_AD_Chart_ID = "AD_Chart_ID"; + + /** Set Chart */ + public void setAD_Chart_ID (int AD_Chart_ID); + + /** Get Chart */ + public int getAD_Chart_ID(); + + public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException; + /** Column name AD_ChartDatasource_ID */ public static final String COLUMNNAME_AD_ChartDatasource_ID = "AD_ChartDatasource_ID"; @@ -59,17 +70,6 @@ public interface I_AD_ChartDatasource /** Get AD_ChartDatasource_UU */ public String getAD_ChartDatasource_UU(); - /** Column name AD_Chart_ID */ - public static final String COLUMNNAME_AD_Chart_ID = "AD_Chart_ID"; - - /** Set Chart */ - public void setAD_Chart_ID (int AD_Chart_ID); - - /** Get Chart */ - public int getAD_Chart_ID(); - - public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException; - /** Column name AD_Client_ID */ public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID"; diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java index 29c8ae27b7..f991a80561 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_Field.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_Field.java @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for AD_Field * @author iDempiere (generated) - * @version Release 9 + * @version Release 10 */ public interface I_AD_Field { @@ -41,6 +41,17 @@ public interface I_AD_Field /** Load Meta Data */ + /** Column name AD_Chart_ID */ + public static final String COLUMNNAME_AD_Chart_ID = "AD_Chart_ID"; + + /** Set Chart */ + public void setAD_Chart_ID (int AD_Chart_ID); + + /** Get Chart */ + public int getAD_Chart_ID(); + + public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException; + /** Column name AD_Client_ID */ public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID"; @@ -64,6 +75,28 @@ public interface I_AD_Field public org.compiere.model.I_AD_Column getAD_Column() throws RuntimeException; + /** Column name AD_Field_ID */ + public static final String COLUMNNAME_AD_Field_ID = "AD_Field_ID"; + + /** Set Field. + * Field on a database table + */ + public void setAD_Field_ID (int AD_Field_ID); + + /** Get Field. + * Field on a database table + */ + public int getAD_Field_ID(); + + /** Column name AD_Field_UU */ + public static final String COLUMNNAME_AD_Field_UU = "AD_Field_UU"; + + /** Set AD_Field_UU */ + public void setAD_Field_UU (String AD_Field_UU); + + /** Get AD_Field_UU */ + public String getAD_Field_UU(); + /** Column name AD_FieldGroup_ID */ public static final String COLUMNNAME_AD_FieldGroup_ID = "AD_FieldGroup_ID"; @@ -79,19 +112,6 @@ public interface I_AD_Field public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException; - /** Column name AD_Field_ID */ - public static final String COLUMNNAME_AD_Field_ID = "AD_Field_ID"; - - /** Set Field. - * Field on a database table - */ - public void setAD_Field_ID (int AD_Field_ID); - - /** Get Field. - * Field on a database table - */ - public int getAD_Field_ID(); - /** Column name AD_FieldStyle_ID */ public static final String COLUMNNAME_AD_FieldStyle_ID = "AD_FieldStyle_ID"; @@ -107,15 +127,6 @@ public interface I_AD_Field public org.compiere.model.I_AD_Style getAD_FieldStyle() throws RuntimeException; - /** Column name AD_Field_UU */ - public static final String COLUMNNAME_AD_Field_UU = "AD_Field_UU"; - - /** Set AD_Field_UU */ - public void setAD_Field_UU (String AD_Field_UU); - - /** Get AD_Field_UU */ - public String getAD_Field_UU(); - /** Column name AD_LabelStyle_ID */ public static final String COLUMNNAME_AD_LabelStyle_ID = "AD_LabelStyle_ID"; diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java index 74be08e170..8d261704a9 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Field.java @@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair; /** Generated Interface for AD_UserDef_Field * @author iDempiere (generated) - * @version Release 9 + * @version Release 10 */ public interface I_AD_UserDef_Field { @@ -41,6 +41,17 @@ public interface I_AD_UserDef_Field /** Load Meta Data */ + /** Column name AD_Chart_ID */ + public static final String COLUMNNAME_AD_Chart_ID = "AD_Chart_ID"; + + /** Set Chart */ + public void setAD_Chart_ID (int AD_Chart_ID); + + /** Get Chart */ + public int getAD_Chart_ID(); + + public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException; + /** Column name AD_Client_ID */ public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID"; @@ -49,21 +60,6 @@ public interface I_AD_UserDef_Field */ public int getAD_Client_ID(); - /** Column name AD_FieldGroup_ID */ - public static final String COLUMNNAME_AD_FieldGroup_ID = "AD_FieldGroup_ID"; - - /** Set Field Group. - * Logical grouping of fields - */ - public void setAD_FieldGroup_ID (int AD_FieldGroup_ID); - - /** Get Field Group. - * Logical grouping of fields - */ - public int getAD_FieldGroup_ID(); - - public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException; - /** Column name AD_Field_ID */ public static final String COLUMNNAME_AD_Field_ID = "AD_Field_ID"; @@ -79,6 +75,21 @@ public interface I_AD_UserDef_Field public org.compiere.model.I_AD_Field getAD_Field() throws RuntimeException; + /** Column name AD_FieldGroup_ID */ + public static final String COLUMNNAME_AD_FieldGroup_ID = "AD_FieldGroup_ID"; + + /** Set Field Group. + * Logical grouping of fields + */ + public void setAD_FieldGroup_ID (int AD_FieldGroup_ID); + + /** Get Field Group. + * Logical grouping of fields + */ + public int getAD_FieldGroup_ID(); + + public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException; + /** Column name AD_FieldStyle_ID */ public static final String COLUMNNAME_AD_FieldStyle_ID = "AD_FieldStyle_ID"; diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java b/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java index 88ab44f33e..6ab7450633 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_Chart.java @@ -22,7 +22,7 @@ import java.util.Properties; /** Generated Model for AD_Chart * @author iDempiere (generated) - * @version Release 9 - $Id$ */ + * @version Release 10 - $Id$ */ @org.adempiere.base.Model(table="AD_Chart") public class X_AD_Chart extends PO implements I_AD_Chart, I_Persistent { @@ -30,7 +30,7 @@ public class X_AD_Chart extends PO implements I_AD_Chart, I_Persistent /** * */ - private static final long serialVersionUID = 20220116L; + private static final long serialVersionUID = 20220322L; /** Standard Constructor */ public X_AD_Chart (Properties ctx, int AD_Chart_ID, String trxName) @@ -79,7 +79,7 @@ public class X_AD_Chart extends PO implements I_AD_Chart, I_Persistent } /** AccessLevel - * @return 4 - System + * @return 6 - System - Client */ protected int get_AccessLevel() { diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java b/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java index 58c1a77c51..c9ca57f97a 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_ChartDatasource.java @@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for AD_ChartDatasource * @author iDempiere (generated) - * @version Release 9 - $Id$ */ + * @version Release 10 - $Id$ */ @org.adempiere.base.Model(table="AD_ChartDatasource") public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_Persistent { @@ -31,7 +31,7 @@ public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_ /** * */ - private static final long serialVersionUID = 20220116L; + private static final long serialVersionUID = 20220322L; /** Standard Constructor */ public X_AD_ChartDatasource (Properties ctx, int AD_ChartDatasource_ID, String trxName) @@ -39,8 +39,8 @@ public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_ super (ctx, AD_ChartDatasource_ID, trxName); /** if (AD_ChartDatasource_ID == 0) { - setAD_ChartDatasource_ID (0); setAD_Chart_ID (0); + setAD_ChartDatasource_ID (0); setEntityType (null); // @SQL=SELECT CASE WHEN '@P|AdempiereSys:N@'='Y' THEN 'D' ELSE get_sysconfig('DEFAULT_ENTITYTYPE','U',0,0) END FROM Dual setFromClause (null); @@ -57,8 +57,8 @@ public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_ super (ctx, AD_ChartDatasource_ID, trxName, virtualColumns); /** if (AD_ChartDatasource_ID == 0) { - setAD_ChartDatasource_ID (0); setAD_Chart_ID (0); + setAD_ChartDatasource_ID (0); setEntityType (null); // @SQL=SELECT CASE WHEN '@P|AdempiereSys:N@'='Y' THEN 'D' ELSE get_sysconfig('DEFAULT_ENTITYTYPE','U',0,0) END FROM Dual setFromClause (null); @@ -76,7 +76,7 @@ public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_ } /** AccessLevel - * @return 4 - System + * @return 6 - System - Client */ protected int get_AccessLevel() { @@ -97,6 +97,33 @@ public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_ return sb.toString(); } + public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException + { + return (org.compiere.model.I_AD_Chart)MTable.get(getCtx(), org.compiere.model.I_AD_Chart.Table_ID) + .getPO(getAD_Chart_ID(), get_TrxName()); + } + + /** Set Chart. + @param AD_Chart_ID Chart + */ + public void setAD_Chart_ID (int AD_Chart_ID) + { + if (AD_Chart_ID < 1) + set_ValueNoCheck (COLUMNNAME_AD_Chart_ID, null); + else + set_ValueNoCheck (COLUMNNAME_AD_Chart_ID, Integer.valueOf(AD_Chart_ID)); + } + + /** Get Chart. + @return Chart */ + public int getAD_Chart_ID() + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_Chart_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + /** Set Chart Datasource. @param AD_ChartDatasource_ID Chart Datasource */ @@ -133,33 +160,6 @@ public class X_AD_ChartDatasource extends PO implements I_AD_ChartDatasource, I_ return (String)get_Value(COLUMNNAME_AD_ChartDatasource_UU); } - public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException - { - return (org.compiere.model.I_AD_Chart)MTable.get(getCtx(), org.compiere.model.I_AD_Chart.Table_ID) - .getPO(getAD_Chart_ID(), get_TrxName()); - } - - /** Set Chart. - @param AD_Chart_ID Chart - */ - public void setAD_Chart_ID (int AD_Chart_ID) - { - if (AD_Chart_ID < 1) - set_ValueNoCheck (COLUMNNAME_AD_Chart_ID, null); - else - set_ValueNoCheck (COLUMNNAME_AD_Chart_ID, Integer.valueOf(AD_Chart_ID)); - } - - /** Get Chart. - @return Chart */ - public int getAD_Chart_ID() - { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_Chart_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException { return (org.compiere.model.I_AD_Table)MTable.get(getCtx(), org.compiere.model.I_AD_Table.Table_ID) diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java index 61409689ff..f961d67b89 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_Field.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_Field.java @@ -25,7 +25,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for AD_Field * @author iDempiere (generated) - * @version Release 9 - $Id$ */ + * @version Release 10 - $Id$ */ @org.adempiere.base.Model(table="AD_Field") public class X_AD_Field extends PO implements I_AD_Field, I_Persistent { @@ -33,7 +33,7 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent /** * */ - private static final long serialVersionUID = 20220116L; + private static final long serialVersionUID = 20220315L; /** Standard Constructor */ public X_AD_Field (Properties ctx, int AD_Field_ID, String trxName) @@ -123,6 +123,33 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent return sb.toString(); } + public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException + { + return (org.compiere.model.I_AD_Chart)MTable.get(getCtx(), org.compiere.model.I_AD_Chart.Table_ID) + .getPO(getAD_Chart_ID(), get_TrxName()); + } + + /** Set Chart. + @param AD_Chart_ID Chart + */ + public void setAD_Chart_ID (int AD_Chart_ID) + { + if (AD_Chart_ID < 1) + set_Value (COLUMNNAME_AD_Chart_ID, null); + else + set_Value (COLUMNNAME_AD_Chart_ID, Integer.valueOf(AD_Chart_ID)); + } + + /** Get Chart. + @return Chart */ + public int getAD_Chart_ID() + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_Chart_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.compiere.model.I_AD_Column getAD_Column() throws RuntimeException { return (org.compiere.model.I_AD_Column)MTable.get(getCtx(), org.compiere.model.I_AD_Column.Table_ID) @@ -151,6 +178,43 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent return ii.intValue(); } + /** Set Field. + @param AD_Field_ID Field on a database table + */ + public void setAD_Field_ID (int AD_Field_ID) + { + if (AD_Field_ID < 1) + set_ValueNoCheck (COLUMNNAME_AD_Field_ID, null); + else + set_ValueNoCheck (COLUMNNAME_AD_Field_ID, Integer.valueOf(AD_Field_ID)); + } + + /** Get Field. + @return Field on a database table + */ + public int getAD_Field_ID() + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_Field_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + + /** Set AD_Field_UU. + @param AD_Field_UU AD_Field_UU + */ + public void setAD_Field_UU (String AD_Field_UU) + { + set_Value (COLUMNNAME_AD_Field_UU, AD_Field_UU); + } + + /** Get AD_Field_UU. + @return AD_Field_UU */ + public String getAD_Field_UU() + { + return (String)get_Value(COLUMNNAME_AD_Field_UU); + } + public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException { return (org.compiere.model.I_AD_FieldGroup)MTable.get(getCtx(), org.compiere.model.I_AD_FieldGroup.Table_ID) @@ -179,28 +243,6 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent return ii.intValue(); } - /** Set Field. - @param AD_Field_ID Field on a database table - */ - public void setAD_Field_ID (int AD_Field_ID) - { - if (AD_Field_ID < 1) - set_ValueNoCheck (COLUMNNAME_AD_Field_ID, null); - else - set_ValueNoCheck (COLUMNNAME_AD_Field_ID, Integer.valueOf(AD_Field_ID)); - } - - /** Get Field. - @return Field on a database table - */ - public int getAD_Field_ID() - { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_Field_ID); - if (ii == null) - return 0; - return ii.intValue(); - } - public org.compiere.model.I_AD_Style getAD_FieldStyle() throws RuntimeException { return (org.compiere.model.I_AD_Style)MTable.get(getCtx(), org.compiere.model.I_AD_Style.Table_ID) @@ -229,21 +271,6 @@ public class X_AD_Field extends PO implements I_AD_Field, I_Persistent return ii.intValue(); } - /** Set AD_Field_UU. - @param AD_Field_UU AD_Field_UU - */ - public void setAD_Field_UU (String AD_Field_UU) - { - set_Value (COLUMNNAME_AD_Field_UU, AD_Field_UU); - } - - /** Get AD_Field_UU. - @return AD_Field_UU */ - public String getAD_Field_UU() - { - return (String)get_Value(COLUMNNAME_AD_Field_UU); - } - public org.compiere.model.I_AD_Style getAD_LabelStyle() throws RuntimeException { return (org.compiere.model.I_AD_Style)MTable.get(getCtx(), org.compiere.model.I_AD_Style.Table_ID) diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java index 14b5cc535a..a48f485160 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Field.java @@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair; /** Generated Model for AD_UserDef_Field * @author iDempiere (generated) - * @version Release 9 - $Id$ */ + * @version Release 10 - $Id$ */ @org.adempiere.base.Model(table="AD_UserDef_Field") public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Persistent { @@ -31,7 +31,7 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers /** * */ - private static final long serialVersionUID = 20220116L; + private static final long serialVersionUID = 20220315L; /** Standard Constructor */ public X_AD_UserDef_Field (Properties ctx, int AD_UserDef_Field_ID, String trxName) @@ -93,29 +93,28 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers return sb.toString(); } - public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException + public org.compiere.model.I_AD_Chart getAD_Chart() throws RuntimeException { - return (org.compiere.model.I_AD_FieldGroup)MTable.get(getCtx(), org.compiere.model.I_AD_FieldGroup.Table_ID) - .getPO(getAD_FieldGroup_ID(), get_TrxName()); + return (org.compiere.model.I_AD_Chart)MTable.get(getCtx(), org.compiere.model.I_AD_Chart.Table_ID) + .getPO(getAD_Chart_ID(), get_TrxName()); } - /** Set Field Group. - @param AD_FieldGroup_ID Logical grouping of fields + /** Set Chart. + @param AD_Chart_ID Chart */ - public void setAD_FieldGroup_ID (int AD_FieldGroup_ID) + public void setAD_Chart_ID (int AD_Chart_ID) { - if (AD_FieldGroup_ID < 1) - set_Value (COLUMNNAME_AD_FieldGroup_ID, null); + if (AD_Chart_ID < 1) + set_Value (COLUMNNAME_AD_Chart_ID, null); else - set_Value (COLUMNNAME_AD_FieldGroup_ID, Integer.valueOf(AD_FieldGroup_ID)); + set_Value (COLUMNNAME_AD_Chart_ID, Integer.valueOf(AD_Chart_ID)); } - /** Get Field Group. - @return Logical grouping of fields - */ - public int getAD_FieldGroup_ID() + /** Get Chart. + @return Chart */ + public int getAD_Chart_ID() { - Integer ii = (Integer)get_Value(COLUMNNAME_AD_FieldGroup_ID); + Integer ii = (Integer)get_Value(COLUMNNAME_AD_Chart_ID); if (ii == null) return 0; return ii.intValue(); @@ -157,6 +156,34 @@ public class X_AD_UserDef_Field extends PO implements I_AD_UserDef_Field, I_Pers return new KeyNamePair(get_ID(), String.valueOf(getAD_Field_ID())); } + public org.compiere.model.I_AD_FieldGroup getAD_FieldGroup() throws RuntimeException + { + return (org.compiere.model.I_AD_FieldGroup)MTable.get(getCtx(), org.compiere.model.I_AD_FieldGroup.Table_ID) + .getPO(getAD_FieldGroup_ID(), get_TrxName()); + } + + /** Set Field Group. + @param AD_FieldGroup_ID Logical grouping of fields + */ + public void setAD_FieldGroup_ID (int AD_FieldGroup_ID) + { + if (AD_FieldGroup_ID < 1) + set_Value (COLUMNNAME_AD_FieldGroup_ID, null); + else + set_Value (COLUMNNAME_AD_FieldGroup_ID, Integer.valueOf(AD_FieldGroup_ID)); + } + + /** Get Field Group. + @return Logical grouping of fields + */ + public int getAD_FieldGroup_ID() + { + Integer ii = (Integer)get_Value(COLUMNNAME_AD_FieldGroup_ID); + if (ii == null) + return 0; + return ii.intValue(); + } + public org.compiere.model.I_AD_Style getAD_FieldStyle() throws RuntimeException { return (org.compiere.model.I_AD_Style)MTable.get(getCtx(), org.compiere.model.I_AD_Style.Table_ID)