diff --git a/migration/i2.0/oracle/201312161956_IDEMPIERE-1480.sql b/migration/i2.0/oracle/201312161956_IDEMPIERE-1480.sql new file mode 100644 index 0000000000..bdda505528 --- /dev/null +++ b/migration/i2.0/oracle/201312161956_IDEMPIERE-1480.sql @@ -0,0 +1,168 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Dec 16, 2013 7:25:17 PM COT +-- IDEMPIERE-1480 Usability - Toolbar buttons reordering +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_DATE('2013-12-16 19:25:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200045 +; + +-- Dec 16, 2013 7:25:27 PM COT +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_DATE('2013-12-16 19:25:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200046 +; + +-- Dec 16, 2013 7:25:29 PM COT +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_DATE('2013-12-16 19:25:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200047 +; + +-- Dec 16, 2013 7:25:32 PM COT +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_DATE('2013-12-16 19:25:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200048 +; + +-- Dec 16, 2013 7:30:07 PM COT +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Client_ID,AD_Org_ID,EntityType) VALUES (0,'N',200002,0,'N','N',200816,110,'Y',202546,'N','The Sequence indicates the order of records','Method of ordering records; lowest number comes first','Sequence','6086b040-72f2-4bb2-8716-fa3ab838a652','Y','N',100,TO_DATE('2013-12-16 19:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-12-16 19:30:06','YYYY-MM-DD HH24:MI:SS'),'Y','Y',110,1,'N',2,1,'N','N',0,0,'U') +; + +-- Dec 16, 2013 7:32:06 PM COT +UPDATE AD_ToolBarButton SET SeqNo=10,Updated=TO_DATE('2013-12-16 19:32:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200029 +; + +-- Dec 16, 2013 7:32:18 PM COT +UPDATE AD_ToolBarButton SET SeqNo=20,Updated=TO_DATE('2013-12-16 19:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200030 +; + +-- Dec 16, 2013 7:32:28 PM COT +UPDATE AD_ToolBarButton SET SeqNo=30,Updated=TO_DATE('2013-12-16 19:32:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200031 +; + +-- Dec 16, 2013 7:32:39 PM COT +UPDATE AD_ToolBarButton SET SeqNo=40,Updated=TO_DATE('2013-12-16 19:32:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200032 +; + +-- Dec 16, 2013 7:32:49 PM COT +UPDATE AD_ToolBarButton SET SeqNo=50,Updated=TO_DATE('2013-12-16 19:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200033 +; + +-- Dec 16, 2013 7:33:01 PM COT +UPDATE AD_ToolBarButton SET SeqNo=60,Updated=TO_DATE('2013-12-16 19:33:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200035 +; + +-- Dec 16, 2013 7:33:09 PM COT +UPDATE AD_ToolBarButton SET SeqNo=70,Updated=TO_DATE('2013-12-16 19:33:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200036 +; + +-- Dec 16, 2013 7:33:17 PM COT +UPDATE AD_ToolBarButton SET SeqNo=80,Updated=TO_DATE('2013-12-16 19:33:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200037 +; + +-- Dec 16, 2013 7:33:23 PM COT +UPDATE AD_ToolBarButton SET SeqNo=90,Updated=TO_DATE('2013-12-16 19:33:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200038 +; + +-- Dec 16, 2013 7:33:39 PM COT +UPDATE AD_ToolBarButton SET SeqNo=100,Updated=TO_DATE('2013-12-16 19:33:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200039 +; + +-- Dec 16, 2013 7:33:48 PM COT +UPDATE AD_ToolBarButton SET SeqNo=110,Updated=TO_DATE('2013-12-16 19:33:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200040 +; + +-- Dec 16, 2013 7:33:58 PM COT +UPDATE AD_ToolBarButton SET SeqNo=120,Updated=TO_DATE('2013-12-16 19:33:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200041 +; + +-- Dec 16, 2013 7:34:13 PM COT +UPDATE AD_ToolBarButton SET SeqNo=130,Updated=TO_DATE('2013-12-16 19:34:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200058 +; + +-- Dec 16, 2013 7:34:19 PM COT +UPDATE AD_ToolBarButton SET SeqNo=140,Updated=TO_DATE('2013-12-16 19:34:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200043 +; + +-- Dec 16, 2013 7:34:25 PM COT +UPDATE AD_ToolBarButton SET SeqNo=150,Updated=TO_DATE('2013-12-16 19:34:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200044 +; + +-- Dec 16, 2013 7:35:10 PM COT +UPDATE AD_ToolBarButton SET SeqNo=160,Updated=TO_DATE('2013-12-16 19:35:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200049 +; + +-- Dec 16, 2013 7:35:17 PM COT +UPDATE AD_ToolBarButton SET SeqNo=170,Updated=TO_DATE('2013-12-16 19:35:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200050 +; + +-- Dec 16, 2013 7:35:24 PM COT +UPDATE AD_ToolBarButton SET SeqNo=180,Updated=TO_DATE('2013-12-16 19:35:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200051 +; + +-- Dec 16, 2013 7:35:32 PM COT +UPDATE AD_ToolBarButton SET SeqNo=190,Updated=TO_DATE('2013-12-16 19:35:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200052 +; + +-- Dec 16, 2013 7:35:38 PM COT +UPDATE AD_ToolBarButton SET SeqNo=200,Updated=TO_DATE('2013-12-16 19:35:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200053 +; + +-- Dec 16, 2013 7:35:52 PM COT +UPDATE AD_ToolBarButton SET SeqNo=210,Updated=TO_DATE('2013-12-16 19:35:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200054 +; + +-- Dec 16, 2013 7:36:08 PM COT +UPDATE AD_ToolBarButton SET SeqNo=220,Updated=TO_DATE('2013-12-16 19:36:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200055 +; + +-- Dec 16, 2013 7:36:11 PM COT +UPDATE AD_ToolBarButton SET SeqNo=230,Updated=TO_DATE('2013-12-16 19:36:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200056 +; + +-- Dec 16, 2013 7:37:23 PM COT +UPDATE AD_ToolBarButton SET SeqNo=250,Updated=TO_DATE('2013-12-16 19:37:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200057 +; + +-- Dec 16, 2013 7:37:27 PM COT +UPDATE AD_ToolBarButton SET SeqNo=260,Updated=TO_DATE('2013-12-16 19:37:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200067 +; + +-- Dec 16, 2013 7:38:26 PM COT +INSERT INTO AD_ToolBarButton (Action,SeqNo,Name,ComponentName,IsCustomization,KeyStroke_KeyCode,KeyStroke_Modifiers,AD_Org_ID,Created,CreatedBy,AD_ToolBarButton_ID,Updated,UpdatedBy,IsActive,AD_Client_ID,AD_ToolBarButton_UU,IsAdvancedButton) VALUES ('W',240,'Window - Process','Process','N',0,0,0,TO_DATE('2013-12-16 19:38:25','YYYY-MM-DD HH24:MI:SS'),100,200078,TO_DATE('2013-12-16 19:38:25','YYYY-MM-DD HH24:MI:SS'),100,'Y',0,'67ae467b-48d1-40bf-aa05-2ee5a5203aef','N') +; + +-- Dec 16, 2013 8:35:22 PM COT +-- IDEMPIERE-1480 Usability - Toolbar buttons reordering +INSERT INTO AD_Element (ColumnName,AD_Element_ID,Name,PrintName,AD_Element_UU,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType) VALUES ('IsAddSeparator',202632,'Add Separator','Add Separator','249e1be4-732d-4ebc-becb-3a65343e6be4',TO_DATE('2013-12-16 20:35:21','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-12-16 20:35:21','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y',0,'D') +; + +-- Dec 16, 2013 8:36:04 PM COT +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,Updated,CreatedBy,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,IsEncrypted,IsSecure,FKConstraintType,AD_Client_ID,AD_Org_ID,EntityType,AD_Reference_ID,AD_Table_ID,AD_Element_ID) VALUES (0,'N',0,210895,'Y','N','N',0,'N',1,'N','N','N','Y','ec4f7984-3670-47d2-af4a-269920bf891d','Y','IsAddSeparator','N','Add Separator','Y',TO_DATE('2013-12-16 20:36:04','YYYY-MM-DD HH24:MI:SS'),100,'Y',TO_DATE('2013-12-16 20:36:04','YYYY-MM-DD HH24:MI:SS'),100,'N','N','N','N','N',0,0,'D',20,200003,202632) +; + +-- Dec 16, 2013 8:36:26 PM COT +ALTER TABLE AD_ToolBarButton ADD IsAddSeparator CHAR(1) DEFAULT 'N' CHECK (IsAddSeparator IN ('Y','N')) NOT NULL +; + +-- Dec 16, 2013 8:39:00 PM COT +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Client_ID,AD_Org_ID,EntityType) VALUES (0,'N',200002,0,'N','N',210895,120,'Y',202547,'N','Add Separator','86529d4e-ed27-4c19-8679-683715170f9e','Y','N',100,TO_DATE('2013-12-16 20:39:00','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-12-16 20:39:00','YYYY-MM-DD HH24:MI:SS'),'Y','Y',120,1,'N',1,1,'N','N',0,0,'D') +; + +-- Dec 16, 2013 8:39:19 PM COT +UPDATE AD_Field SET SeqNo=120, IsDisplayed='Y', XPosition=5, ColumnSpan=2,Updated=TO_DATE('2013-12-16 20:39:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202547 +; + +-- Dec 16, 2013 8:40:46 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_DATE('2013-12-16 20:40:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200030 +; + +-- Dec 16, 2013 8:41:03 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_DATE('2013-12-16 20:41:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200036 +; + +-- Dec 16, 2013 8:41:28 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_DATE('2013-12-16 20:41:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200058 +; + +-- Dec 16, 2013 8:41:33 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_DATE('2013-12-16 20:41:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200044 +; + +SELECT register_migration_script('201312161956_IDEMPIERE-1480.sql') FROM dual +; + diff --git a/migration/i2.0/postgresql/201312161956_IDEMPIERE-1480.sql b/migration/i2.0/postgresql/201312161956_IDEMPIERE-1480.sql new file mode 100644 index 0000000000..5d5f271528 --- /dev/null +++ b/migration/i2.0/postgresql/201312161956_IDEMPIERE-1480.sql @@ -0,0 +1,165 @@ +-- Dec 16, 2013 7:25:17 PM COT +-- IDEMPIERE-1480 Usability - Toolbar buttons reordering +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-16 19:25:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200045 +; + +-- Dec 16, 2013 7:25:27 PM COT +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-16 19:25:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200046 +; + +-- Dec 16, 2013 7:25:29 PM COT +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-16 19:25:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200047 +; + +-- Dec 16, 2013 7:25:32 PM COT +UPDATE AD_ToolBarButton SET IsActive='N',Updated=TO_TIMESTAMP('2013-12-16 19:25:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200048 +; + +-- Dec 16, 2013 7:30:07 PM COT +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Client_ID,AD_Org_ID,EntityType) VALUES (0,'N',200002,0,'N','N',200816,110,'Y',202546,'N','The Sequence indicates the order of records','Method of ordering records; lowest number comes first','Sequence','6086b040-72f2-4bb2-8716-fa3ab838a652','Y','N',100,TO_TIMESTAMP('2013-12-16 19:30:06','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-12-16 19:30:06','YYYY-MM-DD HH24:MI:SS'),'Y','Y',110,1,'N',2,1,'N','N',0,0,'U') +; + +-- Dec 16, 2013 7:32:06 PM COT +UPDATE AD_ToolBarButton SET SeqNo=10,Updated=TO_TIMESTAMP('2013-12-16 19:32:06','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200029 +; + +-- Dec 16, 2013 7:32:18 PM COT +UPDATE AD_ToolBarButton SET SeqNo=20,Updated=TO_TIMESTAMP('2013-12-16 19:32:18','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200030 +; + +-- Dec 16, 2013 7:32:28 PM COT +UPDATE AD_ToolBarButton SET SeqNo=30,Updated=TO_TIMESTAMP('2013-12-16 19:32:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200031 +; + +-- Dec 16, 2013 7:32:39 PM COT +UPDATE AD_ToolBarButton SET SeqNo=40,Updated=TO_TIMESTAMP('2013-12-16 19:32:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200032 +; + +-- Dec 16, 2013 7:32:49 PM COT +UPDATE AD_ToolBarButton SET SeqNo=50,Updated=TO_TIMESTAMP('2013-12-16 19:32:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200033 +; + +-- Dec 16, 2013 7:33:01 PM COT +UPDATE AD_ToolBarButton SET SeqNo=60,Updated=TO_TIMESTAMP('2013-12-16 19:33:01','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200035 +; + +-- Dec 16, 2013 7:33:09 PM COT +UPDATE AD_ToolBarButton SET SeqNo=70,Updated=TO_TIMESTAMP('2013-12-16 19:33:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200036 +; + +-- Dec 16, 2013 7:33:17 PM COT +UPDATE AD_ToolBarButton SET SeqNo=80,Updated=TO_TIMESTAMP('2013-12-16 19:33:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200037 +; + +-- Dec 16, 2013 7:33:23 PM COT +UPDATE AD_ToolBarButton SET SeqNo=90,Updated=TO_TIMESTAMP('2013-12-16 19:33:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200038 +; + +-- Dec 16, 2013 7:33:39 PM COT +UPDATE AD_ToolBarButton SET SeqNo=100,Updated=TO_TIMESTAMP('2013-12-16 19:33:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200039 +; + +-- Dec 16, 2013 7:33:48 PM COT +UPDATE AD_ToolBarButton SET SeqNo=110,Updated=TO_TIMESTAMP('2013-12-16 19:33:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200040 +; + +-- Dec 16, 2013 7:33:58 PM COT +UPDATE AD_ToolBarButton SET SeqNo=120,Updated=TO_TIMESTAMP('2013-12-16 19:33:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200041 +; + +-- Dec 16, 2013 7:34:13 PM COT +UPDATE AD_ToolBarButton SET SeqNo=130,Updated=TO_TIMESTAMP('2013-12-16 19:34:13','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200058 +; + +-- Dec 16, 2013 7:34:19 PM COT +UPDATE AD_ToolBarButton SET SeqNo=140,Updated=TO_TIMESTAMP('2013-12-16 19:34:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200043 +; + +-- Dec 16, 2013 7:34:25 PM COT +UPDATE AD_ToolBarButton SET SeqNo=150,Updated=TO_TIMESTAMP('2013-12-16 19:34:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200044 +; + +-- Dec 16, 2013 7:35:10 PM COT +UPDATE AD_ToolBarButton SET SeqNo=160,Updated=TO_TIMESTAMP('2013-12-16 19:35:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200049 +; + +-- Dec 16, 2013 7:35:17 PM COT +UPDATE AD_ToolBarButton SET SeqNo=170,Updated=TO_TIMESTAMP('2013-12-16 19:35:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200050 +; + +-- Dec 16, 2013 7:35:24 PM COT +UPDATE AD_ToolBarButton SET SeqNo=180,Updated=TO_TIMESTAMP('2013-12-16 19:35:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200051 +; + +-- Dec 16, 2013 7:35:32 PM COT +UPDATE AD_ToolBarButton SET SeqNo=190,Updated=TO_TIMESTAMP('2013-12-16 19:35:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200052 +; + +-- Dec 16, 2013 7:35:38 PM COT +UPDATE AD_ToolBarButton SET SeqNo=200,Updated=TO_TIMESTAMP('2013-12-16 19:35:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200053 +; + +-- Dec 16, 2013 7:35:52 PM COT +UPDATE AD_ToolBarButton SET SeqNo=210,Updated=TO_TIMESTAMP('2013-12-16 19:35:52','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200054 +; + +-- Dec 16, 2013 7:36:08 PM COT +UPDATE AD_ToolBarButton SET SeqNo=220,Updated=TO_TIMESTAMP('2013-12-16 19:36:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200055 +; + +-- Dec 16, 2013 7:36:11 PM COT +UPDATE AD_ToolBarButton SET SeqNo=230,Updated=TO_TIMESTAMP('2013-12-16 19:36:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200056 +; + +-- Dec 16, 2013 7:37:23 PM COT +UPDATE AD_ToolBarButton SET SeqNo=250,Updated=TO_TIMESTAMP('2013-12-16 19:37:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200057 +; + +-- Dec 16, 2013 7:37:27 PM COT +UPDATE AD_ToolBarButton SET SeqNo=260,Updated=TO_TIMESTAMP('2013-12-16 19:37:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200067 +; + +-- Dec 16, 2013 7:38:26 PM COT +INSERT INTO AD_ToolBarButton ("action",SeqNo,Name,ComponentName,IsCustomization,KeyStroke_KeyCode,KeyStroke_Modifiers,AD_Org_ID,Created,CreatedBy,AD_ToolBarButton_ID,Updated,UpdatedBy,IsActive,AD_Client_ID,AD_ToolBarButton_UU,IsAdvancedButton) VALUES ('W',240,'Window - Process','Process','N',0,0,0,TO_TIMESTAMP('2013-12-16 19:38:25','YYYY-MM-DD HH24:MI:SS'),100,200078,TO_TIMESTAMP('2013-12-16 19:38:25','YYYY-MM-DD HH24:MI:SS'),100,'Y',0,'67ae467b-48d1-40bf-aa05-2ee5a5203aef','N') +; + +-- Dec 16, 2013 8:35:22 PM COT +-- IDEMPIERE-1480 Usability - Toolbar buttons reordering +INSERT INTO AD_Element (ColumnName,AD_Element_ID,Name,PrintName,AD_Element_UU,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,AD_Client_ID,EntityType) VALUES ('IsAddSeparator',202632,'Add Separator','Add Separator','249e1be4-732d-4ebc-becb-3a65343e6be4',TO_TIMESTAMP('2013-12-16 20:35:21','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-12-16 20:35:21','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y',0,'D') +; + +-- Dec 16, 2013 8:36:04 PM COT +INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,Updated,CreatedBy,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,IsEncrypted,IsSecure,FKConstraintType,AD_Client_ID,AD_Org_ID,EntityType,AD_Reference_ID,AD_Table_ID,AD_Element_ID) VALUES (0,'N',0,210895,'Y','N','N',0,'N',1,'N','N','N','Y','ec4f7984-3670-47d2-af4a-269920bf891d','Y','IsAddSeparator','N','Add Separator','Y',TO_TIMESTAMP('2013-12-16 20:36:04','YYYY-MM-DD HH24:MI:SS'),100,'Y',TO_TIMESTAMP('2013-12-16 20:36:04','YYYY-MM-DD HH24:MI:SS'),100,'N','N','N','N','N',0,0,'D',20,200003,202632) +; + +-- Dec 16, 2013 8:36:26 PM COT +ALTER TABLE AD_ToolBarButton ADD COLUMN IsAddSeparator CHAR(1) DEFAULT 'N' CHECK (IsAddSeparator IN ('Y','N')) NOT NULL +; + +-- Dec 16, 2013 8:39:00 PM COT +INSERT INTO AD_Field (SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,IsQuickEntry,ColumnSpan,NumLines,IsAdvancedField,IsDefaultFocus,AD_Client_ID,AD_Org_ID,EntityType) VALUES (0,'N',200002,0,'N','N',210895,120,'Y',202547,'N','Add Separator','86529d4e-ed27-4c19-8679-683715170f9e','Y','N',100,TO_TIMESTAMP('2013-12-16 20:39:00','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-12-16 20:39:00','YYYY-MM-DD HH24:MI:SS'),'Y','Y',120,1,'N',1,1,'N','N',0,0,'D') +; + +-- Dec 16, 2013 8:39:19 PM COT +UPDATE AD_Field SET SeqNo=120, IsDisplayed='Y', XPosition=5, ColumnSpan=2,Updated=TO_TIMESTAMP('2013-12-16 20:39:19','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202547 +; + +-- Dec 16, 2013 8:40:46 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_TIMESTAMP('2013-12-16 20:40:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200030 +; + +-- Dec 16, 2013 8:41:03 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_TIMESTAMP('2013-12-16 20:41:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200036 +; + +-- Dec 16, 2013 8:41:28 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_TIMESTAMP('2013-12-16 20:41:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200058 +; + +-- Dec 16, 2013 8:41:33 PM COT +UPDATE AD_ToolBarButton SET IsAddSeparator='Y',Updated=TO_TIMESTAMP('2013-12-16 20:41:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_ToolBarButton_ID=200044 +; + +SELECT register_migration_script('201312161956_IDEMPIERE-1480.sql') FROM dual +; + diff --git a/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java b/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java index 6044dde424..8605e544aa 100644 --- a/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java +++ b/org.adempiere.base/src/org/compiere/model/I_AD_ToolBarButton.java @@ -200,6 +200,15 @@ public interface I_AD_ToolBarButton */ public boolean isActive(); + /** Column name IsAddSeparator */ + public static final String COLUMNNAME_IsAddSeparator = "IsAddSeparator"; + + /** Set Add Separator */ + public void setIsAddSeparator (boolean IsAddSeparator); + + /** Get Add Separator */ + public boolean isAddSeparator(); + /** Column name IsAdvancedButton */ public static final String COLUMNNAME_IsAdvancedButton = "IsAdvancedButton"; diff --git a/org.adempiere.base/src/org/compiere/model/MMatchPO.java b/org.adempiere.base/src/org/compiere/model/MMatchPO.java index 0cd62f966e..b912ab2852 100644 --- a/org.adempiere.base/src/org/compiere/model/MMatchPO.java +++ b/org.adempiere.base/src/org/compiere/model/MMatchPO.java @@ -791,8 +791,25 @@ public class MMatchPO extends X_M_MatchPO if (mpi[i].getC_InvoiceLine_ID() != 0 && mpi[i].getM_AttributeSetInstance_ID() == getM_AttributeSetInstance_ID()) { - setC_InvoiceLine_ID(mpi[i].getC_InvoiceLine_ID()); - break; + if (mpi[i].getQty().compareTo(getQty()) == 0) // same quantity + { + setC_InvoiceLine_ID(mpi[i].getC_InvoiceLine_ID()); + break; + } + else // create MatchPO record for PO-Invoice if different quantity + { + MInvoiceLine il = new MInvoiceLine(getCtx(), mpi[i].getC_InvoiceLine_ID(), get_TrxName()); + MMatchPO match = new MMatchPO(il, getDateTrx(), mpi[i].getQty()); + match.setC_OrderLine_ID(getC_OrderLine_ID()); + if (!match.save()) + { + String msg = "Failed to create match po"; + ValueNamePair error = CLogger.retrieveError(); + if (error != null) + msg = msg + " " + error.getName(); + throw new RuntimeException(msg); + } + } } } } diff --git a/org.adempiere.base/src/org/compiere/model/MToolBarButton.java b/org.adempiere.base/src/org/compiere/model/MToolBarButton.java index daf5b1e1a8..3bc3019e48 100644 --- a/org.adempiere.base/src/org/compiere/model/MToolBarButton.java +++ b/org.adempiere.base/src/org/compiere/model/MToolBarButton.java @@ -24,11 +24,10 @@ import org.compiere.util.Env; * */ public class MToolBarButton extends X_AD_ToolBarButton { - /** - * generated serial id + * */ - private static final long serialVersionUID = -2809601337584187559L; + private static final long serialVersionUID = -7909388573996489685L; /** * @param ctx @@ -54,20 +53,22 @@ public class MToolBarButton extends X_AD_ToolBarButton { Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), Table_ID), "AD_Tab_ID=? AND Action=? AND AD_Process_ID IS NOT NULL", trxName); List list = query.setParameters(AD_Tab_ID, "W").setOnlyActiveRecords(true) - .setOrderBy("SeqNo").list(); + .setOrderBy("CASE WHEN COALESCE(SeqNo,0)=0 THEN AD_ToolBarButton_ID ELSE SeqNo END").list(); if (list != null && !list.isEmpty()) { buttons = list.toArray(buttons); } return buttons; } - - public static MToolBarButton[] getOfWindow(int AD_Window_ID, String trxName) { + + public static MToolBarButton[] getToolbarButtons(String action, String trxName) { MToolBarButton[] buttons = new MToolBarButton[0]; - - Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), Table_ID), "Action=?" + - " AND IsCustomization='Y' AND ActionClassName IS NOT NULL", trxName); - List list = query.setParameters("W").setOnlyActiveRecords(true).list(); + + Query query = new Query(Env.getCtx(), MTable.get(Env.getCtx(), Table_ID), + "Action=? AND (AD_ToolbarButton_ID<=? OR ActionClassName IS NOT NULL) AND AD_Tab_ID IS NULL", trxName); + List list = query.setParameters(action, MTable.MAX_OFFICIAL_ID) + .setOnlyActiveRecords(true) + .setOrderBy("CASE WHEN COALESCE(SeqNo,0)=0 THEN AD_ToolBarButton_ID ELSE SeqNo END").list(); if (list != null && !list.isEmpty()) { buttons = list.toArray(buttons); } diff --git a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java index 882edafe6f..a7d9079fdf 100644 --- a/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java +++ b/org.adempiere.base/src/org/compiere/model/X_AD_ToolBarButton.java @@ -30,7 +30,7 @@ public class X_AD_ToolBarButton extends PO implements I_AD_ToolBarButton, I_Pers /** * */ - private static final long serialVersionUID = 20131031L; + private static final long serialVersionUID = 20131216L; /** Standard Constructor */ public X_AD_ToolBarButton (Properties ctx, int AD_ToolBarButton_ID, String trxName) @@ -42,6 +42,8 @@ public class X_AD_ToolBarButton extends PO implements I_AD_ToolBarButton, I_Pers // W setAD_ToolBarButton_ID (0); setComponentName (null); + setIsAddSeparator (false); +// N setIsAdvancedButton (false); // N setIsCustomization (false); @@ -269,6 +271,27 @@ public class X_AD_ToolBarButton extends PO implements I_AD_ToolBarButton, I_Pers return (String)get_Value(COLUMNNAME_DisplayLogic); } + /** Set Add Separator. + @param IsAddSeparator Add Separator */ + public void setIsAddSeparator (boolean IsAddSeparator) + { + set_Value (COLUMNNAME_IsAddSeparator, Boolean.valueOf(IsAddSeparator)); + } + + /** Get Add Separator. + @return Add Separator */ + public boolean isAddSeparator () + { + Object oo = get_Value(COLUMNNAME_IsAddSeparator); + if (oo != null) + { + if (oo instanceof Boolean) + return ((Boolean)oo).booleanValue(); + return "Y".equals(oo); + } + return false; + } + /** Set Advanced Button. @param IsAdvancedButton This Button contains advanced Functionality diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java index 43a6cb37b2..ea8278f2c8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java @@ -54,6 +54,7 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.KeyEvent; import org.zkoss.zk.ui.util.Clients; +import org.zkoss.zul.Separator; import org.zkoss.zul.Space; import org.zkoss.zul.Toolbarbutton; @@ -197,7 +198,6 @@ public class ADWindowToolbar extends FToolbar implements EventListener btnProcess.setTooltiptext(btnProcess.getTooltiptext()+ " Alt+O"); btnProcess.setDisabled(false); - // Help and Exit should always be enabled btnHelp.setDisabled(false); btnGridToggle.setDisabled(false); @@ -213,7 +213,54 @@ public class ADWindowToolbar extends FToolbar implements EventListener } btnFileImport = createButton("FileImport", "FileImport", "FileImport"); - configureKeyMap(); + MToolBarButton[] officialButtons = MToolBarButton.getToolbarButtons("W", null); + for (MToolBarButton button : officialButtons) { + if (! button.isActive()) { + buttons.remove(button.getComponentName()); + } else { + if (button.isCustomization()) { + String actionId = button.getActionClassName(); + IServiceHolder serviceHolder = Actions.getAction(actionId); + if (serviceHolder != null && serviceHolder.getService() != null) { + String labelKey = actionId + ".label"; + String tooltipKey = actionId + ".tooltip"; + String label = Msg.getMsg(Env.getCtx(), labelKey); + String tooltiptext = Msg.getMsg(Env.getCtx(), tooltipKey); + if (labelKey.equals(label)) { + label = button.getName(); + } + if (tooltipKey.equals(tooltiptext)) { + tooltipKey = null; + } + ToolBarButton btn = createButton(button.getComponentName(), null, tooltipKey); + this.appendChild(btn); + btn.removeEventListener(Events.ON_CLICK, this); + btn.setId(button.getName()); + btn.setDisabled(false); + + AImage aImage = Actions.getActionImage(actionId); + if (aImage != null) { + btn.setImageContent(aImage); + } else { + btn.setLabel(label); + } + + ToolbarCustomButton toolbarCustomBtn = new ToolbarCustomButton(button, btn, actionId, windowNo); + toolbarCustomButtons.add(toolbarCustomBtn); + + this.appendChild(btn); + } + } + if (buttons.get(button.getComponentName()) != null) { + this.appendChild(buttons.get(button.getComponentName())); + if (button.isAddSeparator()) { + this.appendChild(new Separator("vertical")); + } + } + } + } + + configureKeyMap(); setWidth("100%"); } @@ -239,7 +286,6 @@ public class ADWindowToolbar extends FToolbar implements EventListener btn.setSclass("toolbar-button"); buttons.put(name, btn); - this.appendChild(btn); //make toolbar button last to receive focus btn.setTabindex(0); btn.addEventListener(Events.ON_CLICK, this); @@ -583,9 +629,7 @@ public class ADWindowToolbar extends FToolbar implements EventListener } private boolean ToolBarMenuRestictionLoaded = false; - public void updateToolbarAccess(int AD_Window_ID) { - loadCustomButton(AD_Window_ID); - + public void updateToolbarAccess(int xAD_Window_ID) { if (ToolBarMenuRestictionLoaded) return; @@ -639,44 +683,6 @@ public class ADWindowToolbar extends FToolbar implements EventListener return (DB.getSQLValueEx(null, sql, gridTab.getAD_Table_ID(), Env.getAD_Client_ID(Env.getCtx())) > 0); } - private void loadCustomButton(int AD_Window_ID) { - MToolBarButton[] mToolbarButtons = MToolBarButton.getOfWindow(AD_Window_ID, null); - if (mToolbarButtons != null && mToolbarButtons.length > 0) { - for (MToolBarButton mToolBarButton : mToolbarButtons) { - String actionId = mToolBarButton.getActionClassName(); - IServiceHolder serviceHolder = Actions.getAction(actionId); - if (serviceHolder != null && serviceHolder.getService() != null) { - String labelKey = actionId + ".label"; - String tooltipKey = actionId + ".tooltip"; - String label = Msg.getMsg(Env.getCtx(), labelKey); - String tooltiptext = Msg.getMsg(Env.getCtx(), tooltipKey); - if (labelKey.equals(label)) { - label = mToolBarButton.getName(); - } - if (tooltipKey.equals(tooltiptext)) { - tooltipKey = null; - } - ToolBarButton btn = createButton(mToolBarButton.getComponentName(), null, tooltipKey); - btn.removeEventListener(Events.ON_CLICK, this); - btn.setId(mToolBarButton.getName()); - btn.setDisabled(false); - - AImage aImage = Actions.getActionImage(actionId); - if (aImage != null) { - btn.setImageContent(aImage); - } else { - btn.setLabel(label); - } - - ToolbarCustomButton toolbarCustomBtn = new ToolbarCustomButton(mToolBarButton, btn, actionId, windowNo); - toolbarCustomButtons.add(toolbarCustomBtn); - - appendChild(btn); - } - } - } - } - public void enableProcessButton(boolean b) { if (btnProcess != null) { btnProcess.setDisabled(!b); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index f10cc1470f..eb1c725063 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -73,7 +73,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL /** * */ - private static final long serialVersionUID = -2133132636255923989L; + private static final long serialVersionUID = -5723251182432810379L; protected Grid parameterGrid; private Borderlayout layout; @@ -339,7 +339,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL protected String getSQLWhere() { StringBuilder builder = new StringBuilder(); MTable table = MTable.get(Env.getCtx(), infoWindow.getAD_Table_ID()); - if (table.get_ColumnIndex("IsActive") >=0 ) { + if (!hasIsActiveEditor() && table.get_ColumnIndex("IsActive") >=0 ) { if (p_whereClause != null && p_whereClause.trim().length() > 0) { builder.append(" AND "); } @@ -383,7 +383,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } else if (p_whereClause != null && p_whereClause.trim().length() > 0) { builder.append(" AND "); if (!checkAND.isChecked()) builder.append(" ( "); - } + } else if (hasIsActiveEditor() && !checkAND.isChecked()) { + builder.append(" ( "); + } } else { builder.append(checkAND.isChecked() ? " AND " : " OR "); } @@ -957,4 +959,15 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL return true; } // testCount + + /** Return true if there is a 'IsActive' criteria */ + boolean hasIsActiveEditor() { + for (WEditor editor : editors) { + if (editor.getGridField() != null && "IsActive".equals(editor.getGridField().getColumnName())) { + return true; + } + } + return false; + } + }