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

hg merge release-1.0c (merge release1 into release2)

This commit is contained in:
Carlos Ruiz 2013-11-05 13:15:28 -05:00
parent 1531ac497b 5718de9d93
commit ceb8469d97
8 changed files with 417 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
migration/i1.0c/oracle/201310281633_IDEMPIERE-1442.sql Normal file
View File

@ -0,0 +1,155 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Oct 28, 2013 3:46:50 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Name,PrintName,AD_Element_UU,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType,AD_Client_ID) VALUES ('IsConfirmOnDocClose',202625,'Show Confirmation On Document Action Close','Show Confirmation On Document Action Close','07759de2-051e-475c-a759-ba56d873a3f5',TO_DATE('2013-10-28 15:46:49','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-10-28 15:46:49','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y','D',0)
;
-- Oct 28, 2013 3:47:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Element SET EntityType='D',Updated=TO_DATE('2013-10-28 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202625
;
-- Oct 28, 2013 3:49:11 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,EntityType,IsEncrypted,AD_Element_ID,AD_Client_ID,IsSecure) VALUES (0,'N',0,227,210885,'Y','N','N',0,'N',1,'N',20,'N','N','Y','054c9c50-c749-4b1c-b2f2-a11caa286680','Y','IsConfirmOnDocClose','N','Show Confirmation On Document Action Close','Y',100,TO_DATE('2013-10-28 15:49:10','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2013-10-28 15:49:10','YYYY-MM-DD HH24:MI:SS'),100,'N','N','D','N',202625,0,'N')
;
-- Oct 28, 2013 3:52:28 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Name,PrintName,AD_Element_UU,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType,AD_Client_ID) VALUES ('IsConfirmOnDocVoid',202626,'Show Confirmation On Document Action Void','Show Confirmation On Document Action Void','900e165f-ba3c-4076-a783-03463df95926',TO_DATE('2013-10-28 15:52:27','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-10-28 15:52:27','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y','D',0)
;
-- Oct 28, 2013 3:52:48 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,EntityType,IsEncrypted,AD_Element_ID,AD_Client_ID,IsSecure) VALUES (0,'N',0,227,210886,'Y','N','N',0,'N',1,'N',20,'N','N','Y','501a66d4-cbd4-4494-b9e6-8676eb82190a','Y','IsConfirmOnDocVoid','N','Show Confirmation On Document Action Void','Y',100,TO_DATE('2013-10-28 15:52:48','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2013-10-28 15:52:48','YYYY-MM-DD HH24:MI:SS'),100,'N','N','D','N',202626,0,'N')
;
-- Oct 28, 2013 3:52:54 PM IST
-- Adding Flag to show Confirmation before processing Document
ALTER TABLE AD_ClientInfo ADD IsConfirmOnDocClose CHAR(1) DEFAULT 'N' CHECK (IsConfirmOnDocClose IN ('Y','N')) NOT NULL
;
-- Oct 28, 2013 3:53:01 PM IST
-- Adding Flag to show Confirmation before processing Document
ALTER TABLE AD_ClientInfo ADD IsConfirmOnDocVoid CHAR(1) DEFAULT 'N' CHECK (IsConfirmOnDocVoid IN ('Y','N')) NOT NULL
;
-- Oct 28, 2013 3:53:43 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Field (ColumnSpan,NumLines,IsQuickEntry,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,AD_Client_ID,IsAdvancedField) VALUES (1,1,'N',0,'N',169,0,'N','N',210885,240,'Y',202532,'N','D','Show Confirmation On Document Action Close','N','Y','b2a62073-1371-4032-9748-95406043bc31',100,0,TO_DATE('2013-10-28 15:53:42','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-10-28 15:53:42','YYYY-MM-DD HH24:MI:SS'),'Y','Y',340,1,0,'N')
;
-- Oct 28, 2013 3:54:08 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Field (ColumnSpan,NumLines,IsQuickEntry,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,AD_Client_ID,IsAdvancedField) VALUES (1,1,'N',0,'N',169,0,'N','N',210886,250,'Y',202533,'N','D','Show Confirmation On Document Action Void','N','Y','0d721644-85dd-4192-bfdf-7ebbc5427730',100,0,TO_DATE('2013-10-28 15:54:07','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-10-28 15:54:07','YYYY-MM-DD HH24:MI:SS'),'Y','Y',350,1,0,'N')
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET ColumnSpan=2, SeqNo=110, IsDisplayed='Y', XPosition=2,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202532
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET ColumnSpan=2, SeqNo=130, IsDisplayed='Y', XPosition=2,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202533
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=140,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1564
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=150,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1563
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=160,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1562
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=170,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1565
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=180,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1566
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=190,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1567
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=200,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10319
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=210,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10320
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=220,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57531
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=230,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57534
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=240,Updated=TO_DATE('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57535
;
-- Oct 28, 2013 4:04:23 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Do you want to {0} this Document?',200237,'D','4d6b274c-1089-4083-abfd-bd5985c4cd2f','ConfirmOnDocAction','Y',TO_DATE('2013-10-28 16:04:22','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-10-28 16:04:22','YYYY-MM-DD HH24:MI:SS'),0)
;
-- Oct 28, 2013 4:06:27 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Element SET EntityType='D',Updated=TO_DATE('2013-10-28 16:06:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202626
;
-- Oct 28, 2013 4:06:37 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2013-10-28 16:06:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210886
;
-- Oct 28, 2013 4:06:47 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2013-10-28 16:06:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210885
;
-- Oct 28, 2013 4:06:52 PM IST
-- Adding Flag to show Confirmation before processing Document
ALTER TABLE AD_ClientInfo MODIFY IsConfirmOnDocClose CHAR(1) DEFAULT 'N'
;
-- Oct 28, 2013 4:06:53 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_ClientInfo SET IsConfirmOnDocClose='N' WHERE IsConfirmOnDocClose IS NULL
;
-- Oct 28, 2013 4:07:03 PM IST
-- Adding Flag to show Confirmation before processing Document
ALTER TABLE AD_ClientInfo MODIFY IsConfirmOnDocVoid CHAR(1) DEFAULT 'N'
;
-- Oct 28, 2013 4:07:03 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_ClientInfo SET IsConfirmOnDocVoid='N' WHERE IsConfirmOnDocVoid IS NULL
;
SELECT register_migration_script('201310281633_IDEMPIERE-1442.sql') FROM dual
;

152
migration/i1.0c/postgresql/201310281633_IDEMPIERE-1442.sql Normal file
View File

@ -0,0 +1,152 @@
-- Oct 28, 2013 3:46:50 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Name,PrintName,AD_Element_UU,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType,AD_Client_ID) VALUES ('IsConfirmOnDocClose',202625,'Show Confirmation On Document Action Close','Show Confirmation On Document Action Close','07759de2-051e-475c-a759-ba56d873a3f5',TO_TIMESTAMP('2013-10-28 15:46:49','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-10-28 15:46:49','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y','D',0)
;
-- Oct 28, 2013 3:47:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Element SET EntityType='D',Updated=TO_TIMESTAMP('2013-10-28 15:47:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202625
;
-- Oct 28, 2013 3:49:11 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,EntityType,IsEncrypted,AD_Element_ID,AD_Client_ID,IsSecure) VALUES (0,'N',0,227,210885,'Y','N','N',0,'N',1,'N',20,'N','N','Y','054c9c50-c749-4b1c-b2f2-a11caa286680','Y','IsConfirmOnDocClose','N','Show Confirmation On Document Action Close','Y',100,TO_TIMESTAMP('2013-10-28 15:49:10','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2013-10-28 15:49:10','YYYY-MM-DD HH24:MI:SS'),100,'N','N','D','N',202625,0,'N')
;
-- Oct 28, 2013 3:52:28 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Name,PrintName,AD_Element_UU,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive,EntityType,AD_Client_ID) VALUES ('IsConfirmOnDocVoid',202626,'Show Confirmation On Document Action Void','Show Confirmation On Document Action Void','900e165f-ba3c-4076-a783-03463df95926',TO_TIMESTAMP('2013-10-28 15:52:27','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-10-28 15:52:27','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y','D',0)
;
-- Oct 28, 2013 3:52:48 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Column (SeqNoSelection,IsSyncDatabase,Version,AD_Table_ID,AD_Column_ID,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsUpdateable,ColumnName,DefaultValue,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,EntityType,IsEncrypted,AD_Element_ID,AD_Client_ID,IsSecure) VALUES (0,'N',0,227,210886,'Y','N','N',0,'N',1,'N',20,'N','N','Y','501a66d4-cbd4-4494-b9e6-8676eb82190a','Y','IsConfirmOnDocVoid','N','Show Confirmation On Document Action Void','Y',100,TO_TIMESTAMP('2013-10-28 15:52:48','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2013-10-28 15:52:48','YYYY-MM-DD HH24:MI:SS'),100,'N','N','D','N',202626,0,'N')
;
-- Oct 28, 2013 3:52:54 PM IST
-- Adding Flag to show Confirmation before processing Document
ALTER TABLE AD_ClientInfo ADD COLUMN IsConfirmOnDocClose CHAR(1) DEFAULT 'N' CHECK (IsConfirmOnDocClose IN ('Y','N')) NOT NULL
;
-- Oct 28, 2013 3:53:01 PM IST
-- Adding Flag to show Confirmation before processing Document
ALTER TABLE AD_ClientInfo ADD COLUMN IsConfirmOnDocVoid CHAR(1) DEFAULT 'N' CHECK (IsConfirmOnDocVoid IN ('Y','N')) NOT NULL
;
-- Oct 28, 2013 3:53:43 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Field (ColumnSpan,NumLines,IsQuickEntry,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,AD_Client_ID,IsAdvancedField) VALUES (1,1,'N',0,'N',169,0,'N','N',210885,240,'Y',202532,'N','D','Show Confirmation On Document Action Close','N','Y','b2a62073-1371-4032-9748-95406043bc31',100,0,TO_TIMESTAMP('2013-10-28 15:53:42','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-10-28 15:53:42','YYYY-MM-DD HH24:MI:SS'),'Y','Y',340,1,0,'N')
;
-- Oct 28, 2013 3:54:08 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Field (ColumnSpan,NumLines,IsQuickEntry,SortNo,IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,SeqNoGrid,XPosition,AD_Client_ID,IsAdvancedField) VALUES (1,1,'N',0,'N',169,0,'N','N',210886,250,'Y',202533,'N','D','Show Confirmation On Document Action Void','N','Y','0d721644-85dd-4192-bfdf-7ebbc5427730',100,0,TO_TIMESTAMP('2013-10-28 15:54:07','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-10-28 15:54:07','YYYY-MM-DD HH24:MI:SS'),'Y','Y',350,1,0,'N')
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET ColumnSpan=2, SeqNo=110, IsDisplayed='Y', XPosition=2,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202532
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET ColumnSpan=2, SeqNo=130, IsDisplayed='Y', XPosition=2,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202533
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=140,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1564
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=150,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1563
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=160,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1562
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=170,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1565
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=180,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1566
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=190,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=1567
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=200,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10319
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=210,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10320
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=220,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57531
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=230,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57534
;
-- Oct 28, 2013 4:01:28 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Field SET SeqNo=240,Updated=TO_TIMESTAMP('2013-10-28 16:01:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=57535
;
-- Oct 28, 2013 4:04:23 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Do you want to {0} this Document?',200237,'D','4d6b274c-1089-4083-abfd-bd5985c4cd2f','ConfirmOnDocAction','Y',TO_TIMESTAMP('2013-10-28 16:04:22','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-10-28 16:04:22','YYYY-MM-DD HH24:MI:SS'),0)
;
-- Oct 28, 2013 4:06:27 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Element SET EntityType='D',Updated=TO_TIMESTAMP('2013-10-28 16:06:27','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202626
;
-- Oct 28, 2013 4:06:37 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2013-10-28 16:06:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210886
;
-- Oct 28, 2013 4:06:47 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2013-10-28 16:06:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=210885
;
-- Oct 28, 2013 4:06:52 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO t_alter_column values('ad_clientinfo','IsConfirmOnDocClose','CHAR(1)',null,'N')
;
-- Oct 28, 2013 4:06:53 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_ClientInfo SET IsConfirmOnDocClose='N' WHERE IsConfirmOnDocClose IS NULL
;
-- Oct 28, 2013 4:07:03 PM IST
-- Adding Flag to show Confirmation before processing Document
INSERT INTO t_alter_column values('ad_clientinfo','IsConfirmOnDocVoid','CHAR(1)',null,'N')
;
-- Oct 28, 2013 4:07:03 PM IST
-- Adding Flag to show Confirmation before processing Document
UPDATE AD_ClientInfo SET IsConfirmOnDocVoid='N' WHERE IsConfirmOnDocVoid IS NULL
;
SELECT register_migration_script('201310281633_IDEMPIERE-1442.sql') FROM dual
;

9
org.adempiere.base/src/org/adempiere/model/GenericPO.java
View File

@ -81,9 +81,12 @@ public class GenericPO extends PO {
super(new PropertiesWrapper(ctx, tableName), 0, trxName, rs); super(new PropertiesWrapper(ctx, tableName), 0, trxName, rs);
} }
private int tableID = 0; /**
* We must not use variable initializer here since the 2 variable below will be initialize inside
private String tableName = null; * the initPO method called by the parent constructor.
*/
private int tableID;
private String tableName;
/** Load Meta Data */ /** Load Meta Data */
protected POInfo initPO(Properties ctx) { protected POInfo initPO(Properties ctx) {

18
org.adempiere.base/src/org/compiere/model/I_AD_ClientInfo.java
View File

@ -356,6 +356,24 @@ public interface I_AD_ClientInfo
*/ */
public boolean isActive(); public boolean isActive();
/** Column name IsConfirmOnDocClose */
public static final String COLUMNNAME_IsConfirmOnDocClose = "IsConfirmOnDocClose";
/** Set Show Confirmation On Document Action Close */
public void setIsConfirmOnDocClose (boolean IsConfirmOnDocClose);
/** Get Show Confirmation On Document Action Close */
public boolean isConfirmOnDocClose();
/** Column name IsConfirmOnDocVoid */
public static final String COLUMNNAME_IsConfirmOnDocVoid = "IsConfirmOnDocVoid";
/** Set Show Confirmation On Document Action Void */
public void setIsConfirmOnDocVoid (boolean IsConfirmOnDocVoid);
/** Get Show Confirmation On Document Action Void */
public boolean isConfirmOnDocVoid();
/** Column name IsDiscountLineAmt */ /** Column name IsDiscountLineAmt */
public static final String COLUMNNAME_IsDiscountLineAmt = "IsDiscountLineAmt"; public static final String COLUMNNAME_IsDiscountLineAmt = "IsDiscountLineAmt";

42
org.adempiere.base/src/org/compiere/model/X_AD_ClientInfo.java
View File

@ -568,6 +568,48 @@ public class X_AD_ClientInfo extends PO implements I_AD_ClientInfo, I_Persistent
return (Timestamp)get_Value(COLUMNNAME_FY_StartDate); return (Timestamp)get_Value(COLUMNNAME_FY_StartDate);
} }
/** Set Show Confirmation On Document Action Close.
@param IsConfirmOnDocClose Show Confirmation On Document Action Close */
public void setIsConfirmOnDocClose (boolean IsConfirmOnDocClose)
{
set_Value (COLUMNNAME_IsConfirmOnDocClose, Boolean.valueOf(IsConfirmOnDocClose));
}
/** Get Show Confirmation On Document Action Close.
@return Show Confirmation On Document Action Close */
public boolean isConfirmOnDocClose ()
{
Object oo = get_Value(COLUMNNAME_IsConfirmOnDocClose);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
}
/** Set Show Confirmation On Document Action Void.
@param IsConfirmOnDocVoid Show Confirmation On Document Action Void */
public void setIsConfirmOnDocVoid (boolean IsConfirmOnDocVoid)
{
set_Value (COLUMNNAME_IsConfirmOnDocVoid, Boolean.valueOf(IsConfirmOnDocVoid));
}
/** Get Show Confirmation On Document Action Void.
@return Show Confirmation On Document Action Void */
public boolean isConfirmOnDocVoid ()
{
Object oo = get_Value(COLUMNNAME_IsConfirmOnDocVoid);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
}
/** Set Discount calculated from Line Amounts. /** Set Discount calculated from Line Amounts.
@param IsDiscountLineAmt @param IsDiscountLineAmt
Payment Discount calculation does not include Taxes and Charges Payment Discount calculation does not include Taxes and Charges

13
org.adempiere.pipo/src/org/adempiere/pipo2/PoExporter.java
View File

@ -7,12 +7,12 @@ import javax.xml.transform.sax.TransformerHandler;
import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.MTree;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.POInfo; import org.compiere.model.POInfo;
import org.compiere.model.X_AD_Client; import org.compiere.model.X_AD_Client;
import org.compiere.model.X_AD_Org; import org.compiere.model.X_AD_Org;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.AttributesImpl;
@ -240,12 +240,12 @@ public class PoExporter {
tableName = MTable.getTableName(ctx.ctx, AD_Table_ID); tableName = MTable.getTableName(ctx.ctx, AD_Table_ID);
} else if (po.get_TableName().equals("AD_TreeNode") && columnName.equals("Parent_ID")) { } else if (po.get_TableName().equals("AD_TreeNode") && columnName.equals("Parent_ID")) {
int AD_Tree_ID = po.get_ValueAsInt("AD_Tree_ID"); int AD_Tree_ID = po.get_ValueAsInt("AD_Tree_ID");
int AD_Table_ID = DB.getSQLValue(po.get_TrxName(), "SELECT AD_Table_ID From AD_Tree WHERE AD_Tree_ID="+AD_Tree_ID); MTree tree = new MTree(ctx.ctx, AD_Tree_ID, ctx.trx.getTrxName());
tableName = MTable.getTableName(po.getCtx(), AD_Table_ID); tableName = tree.getSourceTableName(true);
} else if (po.get_TableName().equals("AD_TreeNode") && columnName.equals("Node_ID")) { } else if (po.get_TableName().equals("AD_TreeNode") && columnName.equals("Node_ID")) {
int AD_Tree_ID = po.get_ValueAsInt("AD_Tree_ID"); int AD_Tree_ID = po.get_ValueAsInt("AD_Tree_ID");
int AD_Table_ID = DB.getSQLValue(po.get_TrxName(), "SELECT AD_Table_ID From AD_Tree WHERE AD_Tree_ID="+AD_Tree_ID); MTree tree = new MTree(ctx.ctx, AD_Tree_ID, ctx.trx.getTrxName());
tableName = MTable.getTableName(po.getCtx(), AD_Table_ID); tableName = tree.getSourceTableName(true);
} else { } else {
tableName = columnName.substring(0, columnName.length() - 3); tableName = columnName.substring(0, columnName.length() - 3);
} }
@ -263,6 +263,9 @@ public class PoExporter {
tableName = lookupColumn.substring(0, lookupColumn.indexOf(".")); tableName = lookupColumn.substring(0, lookupColumn.indexOf("."));
} }
addTableReference(columnName, tableName, new AttributesImpl()); addTableReference(columnName, tableName, new AttributesImpl());
} else if (DisplayType.Account == displayType) {
String tableName = "C_ValidCombination";
addTableReference(columnName, tableName, new AttributesImpl());
} else if (DisplayType.isLOB(displayType)) { } else if (DisplayType.isLOB(displayType)) {
addBlob(columnName); addBlob(columnName);
} else if (columnName.equals(po.getUUIDColumnName()) && po.get_Value(columnName) == null) { } else if (columnName.equals(po.getUUIDColumnName()) && po.get_Value(columnName) == null) {

30
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WDocActionPanel.java
View File

@ -17,10 +17,12 @@
package org.adempiere.webui.panel; package org.adempiere.webui.panel;
import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.util.Callback;
import org.adempiere.webui.AdempiereWebUI; import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
@ -33,6 +35,7 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.event.DialogEvents; import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.window.FDialog; import org.adempiere.webui.window.FDialog;
import org.compiere.model.GridTab; import org.compiere.model.GridTab;
import org.compiere.model.MClientInfo;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.process.DocOptions; import org.compiere.process.DocOptions;
@ -305,7 +308,32 @@ public class WDocActionPanel extends Window implements EventListener<Event>, Dia
{ {
m_OKpressed = true; m_OKpressed = true;
setValue(); setValue();
this.detach(); MClientInfo clientInfo = MClientInfo.get(Env.getCtx());
if(clientInfo.isConfirmOnDocClose() || clientInfo.isConfirmOnDocVoid())
{
final Window window = this;
String selected = lstDocAction.getSelectedItem().getValue().toString();
if((selected.equals(org.compiere.process.DocAction.ACTION_Close) && clientInfo.isConfirmOnDocClose())
|| (selected.equals(org.compiere.process.DocAction.ACTION_Void) && clientInfo.isConfirmOnDocVoid()))
{
String docAction = lstDocAction.getSelectedItem().getLabel();
MessageFormat mf = new MessageFormat(Msg.getMsg(Env.getAD_Language(Env.getCtx()), "ConfirmOnDocAction"));
Object[] arguments = new Object[]{docAction};
FDialog.ask(0, this, mf.format(arguments), new Callback<Boolean>() {
@Override
public void onCallback(Boolean result) {
if(result)
window.detach();
else
return;
}
});
}
else
this.detach();
}
else
this.detach();
} }
else if (confirmPanel.getButton("Cancel").equals(event.getTarget())) else if (confirmPanel.getButton("Cancel").equals(event.getTarget()))
{ {

7
org.adempiere.ui.zk/index.zul
View File

@ -11,6 +11,13 @@ Copyright (C) 2007 Ashley G Ramdass.
<?link rel="stylesheet" type="text/css" href="${themeStyleSheetByBrowser}"?> <?link rel="stylesheet" type="text/css" href="${themeStyleSheetByBrowser}"?>
<?link rel="stylesheet" type="text/css" href="css/PAPanel.css"?> <?link rel="stylesheet" type="text/css" href="css/PAPanel.css"?>
<zk> <zk>
<script>
zk.afterLoad(function() {
zk._Erbx.push = function(msg) {
if (console) console.log(msg);
}
});
</script>
<include src="${themePreference}"/> <include src="${themePreference}"/>
<window use="org.adempiere.webui.AdempiereWebUI"/> <window use="org.adempiere.webui.AdempiereWebUI"/>
</zk> </zk>