midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3561 QuickEntry panel doesn't use ZoomCondition (#1102) 

* IDEMPIERE-3561

* IDEMPIERE-3561

fix logic for isSOTrx = N

* IDEMPIERE-3561 - move migration scripts to i9 folder
This commit is contained in:
Nicolas Micoud 2022-01-05 08:00:35 +01:00 committed by GitHub
parent 79763f8626
commit 887d75067b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 403 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
migration/i9/oracle/202201031130_IDEMPIERE-3561.sql Normal file
View File

@ -0,0 +1,94 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-3561
-- Jan 3, 2022, 10:44:39 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,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 (214656,0,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',895,'AD_Window_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_DATE('2022-01-03 10:44:38','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:44:38','YYYY-MM-DD HH24:MI:SS'),0,143,'Y','N','D','N','N','N','Y','0d69d1c3-81aa-42d6-8515-eb8d67194d5c','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:44:53 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Reference_Value_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 (214657,0,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',895,'PO_Window_ID',22,'N','N','N','N','N',0,'N',18,284,0,0,'Y',TO_DATE('2022-01-03 10:44:53','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:44:53','YYYY-MM-DD HH24:MI:SS'),0,2136,'Y','N','D','N','N','N','Y','57c86a93-1d2f-4c67-9d47-e89192de18a2','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:44:58 AM CET
UPDATE AD_Column SET FKConstraintName='ADWindow_ADInfoWindow', FKConstraintType='N',Updated=TO_DATE('2022-01-03 10:44:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214656
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD AD_Window_ID NUMBER(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD CONSTRAINT ADWindow_ADInfoWindow FOREIGN KEY (AD_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:44:58 AM CET
UPDATE AD_Column SET FKConstraintName='POWindow_ADInfoWindow', FKConstraintType='N',Updated=TO_DATE('2022-01-03 10:44:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214657
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD PO_Window_ID NUMBER(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD CONSTRAINT POWindow_ADInfoWindow FOREIGN KEY (PO_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:45:40 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206819,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',842,214656,'Y',22,240,'N','N','N','N',0,0,'Y',TO_DATE('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','61158a17-db64-4d3e-bd5b-0ecb4b84c3d8','Y',150,2)
;
-- Jan 3, 2022, 10:45:40 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206820,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',842,214657,'Y',22,250,'N','N','N','N',0,0,'Y',TO_DATE('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','0bcdb675-a41d-4322-b3bc-7500a71d1458','Y',160,2)
;
-- Jan 3, 2022, 10:45:49 AM CET
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2022-01-03 10:45:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206820
;
-- Jan 3, 2022, 10:46:11 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,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 (214658,0,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',200266,'AD_Window_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_DATE('2022-01-03 10:46:10','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:46:10','YYYY-MM-DD HH24:MI:SS'),0,143,'Y','N','D','N','N','N','Y','c27982a3-9d94-4d98-a033-6fc9d4f3e9ca','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:46:18 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Reference_Value_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 (214659,0,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',200266,'PO_Window_ID',22,'N','N','N','N','N',0,'N',18,284,0,0,'Y',TO_DATE('2022-01-03 10:46:18','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:46:18','YYYY-MM-DD HH24:MI:SS'),0,2136,'Y','N','D','N','N','N','Y','27bd2166-8981-4e75-9669-d73160524e7a','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:46:23 AM CET
UPDATE AD_Column SET FKConstraintName='ADWindow_ADUserDefInfo', FKConstraintType='N',Updated=TO_DATE('2022-01-03 10:46:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214658
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD AD_Window_ID NUMBER(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD CONSTRAINT ADWindow_ADUserDefInfo FOREIGN KEY (AD_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:46:23 AM CET
UPDATE AD_Column SET FKConstraintName='POWindow_ADUserDefInfo', FKConstraintType='N',Updated=TO_DATE('2022-01-03 10:46:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214659
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD PO_Window_ID NUMBER(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD CONSTRAINT POWindow_ADUserDefInfo FOREIGN KEY (PO_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:46:37 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206821,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',200280,214658,'Y',22,140,'N','N','N','N',0,0,'Y',TO_DATE('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','1429e754-70e3-4a6f-b4f4-86291ce22f29','Y',160,2)
;
-- Jan 3, 2022, 10:46:37 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206822,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',200280,214659,'Y',22,150,'N','N','N','N',0,0,'Y',TO_DATE('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','2a4ac066-9694-4905-9aa3-8d5bd60a7593','Y',170,2)
;
-- Jan 3, 2022, 10:46:45 AM CET
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_DATE('2022-01-03 10:46:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206822
;
SELECT register_migration_script('202201031130_IDEMPIERE-3561.sql') FROM dual
;

91
migration/i9/postgresql/202201031130_IDEMPIERE-3561.sql Normal file
View File

@ -0,0 +1,91 @@
-- IDEMPIERE-3561
-- Jan 3, 2022, 10:44:39 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,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 (214656,0,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',895,'AD_Window_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_TIMESTAMP('2022-01-03 10:44:38','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:44:38','YYYY-MM-DD HH24:MI:SS'),0,143,'Y','N','D','N','N','N','Y','0d69d1c3-81aa-42d6-8515-eb8d67194d5c','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:44:53 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Reference_Value_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 (214657,0,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',895,'PO_Window_ID',22,'N','N','N','N','N',0,'N',18,284,0,0,'Y',TO_TIMESTAMP('2022-01-03 10:44:53','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:44:53','YYYY-MM-DD HH24:MI:SS'),0,2136,'Y','N','D','N','N','N','Y','57c86a93-1d2f-4c67-9d47-e89192de18a2','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:44:58 AM CET
UPDATE AD_Column SET FKConstraintName='ADWindow_ADInfoWindow', FKConstraintType='N',Updated=TO_TIMESTAMP('2022-01-03 10:44:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214656
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD COLUMN AD_Window_ID NUMERIC(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD CONSTRAINT ADWindow_ADInfoWindow FOREIGN KEY (AD_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:44:58 AM CET
UPDATE AD_Column SET FKConstraintName='POWindow_ADInfoWindow', FKConstraintType='N',Updated=TO_TIMESTAMP('2022-01-03 10:44:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214657
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD COLUMN PO_Window_ID NUMERIC(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:44:58 AM CET
ALTER TABLE AD_InfoWindow ADD CONSTRAINT POWindow_ADInfoWindow FOREIGN KEY (PO_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:45:40 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206819,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',842,214656,'Y',22,240,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','61158a17-db64-4d3e-bd5b-0ecb4b84c3d8','Y',150,2)
;
-- Jan 3, 2022, 10:45:40 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206820,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',842,214657,'Y',22,250,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:45:40','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','0bcdb675-a41d-4322-b3bc-7500a71d1458','Y',160,2)
;
-- Jan 3, 2022, 10:45:49 AM CET
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=250, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-01-03 10:45:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206820
;
-- Jan 3, 2022, 10:46:11 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,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 (214658,0,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',200266,'AD_Window_ID',22,'N','N','N','N','N',0,'N',19,0,0,'Y',TO_TIMESTAMP('2022-01-03 10:46:10','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:46:10','YYYY-MM-DD HH24:MI:SS'),0,143,'Y','N','D','N','N','N','Y','c27982a3-9d94-4d98-a033-6fc9d4f3e9ca','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:46:18 AM CET
INSERT INTO AD_Column (AD_Column_ID,Version,Name,Description,Help,AD_Table_ID,ColumnName,FieldLength,IsKey,IsParent,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsEncrypted,AD_Reference_ID,AD_Reference_Value_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 (214659,0,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',200266,'PO_Window_ID',22,'N','N','N','N','N',0,'N',18,284,0,0,'Y',TO_TIMESTAMP('2022-01-03 10:46:18','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:46:18','YYYY-MM-DD HH24:MI:SS'),0,2136,'Y','N','D','N','N','N','Y','27bd2166-8981-4e75-9669-d73160524e7a','Y',0,'N','N','N','N')
;
-- Jan 3, 2022, 10:46:23 AM CET
UPDATE AD_Column SET FKConstraintName='ADWindow_ADUserDefInfo', FKConstraintType='N',Updated=TO_TIMESTAMP('2022-01-03 10:46:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214658
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD COLUMN AD_Window_ID NUMERIC(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD CONSTRAINT ADWindow_ADUserDefInfo FOREIGN KEY (AD_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:46:23 AM CET
UPDATE AD_Column SET FKConstraintName='POWindow_ADUserDefInfo', FKConstraintType='N',Updated=TO_TIMESTAMP('2022-01-03 10:46:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=214659
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD COLUMN PO_Window_ID NUMERIC(10) DEFAULT NULL
;
-- Jan 3, 2022, 10:46:23 AM CET
ALTER TABLE AD_UserDef_Info ADD CONSTRAINT POWindow_ADUserDefInfo FOREIGN KEY (PO_Window_ID) REFERENCES ad_window(ad_window_id) DEFERRABLE INITIALLY DEFERRED
;
-- Jan 3, 2022, 10:46:37 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206821,'Window','Data entry or display window','The Window field identifies a unique Window in the system.',200280,214658,'Y',22,140,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','1429e754-70e3-4a6f-b4f4-86291ce22f29','Y',160,2)
;
-- Jan 3, 2022, 10:46:37 AM CET
INSERT INTO AD_Field (AD_Field_ID,Name,Description,Help,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 (206822,'PO Window','Purchase Order Window','Window for Purchase Order (AP) Zooms',200280,214659,'Y',22,150,'N','N','N','N',0,0,'Y',TO_TIMESTAMP('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2022-01-03 10:46:37','YYYY-MM-DD HH24:MI:SS'),0,'N','Y','D','2a4ac066-9694-4905-9aa3-8d5bd60a7593','Y',170,2)
;
-- Jan 3, 2022, 10:46:45 AM CET
UPDATE AD_Field SET IsDisplayed='Y', SeqNo=150, AD_Reference_Value_ID=NULL, AD_Val_Rule_ID=NULL, XPosition=4, IsToolbarButton=NULL,Updated=TO_TIMESTAMP('2022-01-03 10:46:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Field_ID=206822
;
SELECT register_migration_script('202201031130_IDEMPIERE-3561.sql') FROM dual
;

32
org.adempiere.base/src/org/compiere/model/I_AD_InfoWindow.java
View File

@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
/** Generated Interface for AD_InfoWindow /** Generated Interface for AD_InfoWindow
* @author iDempiere (generated) * @author iDempiere (generated)
* @version Release 9 * @version Release 10
*/ */
public interface I_AD_InfoWindow public interface I_AD_InfoWindow
{ {
@ -110,6 +110,21 @@ public interface I_AD_InfoWindow
public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException; public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException;
/** Column name AD_Window_ID */
public static final String COLUMNNAME_AD_Window_ID = "AD_Window_ID";
/** Set Window.
* Data entry or display window
*/
public void setAD_Window_ID (int AD_Window_ID);
/** Get Window.
* Data entry or display window
*/
public int getAD_Window_ID();
public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException;
/** Column name Created */ /** Column name Created */
public static final String COLUMNNAME_Created = "Created"; public static final String COLUMNNAME_Created = "Created";
@ -332,6 +347,21 @@ public interface I_AD_InfoWindow
/** Get Paging Size */ /** Get Paging Size */
public int getPagingSize(); public int getPagingSize();
/** Column name PO_Window_ID */
public static final String COLUMNNAME_PO_Window_ID = "PO_Window_ID";
/** Set PO Window.
* Purchase Order Window
*/
public void setPO_Window_ID (int PO_Window_ID);
/** Get PO Window.
* Purchase Order Window
*/
public int getPO_Window_ID();
public org.compiere.model.I_AD_Window getPO_Window() throws RuntimeException;
/** Column name Processing */ /** Column name Processing */
public static final String COLUMNNAME_Processing = "Processing"; public static final String COLUMNNAME_Processing = "Processing";

50
org.adempiere.base/src/org/compiere/model/I_AD_UserDef_Info.java
View File

@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
/** Generated Interface for AD_UserDef_Info /** Generated Interface for AD_UserDef_Info
* @author iDempiere (generated) * @author iDempiere (generated)
* @version Release 9 * @version Release 10
*/ */
public interface I_AD_UserDef_Info public interface I_AD_UserDef_Info
{ {
@ -105,6 +105,21 @@ public interface I_AD_UserDef_Info
public org.compiere.model.I_AD_Role getAD_Role() throws RuntimeException; public org.compiere.model.I_AD_Role getAD_Role() throws RuntimeException;
/** Column name AD_User_ID */
public static final String COLUMNNAME_AD_User_ID = "AD_User_ID";
/** Set User/Contact.
* User within the system - Internal or Business Partner Contact
*/
public void setAD_User_ID (int AD_User_ID);
/** Get User/Contact.
* User within the system - Internal or Business Partner Contact
*/
public int getAD_User_ID();
public org.compiere.model.I_AD_User getAD_User() throws RuntimeException;
/** Column name AD_UserDef_Info_ID */ /** Column name AD_UserDef_Info_ID */
public static final String COLUMNNAME_AD_UserDef_Info_ID = "AD_UserDef_Info_ID"; public static final String COLUMNNAME_AD_UserDef_Info_ID = "AD_UserDef_Info_ID";
@ -123,20 +138,20 @@ public interface I_AD_UserDef_Info
/** Get AD_UserDef_Info_UU */ /** Get AD_UserDef_Info_UU */
public String getAD_UserDef_Info_UU(); public String getAD_UserDef_Info_UU();
/** Column name AD_User_ID */ /** Column name AD_Window_ID */
public static final String COLUMNNAME_AD_User_ID = "AD_User_ID"; public static final String COLUMNNAME_AD_Window_ID = "AD_Window_ID";
/** Set User/Contact. /** Set Window.
* User within the system - Internal or Business Partner Contact * Data entry or display window
*/ */
public void setAD_User_ID (int AD_User_ID); public void setAD_Window_ID (int AD_Window_ID);
/** Get User/Contact. /** Get Window.
* User within the system - Internal or Business Partner Contact * Data entry or display window
*/ */
public int getAD_User_ID(); public int getAD_Window_ID();
public org.compiere.model.I_AD_User getAD_User() throws RuntimeException; public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException;
/** Column name Created */ /** Column name Created */
public static final String COLUMNNAME_Created = "Created"; public static final String COLUMNNAME_Created = "Created";
@ -232,6 +247,21 @@ public interface I_AD_UserDef_Info
*/ */
public String getName(); public String getName();
/** Column name PO_Window_ID */
public static final String COLUMNNAME_PO_Window_ID = "PO_Window_ID";
/** Set PO Window.
* Purchase Order Window
*/
public void setPO_Window_ID (int PO_Window_ID);
/** Get PO Window.
* Purchase Order Window
*/
public int getPO_Window_ID();
public org.compiere.model.I_AD_Window getPO_Window() throws RuntimeException;
/** Column name SeqNo */ /** Column name SeqNo */
public static final String COLUMNNAME_SeqNo = "SeqNo"; public static final String COLUMNNAME_SeqNo = "SeqNo";

60
org.adempiere.base/src/org/compiere/model/X_AD_InfoWindow.java
View File

@ -23,7 +23,7 @@ import org.compiere.util.KeyNamePair;
/** Generated Model for AD_InfoWindow /** Generated Model for AD_InfoWindow
* @author iDempiere (generated) * @author iDempiere (generated)
* @version Release 9 - $Id$ */ * @version Release 10 - $Id$ */
@org.adempiere.base.Model(table="AD_InfoWindow") @org.adempiere.base.Model(table="AD_InfoWindow")
public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent
{ {
@ -31,7 +31,7 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent
/** /**
* *
*/ */
private static final long serialVersionUID = 20211224L; private static final long serialVersionUID = 20220103L;
/** Standard Constructor */ /** Standard Constructor */
public X_AD_InfoWindow (Properties ctx, int AD_InfoWindow_ID, String trxName) public X_AD_InfoWindow (Properties ctx, int AD_InfoWindow_ID, String trxName)
@ -180,6 +180,34 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent
return ii.intValue(); return ii.intValue();
} }
public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException
{
return (org.compiere.model.I_AD_Window)MTable.get(getCtx(), org.compiere.model.I_AD_Window.Table_ID)
.getPO(getAD_Window_ID(), get_TrxName());
}
/** Set Window.
@param AD_Window_ID Data entry or display window
*/
public void setAD_Window_ID (int AD_Window_ID)
{
if (AD_Window_ID < 1)
set_Value (COLUMNNAME_AD_Window_ID, null);
else
set_Value (COLUMNNAME_AD_Window_ID, Integer.valueOf(AD_Window_ID));
}
/** Get Window.
@return Data entry or display window
*/
public int getAD_Window_ID()
{
Integer ii = (Integer)get_Value(COLUMNNAME_AD_Window_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Description. /** Set Description.
@param Description Optional short description of the record @param Description Optional short description of the record
*/ */
@ -471,6 +499,34 @@ public class X_AD_InfoWindow extends PO implements I_AD_InfoWindow, I_Persistent
return ii.intValue(); return ii.intValue();
} }
public org.compiere.model.I_AD_Window getPO_Window() throws RuntimeException
{
return (org.compiere.model.I_AD_Window)MTable.get(getCtx(), org.compiere.model.I_AD_Window.Table_ID)
.getPO(getPO_Window_ID(), get_TrxName());
}
/** Set PO Window.
@param PO_Window_ID Purchase Order Window
*/
public void setPO_Window_ID (int PO_Window_ID)
{
if (PO_Window_ID < 1)
set_Value (COLUMNNAME_PO_Window_ID, null);
else
set_Value (COLUMNNAME_PO_Window_ID, Integer.valueOf(PO_Window_ID));
}
/** Get PO Window.
@return Purchase Order Window
*/
public int getPO_Window_ID()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PO_Window_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Process Now. /** Set Process Now.
@param Processing Process Now @param Processing Process Now
*/ */

86
org.adempiere.base/src/org/compiere/model/X_AD_UserDef_Info.java
View File

@ -22,7 +22,7 @@ import java.util.Properties;
/** Generated Model for AD_UserDef_Info /** Generated Model for AD_UserDef_Info
* @author iDempiere (generated) * @author iDempiere (generated)
* @version Release 9 - $Id$ */ * @version Release 10 - $Id$ */
@org.adempiere.base.Model(table="AD_UserDef_Info") @org.adempiere.base.Model(table="AD_UserDef_Info")
public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persistent public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persistent
{ {
@ -30,7 +30,7 @@ public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persis
/** /**
* *
*/ */
private static final long serialVersionUID = 20211224L; private static final long serialVersionUID = 20220103L;
/** Standard Constructor */ /** Standard Constructor */
public X_AD_UserDef_Info (Properties ctx, int AD_UserDef_Info_ID, String trxName) public X_AD_UserDef_Info (Properties ctx, int AD_UserDef_Info_ID, String trxName)
@ -148,6 +148,34 @@ public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persis
return ii.intValue(); return ii.intValue();
} }
public org.compiere.model.I_AD_User getAD_User() throws RuntimeException
{
return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_ID)
.getPO(getAD_User_ID(), get_TrxName());
}
/** Set User/Contact.
@param AD_User_ID User within the system - Internal or Business Partner Contact
*/
public void setAD_User_ID (int AD_User_ID)
{
if (AD_User_ID < 1)
set_Value (COLUMNNAME_AD_User_ID, null);
else
set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID));
}
/** Get User/Contact.
@return User within the system - Internal or Business Partner Contact
*/
public int getAD_User_ID()
{
Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set User defined Info Window. /** Set User defined Info Window.
@param AD_UserDef_Info_ID User defined Info Window @param AD_UserDef_Info_ID User defined Info Window
*/ */
@ -184,29 +212,29 @@ public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persis
return (String)get_Value(COLUMNNAME_AD_UserDef_Info_UU); return (String)get_Value(COLUMNNAME_AD_UserDef_Info_UU);
} }
public org.compiere.model.I_AD_User getAD_User() throws RuntimeException public org.compiere.model.I_AD_Window getAD_Window() throws RuntimeException
{ {
return (org.compiere.model.I_AD_User)MTable.get(getCtx(), org.compiere.model.I_AD_User.Table_ID) return (org.compiere.model.I_AD_Window)MTable.get(getCtx(), org.compiere.model.I_AD_Window.Table_ID)
.getPO(getAD_User_ID(), get_TrxName()); .getPO(getAD_Window_ID(), get_TrxName());
} }
/** Set User/Contact. /** Set Window.
@param AD_User_ID User within the system - Internal or Business Partner Contact @param AD_Window_ID Data entry or display window
*/ */
public void setAD_User_ID (int AD_User_ID) public void setAD_Window_ID (int AD_Window_ID)
{ {
if (AD_User_ID < 1) if (AD_Window_ID < 1)
set_Value (COLUMNNAME_AD_User_ID, null); set_Value (COLUMNNAME_AD_Window_ID, null);
else else
set_Value (COLUMNNAME_AD_User_ID, Integer.valueOf(AD_User_ID)); set_Value (COLUMNNAME_AD_Window_ID, Integer.valueOf(AD_Window_ID));
} }
/** Get User/Contact. /** Get Window.
@return User within the system - Internal or Business Partner Contact @return Data entry or display window
*/ */
public int getAD_User_ID() public int getAD_Window_ID()
{ {
Integer ii = (Integer)get_Value(COLUMNNAME_AD_User_ID); Integer ii = (Integer)get_Value(COLUMNNAME_AD_Window_ID);
if (ii == null) if (ii == null)
return 0; return 0;
return ii.intValue(); return ii.intValue();
@ -299,6 +327,34 @@ public class X_AD_UserDef_Info extends PO implements I_AD_UserDef_Info, I_Persis
return (String)get_Value(COLUMNNAME_Name); return (String)get_Value(COLUMNNAME_Name);
} }
public org.compiere.model.I_AD_Window getPO_Window() throws RuntimeException
{
return (org.compiere.model.I_AD_Window)MTable.get(getCtx(), org.compiere.model.I_AD_Window.Table_ID)
.getPO(getPO_Window_ID(), get_TrxName());
}
/** Set PO Window.
@param PO_Window_ID Purchase Order Window
*/
public void setPO_Window_ID (int PO_Window_ID)
{
if (PO_Window_ID < 1)
set_Value (COLUMNNAME_PO_Window_ID, null);
else
set_Value (COLUMNNAME_PO_Window_ID, Integer.valueOf(PO_Window_ID));
}
/** Get PO Window.
@return Purchase Order Window
*/
public int getPO_Window_ID()
{
Integer ii = (Integer)get_Value(COLUMNNAME_PO_Window_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Sequence. /** Set Sequence.
@param SeqNo Method of ordering records; lowest number comes first @param SeqNo Method of ordering records; lowest number comes first
*/ */

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
View File

@ -2226,6 +2226,23 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
isSOTrx = "Y"; isSOTrx = "Y";
} }
if (infoWindow != null) {
MUserDefInfo userDef = MUserDefInfo.getBestMatch(Env.getCtx(), infoWindow.getAD_InfoWindow_ID());
if (userDef != null) {
if (isSOTrx.equals("N") && userDef.getPO_Window_ID() > 0)
return userDef.getPO_Window_ID();
if (userDef.getAD_Window_ID() > 0)
return userDef.getAD_Window_ID();
}
if (isSOTrx.equals("N") && infoWindow.getPO_Window_ID() > 0)
return infoWindow.getPO_Window_ID();
if (infoWindow.getAD_Window_ID() > 0)
return infoWindow.getAD_Window_ID();
}
return super.getAD_Window_ID(MTable.getTableName(Env.getCtx(), infoWindow.getAD_Table_ID()), isSOTrx.equalsIgnoreCase("Y")); return super.getAD_Window_ID(MTable.getTableName(Env.getCtx(), infoWindow.getAD_Table_ID()), isSOTrx.equalsIgnoreCase("Y"));
} }