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

Merge 214e756ba4b2

This commit is contained in:
Heng Sin Low 2013-08-05 17:13:57 +08:00
parent 426909fd42 fb95f9fca8
commit 40e569e0cb
20 changed files with 1037 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
migration/i1.0c-release/oracle/201308051548_IDEMPIERE-1229.sql Normal file
View File

@ -0,0 +1,292 @@
-- Aug 1, 2013 12:32:12 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
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,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID,IsSecure) VALUES (0,'N',0,493,210681,'N','N','N',0,'N',22,'N',19,'N','N','Y','01406b24-b108-4ef9-9533-688ceb8615c4','Y','AD_Window_ID','Data entry or display window','The Window field identifies a unique Window in the system.','Window','Y',TO_DATE('2013-08-01 12:32:11','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_DATE('2013-08-01 12:32:11','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',143,'N')
;
-- Aug 1, 2013 12:32:12 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=210681 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Aug 1, 2013 12:32:17 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
ALTER TABLE AD_PrintFormat ADD AD_Window_ID NUMBER(10) DEFAULT NULL
;
-- Aug 1, 2013 12:35:28 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,AD_Client_ID,ColumnSpan) VALUES ('N',425,36,'N','N',60458,220,'Y',202367,'N','D','AD_PrintFormat_UU','d856c59c-850d-4f62-98c2-b30edf36641b','N','N',100,0,TO_DATE('2013-08-01 12:35:27','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-08-01 12:35:27','YYYY-MM-DD HH24:MI:SS'),'Y','N',0,2)
;
-- Aug 1, 2013 12:35:28 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=202367 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
;
-- Aug 1, 2013 12:35:29 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,AD_Client_ID,ColumnSpan) VALUES ('N',425,22,'N','N',210681,230,'Y',202368,'N','The Window field identifies a unique Window in the system.','D','Data entry or display window','Window','588d3710-0a9b-497d-a5fc-f03a565b8b2d','Y','N',100,0,TO_DATE('2013-08-01 12:35:28','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-08-01 12:35:28','YYYY-MM-DD HH24:MI:SS'),'Y',0,2)
;
-- Aug 1, 2013 12:35:29 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=202368 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
;
-- Aug 1, 2013 12:36:10 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET DisplayLength=14,Updated=TO_DATE('2013-08-01 12:36:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202368
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=5666
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=5662
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=5664
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=5659
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=5665
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=5652
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=8291
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=5655
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=5744
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=5656
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=5651
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=5663
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=5653
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=5762
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=6503
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=5657
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=160,IsDisplayedGrid='Y' WHERE AD_Field_ID=5661
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=170,IsDisplayedGrid='Y' WHERE AD_Field_ID=5654
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=180,IsDisplayedGrid='Y' WHERE AD_Field_ID=5658
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=190,IsDisplayedGrid='Y' WHERE AD_Field_ID=50179
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=200,IsDisplayedGrid='Y' WHERE AD_Field_ID=202368
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=210,IsDisplayedGrid='Y' WHERE AD_Field_ID=52009
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=220,IsDisplayedGrid='Y' WHERE AD_Field_ID=5660
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=230,IsDisplayedGrid='Y' WHERE AD_Field_ID=52008
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=202367
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=5666
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=5662
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=5664
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=5659
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=5665
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=5652
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=8291
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=5655
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=5744
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=5656
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=5651
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=5663
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=5653
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=5762
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=6503
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=5657
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=5661
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=5654
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=5658
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=50179
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=202368
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=52009
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=5660
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=52008
;
-- Aug 1, 2013 12:38:10 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET IsSameLine='Y', XPosition=4,Updated=TO_DATE('2013-08-01 12:38:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202368
;
SELECT register_migration_script('201308051548_IDEMPIERE-1229.sql') FROM dual
;

98
migration/i1.0c-release/oracle/20131707164800_IDEMPIERE-1138.sql Normal file
View File

@ -0,0 +1,98 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Jul 16, 2013 5:50:07 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Ref_List SET Value='E',Updated=TO_DATE('2013-07-16 17:50:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=200046
;
-- Jul 16, 2013 5:56:21 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_BroadcastMessage SET BroadcastFrequency='E' WHERE BroadcastFrequency='U'
;
-- Jul 16, 2013 5:54:09 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,AD_Org_ID,AD_Client_ID,EntityType) VALUES (200156,200020,'Repeat it until the message has been acknowledged','Until Acknowledge','d6b87260-502d-4984-b9e3-8daafde1acd9','A',TO_DATE('2013-07-16 17:54:08','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-07-16 17:54:08','YYYY-MM-DD HH24:MI:SS'),100,'Y',0,0,'D')
;
-- Jul 16, 2013 5:54:09 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Ref_List_Trl_UU ) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=200156 AND NOT EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Ref_List_ID=t.AD_Ref_List_ID)
;
-- Jul 16, 2013 5:56:21 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,AD_Org_ID,AD_Client_ID,EntityType) VALUES (200157,200020,'Repeat it until the message expires or until it has been acknowledged, whatever happens first','Until Expiration or Acknowledge','aa345f63-dfbe-4d18-aae4-e5ed06cd4407','O',TO_DATE('2013-07-16 17:56:21','YYYY-MM-DD HH24:MI:SS'),100,TO_DATE('2013-07-16 17:56:21','YYYY-MM-DD HH24:MI:SS'),100,'Y',0,0,'U')
;
-- Jul 16, 2013 5:56:21 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Ref_List_Trl_UU ) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=200157 AND NOT EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Ref_List_ID=t.AD_Ref_List_ID)
;
-- Jul 17, 2013 8:50:32 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET IsActive='N',Updated=TO_DATE('2013-07-17 08:50:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200882
;
-- Jul 17, 2013 8:50:51 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_DATE('2013-07-17 08:50:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200881
;
-- Jul 17, 2013 8:50:59 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET IsDisplayed='N',Updated=TO_DATE('2013-07-17 08:50:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200881
;
-- Jul 17, 2013 8:54:47 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET DisplayLogic='@BroadcastType@!''I''',Updated=TO_DATE('2013-07-17 08:54:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200873
;
-- Jul 17, 2013 9:14:17 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET DisplayLogic='@BroadcastFrequency@=''E'' | @BroadcastFrequency@=''O''',Updated=TO_DATE('2013-07-17 09:14:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200879
;
-- Jul 17, 2013 3:18:50 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Val_Rule (AD_Val_Rule_ID,EntityType,Name,Code,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Org_ID,IsActive,AD_Client_ID) VALUES (200051,'D','AD_BroadcastMessage - Combination','AD_Ref_List.Value NOT IN(SELECT CASE WHEN AD_Client_ID<>0 THEN ''E'' ELSE ''1'' END FROM AD_Client WHERE AD_Client_ID=@#AD_Client_ID@)','S','9c09aaee-c787-4f30-900e-25412968812a',100,100,TO_DATE('2013-07-17 15:18:49','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-07-17 15:18:49','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
;
-- Jul 17, 2013 3:19:09 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Column SET AD_Val_Rule_ID=200051, IsToolbarButton='N',Updated=TO_DATE('2013-07-17 15:19:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200989
;
-- Jul 17, 2013 4:29:38 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET Help='<p>1. Just Once : Message will be broadcasted one time.&nbsp;</p>
<p><span style="line-height: 1.6em;">2. Until Acknowledge : Repeat it until the message has been acknowledged.&nbsp;</span></p>
<p><span style="line-height: 1.6em;">3.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration or Acknowledge : Repeat it until&nbsp;the message expires or until it has been acknowledged, whatever happens first.</span></p>
<p><span style="line-height: 1.6em;">4.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration : Repeat it until message expiration value.</span></p>
',Updated=TO_DATE('2013-07-17 16:29:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200873
;
-- Jul 17, 2013 4:29:49 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Column SET Help='<p>1. Just Once : Message will be broadcasted one time.&nbsp;</p>
<p><span style="line-height: 1.6em;">2. Until Acknowledge : Repeat it until the message has been acknowledged.&nbsp;</span></p>
<p><span style="line-height: 1.6em;">3.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration or Acknowledge : Repeat it until&nbsp;the message expires or until it has been acknowledged, whatever happens first.</span></p>
<p><span style="line-height: 1.6em;">4.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration : Repeat it until message expiration value.</span></p>
',Updated=TO_DATE('2013-07-17 16:29:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200984
;
-- Jul 17, 2013 4:29:49 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET Name='Broadcast Frequency', Description='How Many Times Message Should be Broadcasted', Help='<p>1. Just Once : Message will be broadcasted one time.&nbsp;</p>
<p><span style="line-height: 1.6em;">2. Until Acknowledge : Repeat it until the message has been acknowledged.&nbsp;</span></p>
<p><span style="line-height: 1.6em;">3.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration or Acknowledge : Repeat it until&nbsp;the message expires or until it has been acknowledged, whatever happens first.</span></p>
<p><span style="line-height: 1.6em;">4.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration : Repeat it until message expiration value.</span></p>
' WHERE AD_Column_ID=200984 AND IsCentrallyMaintained='Y'
;
SELECT register_migration_script('20131707164800_IDEMPIERE-1138.sql') FROM dual
;

292
migration/i1.0c-release/postgresql/201308051548_IDEMPIERE-1229.sql Normal file
View File

@ -0,0 +1,292 @@
-- Aug 1, 2013 12:32:12 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
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,Description,Help,Name,IsAllowCopy,Updated,CreatedBy,AD_Org_ID,IsActive,Created,UpdatedBy,IsToolbarButton,IsAlwaysUpdateable,AD_Client_ID,EntityType,IsEncrypted,AD_Element_ID,IsSecure) VALUES (0,'N',0,493,210681,'N','N','N',0,'N',22,'N',19,'N','N','Y','01406b24-b108-4ef9-9533-688ceb8615c4','Y','AD_Window_ID','Data entry or display window','The Window field identifies a unique Window in the system.','Window','Y',TO_TIMESTAMP('2013-08-01 12:32:11','YYYY-MM-DD HH24:MI:SS'),100,0,'Y',TO_TIMESTAMP('2013-08-01 12:32:11','YYYY-MM-DD HH24:MI:SS'),100,'N','N',0,'D','N',143,'N')
;
-- Aug 1, 2013 12:32:12 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=210681 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;
-- Aug 1, 2013 12:32:17 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
ALTER TABLE AD_PrintFormat ADD COLUMN AD_Window_ID NUMERIC(10) DEFAULT NULL
;
-- Aug 1, 2013 12:35:28 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,IsDisplayedGrid,AD_Client_ID,ColumnSpan) VALUES ('N',425,36,'N','N',60458,220,'Y',202367,'N','D','AD_PrintFormat_UU','d856c59c-850d-4f62-98c2-b30edf36641b','N','N',100,0,TO_TIMESTAMP('2013-08-01 12:35:27','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-08-01 12:35:27','YYYY-MM-DD HH24:MI:SS'),'Y','N',0,2)
;
-- Aug 1, 2013 12:35:28 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=202367 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
;
-- Aug 1, 2013 12:35:29 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,SeqNo,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Description,Name,AD_Field_UU,IsDisplayed,IsFieldOnly,UpdatedBy,AD_Org_ID,Created,CreatedBy,Updated,IsActive,AD_Client_ID,ColumnSpan) VALUES ('N',425,22,'N','N',210681,230,'Y',202368,'N','The Window field identifies a unique Window in the system.','D','Data entry or display window','Window','588d3710-0a9b-497d-a5fc-f03a565b8b2d','Y','N',100,0,TO_TIMESTAMP('2013-08-01 12:35:28','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-08-01 12:35:28','YYYY-MM-DD HH24:MI:SS'),'Y',0,2)
;
-- Aug 1, 2013 12:35:29 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=202368 AND NOT EXISTS (SELECT * FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
;
-- Aug 1, 2013 12:36:10 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET DisplayLength=14,Updated=TO_TIMESTAMP('2013-08-01 12:36:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202368
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=0,IsDisplayedGrid='N' WHERE AD_Field_ID=5666
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=10,IsDisplayedGrid='Y' WHERE AD_Field_ID=5662
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=20,IsDisplayedGrid='Y' WHERE AD_Field_ID=5664
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=30,IsDisplayedGrid='Y' WHERE AD_Field_ID=5659
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=40,IsDisplayedGrid='Y' WHERE AD_Field_ID=5665
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=50,IsDisplayedGrid='Y' WHERE AD_Field_ID=5652
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=60,IsDisplayedGrid='Y' WHERE AD_Field_ID=8291
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=70,IsDisplayedGrid='Y' WHERE AD_Field_ID=5655
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=5744
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=5656
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=5651
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=5663
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=5653
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=5762
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=6503
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=150,IsDisplayedGrid='Y' WHERE AD_Field_ID=5657
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=160,IsDisplayedGrid='Y' WHERE AD_Field_ID=5661
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=170,IsDisplayedGrid='Y' WHERE AD_Field_ID=5654
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=180,IsDisplayedGrid='Y' WHERE AD_Field_ID=5658
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=190,IsDisplayedGrid='Y' WHERE AD_Field_ID=50179
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=200,IsDisplayedGrid='Y' WHERE AD_Field_ID=202368
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=210,IsDisplayedGrid='Y' WHERE AD_Field_ID=52009
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=220,IsDisplayedGrid='Y' WHERE AD_Field_ID=5660
;
-- Aug 1, 2013 12:37:49 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNoGrid=230,IsDisplayedGrid='Y' WHERE AD_Field_ID=52008
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=202367
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=0,IsDisplayed='N' WHERE AD_Field_ID=5666
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=10,IsDisplayed='Y' WHERE AD_Field_ID=5662
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=20,IsDisplayed='Y' WHERE AD_Field_ID=5664
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=5659
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=5665
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=5652
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=8291
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=5655
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=5744
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=5656
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=5651
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=5663
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=5653
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=5762
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=6503
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=5657
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=5661
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=5654
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=5658
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=50179
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=202368
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=52009
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=5660
;
-- Aug 1, 2013 12:37:56 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=52008
;
-- Aug 1, 2013 12:38:10 PM SGT
-- IDEMPIERE-1229 Purchase Order print format needs to be removed from SO window
UPDATE AD_Field SET IsSameLine='Y', XPosition=4,Updated=TO_TIMESTAMP('2013-08-01 12:38:10','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=202368
;
SELECT register_migration_script('201308051548_IDEMPIERE-1229.sql') FROM dual
;

95
migration/i1.0c-release/postgresql/20131707164800_IDEMPIERE-1138.sql Normal file
View File

@ -0,0 +1,95 @@
-- Jul 16, 2013 5:50:07 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Ref_List SET Value='E',Updated=TO_TIMESTAMP('2013-07-16 17:50:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Ref_List_ID=200046
;
-- Jul 16, 2013 5:56:21 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_BroadcastMessage SET BroadcastFrequency='E' WHERE BroadcastFrequency='U'
;
-- Jul 16, 2013 5:54:09 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,AD_Org_ID,AD_Client_ID,EntityType) VALUES (200156,200020,'Repeat it until the message has been acknowledged','Until Acknowledge','d6b87260-502d-4984-b9e3-8daafde1acd9','A',TO_TIMESTAMP('2013-07-16 17:54:08','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-07-16 17:54:08','YYYY-MM-DD HH24:MI:SS'),100,'Y',0,0,'D')
;
-- Jul 16, 2013 5:54:09 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Ref_List_Trl_UU ) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=200156 AND NOT EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Ref_List_ID=t.AD_Ref_List_ID)
;
-- Jul 16, 2013 5:56:21 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Reference_ID,Description,Name,AD_Ref_List_UU,Value,Created,CreatedBy,Updated,UpdatedBy,IsActive,AD_Org_ID,AD_Client_ID,EntityType) VALUES (200157,200020,'Repeat it until the message expires or until it has been acknowledged, whatever happens first','Until Expiration or Acknowledge','aa345f63-dfbe-4d18-aae4-e5ed06cd4407','O',TO_TIMESTAMP('2013-07-16 17:56:21','YYYY-MM-DD HH24:MI:SS'),100,TO_TIMESTAMP('2013-07-16 17:56:21','YYYY-MM-DD HH24:MI:SS'),100,'Y',0,0,'U')
;
-- Jul 16, 2013 5:56:21 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Ref_List_Trl (AD_Language,AD_Ref_List_ID, Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Ref_List_Trl_UU ) SELECT l.AD_Language,t.AD_Ref_List_ID, t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Ref_List t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Ref_List_ID=200157 AND NOT EXISTS (SELECT * FROM AD_Ref_List_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Ref_List_ID=t.AD_Ref_List_ID)
;
-- Jul 17, 2013 8:50:32 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET IsActive='N',Updated=TO_TIMESTAMP('2013-07-17 08:50:32','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200882
;
-- Jul 17, 2013 8:50:51 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET DisplayLogic=NULL,Updated=TO_TIMESTAMP('2013-07-17 08:50:51','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200881
;
-- Jul 17, 2013 8:50:59 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET IsDisplayed='N',Updated=TO_TIMESTAMP('2013-07-17 08:50:59','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200881
;
-- Jul 17, 2013 8:54:47 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET DisplayLogic='@BroadcastType@!''I''',Updated=TO_TIMESTAMP('2013-07-17 08:54:47','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200873
;
-- Jul 17, 2013 9:14:17 AM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET DisplayLogic='@BroadcastFrequency@=''E'' | @BroadcastFrequency@=''O''',Updated=TO_TIMESTAMP('2013-07-17 09:14:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200879
;
-- Jul 17, 2013 3:18:50 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
INSERT INTO AD_Val_Rule (AD_Val_Rule_ID,EntityType,Name,Code,Type,AD_Val_Rule_UU,CreatedBy,UpdatedBy,Updated,Created,AD_Org_ID,IsActive,AD_Client_ID) VALUES (200051,'D','AD_BroadcastMessage - Combination','AD_Ref_List.Value NOT IN(SELECT CASE WHEN AD_Client_ID<>0 THEN ''E'' ELSE ''1'' END FROM AD_Client WHERE AD_Client_ID=@#AD_Client_ID@)','S','9c09aaee-c787-4f30-900e-25412968812a',100,100,TO_TIMESTAMP('2013-07-17 15:18:49','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2013-07-17 15:18:49','YYYY-MM-DD HH24:MI:SS'),0,'Y',0)
;
-- Jul 17, 2013 3:19:09 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Column SET AD_Val_Rule_ID=200051, IsToolbarButton='N',Updated=TO_TIMESTAMP('2013-07-17 15:19:09','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200989
;
-- Jul 17, 2013 4:29:38 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET Help='<p>1. Just Once : Message will be broadcasted one time.&nbsp;</p>
<p><span style="line-height: 1.6em;">2. Until Acknowledge : Repeat it until the message has been acknowledged.&nbsp;</span></p>
<p><span style="line-height: 1.6em;">3.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration or Acknowledge : Repeat it until&nbsp;the message expires or until it has been acknowledged, whatever happens first.</span></p>
<p><span style="line-height: 1.6em;">4.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration : Repeat it until message expiration value.</span></p>
',Updated=TO_TIMESTAMP('2013-07-17 16:29:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200873
;
-- Jul 17, 2013 4:29:49 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Column SET Help='<p>1. Just Once : Message will be broadcasted one time.&nbsp;</p>
<p><span style="line-height: 1.6em;">2. Until Acknowledge : Repeat it until the message has been acknowledged.&nbsp;</span></p>
<p><span style="line-height: 1.6em;">3.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration or Acknowledge : Repeat it until&nbsp;the message expires or until it has been acknowledged, whatever happens first.</span></p>
<p><span style="line-height: 1.6em;">4.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration : Repeat it until message expiration value.</span></p>
',Updated=TO_TIMESTAMP('2013-07-17 16:29:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200984
;
-- Jul 17, 2013 4:29:49 PM COT
-- IDEMPIERE-1138 Broadcast Message Problems
UPDATE AD_Field SET Name='Broadcast Frequency', Description='How Many Times Message Should be Broadcasted', Help='<p>1. Just Once : Message will be broadcasted one time.&nbsp;</p>
<p><span style="line-height: 1.6em;">2. Until Acknowledge : Repeat it until the message has been acknowledged.&nbsp;</span></p>
<p><span style="line-height: 1.6em;">3.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration or Acknowledge : Repeat it until&nbsp;the message expires or until it has been acknowledged, whatever happens first.</span></p>
<p><span style="line-height: 1.6em;">4.&nbsp;</span><span style="line-height: 1.6em;">Until Expiration : Repeat it until message expiration value.</span></p>
' WHERE AD_Column_ID=200984 AND IsCentrallyMaintained='Y'
;
SELECT register_migration_script('20131707164800_IDEMPIERE-1138.sql') FROM dual
;

25
org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java
View File

@ -29,11 +29,11 @@ import org.compiere.util.Env;
*/ */
public class MBroadcastMessage extends X_AD_BroadcastMessage public class MBroadcastMessage extends X_AD_BroadcastMessage
{ {
/** /**
* *
*/ */
private static final long serialVersionUID = -6390563897422379468L; private static final long serialVersionUID = 1908264699133879072L;
static private CCache<Integer,MBroadcastMessage> s_cache = new CCache<Integer,MBroadcastMessage>("AD_BroadcastMessage", 30, 60); static private CCache<Integer,MBroadcastMessage> s_cache = new CCache<Integer,MBroadcastMessage>("AD_BroadcastMessage", 30, 60);
public MBroadcastMessage(Properties ctx, int AD_BroadcastMessage_ID, public MBroadcastMessage(Properties ctx, int AD_BroadcastMessage_ID,
@ -99,4 +99,21 @@ public class MBroadcastMessage extends X_AD_BroadcastMessage
return false; return false;
} }
/**************************************************************************
* Before Save
* @param newRecord new
* @return save
*/
protected boolean beforeSave (boolean newRecord)
{
if (BROADCASTTYPE_Immediate.equals(getBroadcastType())) {
setBroadcastFrequency(BROADCASTFREQUENCY_JustOnce);
}
boolean logack =
( BROADCASTFREQUENCY_UntilAcknowledge.equals(getBroadcastFrequency())
|| BROADCASTFREQUENCY_UntilExpirationOrAcknowledge.equals(getBroadcastFrequency()));
setLogAcknowledge(logack);
return true;
}
} }

15
org.adempiere.base/src/org/compiere/model/I_AD_PrintFormat.java
View File

@ -174,6 +174,21 @@ public interface I_AD_PrintFormat
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 Args */ /** Column name Args */
public static final String COLUMNNAME_Args = "Args"; public static final String COLUMNNAME_Args = "Args";

10
org.adempiere.base/src/org/compiere/model/X_AD_BroadcastMessage.java
View File

@ -30,7 +30,7 @@ public class X_AD_BroadcastMessage extends PO implements I_AD_BroadcastMessage,
/** /**
* *
*/ */
private static final long serialVersionUID = 20130626L; private static final long serialVersionUID = 20130716L;
/** Standard Constructor */ /** Standard Constructor */
public X_AD_BroadcastMessage (Properties ctx, int AD_BroadcastMessage_ID, String trxName) public X_AD_BroadcastMessage (Properties ctx, int AD_BroadcastMessage_ID, String trxName)
@ -171,8 +171,12 @@ public class X_AD_BroadcastMessage extends PO implements I_AD_BroadcastMessage,
public static final int BROADCASTFREQUENCY_AD_Reference_ID=200020; public static final int BROADCASTFREQUENCY_AD_Reference_ID=200020;
/** Just Once = J */ /** Just Once = J */
public static final String BROADCASTFREQUENCY_JustOnce = "J"; public static final String BROADCASTFREQUENCY_JustOnce = "J";
/** Until Expiration = U */ /** Until Expiration = E */
public static final String BROADCASTFREQUENCY_UntilExpiration = "U"; public static final String BROADCASTFREQUENCY_UntilExpiration = "E";
/** Until Acknowledge = A */
public static final String BROADCASTFREQUENCY_UntilAcknowledge = "A";
/** Until Expiration or Acknowledge = O */
public static final String BROADCASTFREQUENCY_UntilExpirationOrAcknowledge = "O";
/** Set Broadcast Frequency. /** Set Broadcast Frequency.
@param BroadcastFrequency @param BroadcastFrequency
How Many Times Message Should be Broadcasted How Many Times Message Should be Broadcasted

30
org.adempiere.base/src/org/compiere/model/X_AD_PrintFormat.java
View File

@ -30,7 +30,7 @@ public class X_AD_PrintFormat extends PO implements I_AD_PrintFormat, I_Persiste
/** /**
* *
*/ */
private static final long serialVersionUID = 20130626L; private static final long serialVersionUID = 20130801L;
/** Standard Constructor */ /** Standard Constructor */
public X_AD_PrintFormat (Properties ctx, int AD_PrintFormat_ID, String trxName) public X_AD_PrintFormat (Properties ctx, int AD_PrintFormat_ID, String trxName)
@ -289,6 +289,34 @@ public class X_AD_PrintFormat extends PO implements I_AD_PrintFormat, I_Persiste
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_Name)
.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 Args. /** Set Args.
@param Args Args */ @param Args Args */
public void setArgs (String Args) public void setArgs (String Args)

18
org.adempiere.base/src/org/compiere/print/MPrintFormat.java
View File

@ -61,7 +61,7 @@ public class MPrintFormat extends X_AD_PrintFormat
/** /**
* *
*/ */
private static final long serialVersionUID = -1378114118642378625L; private static final long serialVersionUID = -4515887660012047223L;
/** /**
* Public Constructor. * Public Constructor.
@ -1159,19 +1159,20 @@ public class MPrintFormat extends X_AD_PrintFormat
/** /**
* @param AD_Table_ID * @param AD_Table_ID
* @param AD_Window_ID
* @param AD_Client_ID use -1 to retrieve from all client * @param AD_Client_ID use -1 to retrieve from all client
* @param trxName * @param trxName
*/ */
public static RowSet getAccessiblePrintFormats (int AD_Table_ID, int AD_Client_ID, String trxName) public static RowSet getAccessiblePrintFormats (int AD_Table_ID, int AD_Window_ID, int AD_Client_ID, String trxName)
{ {
RowSet rowSet = null; RowSet rowSet = null;
String sql = "SELECT AD_PrintFormat_ID, Name, AD_Client_ID " String sql = "SELECT AD_PrintFormat_ID, Name, AD_Client_ID "
+ "FROM AD_PrintFormat " + "FROM AD_PrintFormat "
+ "WHERE AD_Table_ID=? AND IsTableBased='Y' "; + "WHERE AD_Table_ID=? AND IsTableBased='Y' ";
if (AD_Window_ID > 0)
sql += "AND (AD_Window_ID=? OR AD_Window_ID IS NULL) ";
if (AD_Client_ID >= 0) if (AD_Client_ID >= 0)
{ sql += " AND AD_Client_ID = ? ";
sql = sql + " AND AD_Client_ID = ? ";
}
sql = sql + "ORDER BY AD_Client_ID DESC, IsDefault DESC, Name"; // Own First sql = sql + "ORDER BY AD_Client_ID DESC, IsDefault DESC, Name"; // Own First
// //
sql = MRole.getDefault().addAccessSQL ( sql = MRole.getDefault().addAccessSQL (
@ -1180,9 +1181,12 @@ public class MPrintFormat extends X_AD_PrintFormat
try try
{ {
pstmt = DB.prepareStatement(sql, trxName); pstmt = DB.prepareStatement(sql, trxName);
pstmt.setInt(1, AD_Table_ID); int count = 1;
pstmt.setInt(count++, AD_Table_ID);
if (AD_Window_ID > 0)
pstmt.setInt(count++, AD_Window_ID);
if (AD_Client_ID >= 0) if (AD_Client_ID >= 0)
pstmt.setInt(2, AD_Client_ID); pstmt.setInt(count++, AD_Client_ID);
rowSet = pstmt.getRowSet(); rowSet = pstmt.getRowSet();
} }
catch (SQLException e) catch (SQLException e)

80
org.adempiere.base/src/org/compiere/util/Env.java
View File

@ -56,8 +56,11 @@ import org.compiere.model.I_AD_Window;
import org.compiere.model.MClient; import org.compiere.model.MClient;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
import org.compiere.model.MLookupCache; import org.compiere.model.MLookupCache;
import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MSession; import org.compiere.model.MSession;
import org.compiere.model.MTable;
import org.compiere.model.MZoomCondition;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfo;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
@ -1789,6 +1792,83 @@ public final class Env
return Util.isEmpty(s) ? Adempiere.ADEMPIERE_R : s; return Util.isEmpty(s) ? Adempiere.ADEMPIERE_R : s;
} }
public static int getZoomWindowID(MQuery query)
{
int AD_Window_ID = MZoomCondition.findZoomWindow(query);
if (AD_Window_ID <= 0)
{
String TableName = query.getTableName();
int PO_Window_ID = 0;
String sql = "SELECT AD_Window_ID, PO_Window_ID FROM AD_Table WHERE TableName=?";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(sql, null);
pstmt.setString(1, TableName);
rs = pstmt.executeQuery();
if (rs.next())
{
AD_Window_ID = rs.getInt(1);
PO_Window_ID = rs.getInt(2);
}
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
finally
{
DB.close(rs, pstmt);
rs = null;
pstmt = null;
}
// Nothing to Zoom to
if (AD_Window_ID == 0)
return AD_Window_ID;
// PO Zoom ?
boolean isSOTrx = true;
if (PO_Window_ID != 0)
{
isSOTrx = DB.isSOTrx(TableName, query.getWhereClause(false));
if (!isSOTrx)
AD_Window_ID = PO_Window_ID;
}
if (log.isLoggable(Level.CONFIG)) log.config(query + " (IsSOTrx=" + isSOTrx + ")");
}
return AD_Window_ID;
}
public static int getZoomWindowID(int AD_Table_ID, int Record_ID)
{
int AD_Window_ID = MZoomCondition.findZoomWindowByTableId(AD_Table_ID, Record_ID);
MTable table = MTable.get(Env.getCtx(), AD_Table_ID);
if (AD_Window_ID <= 0)
{
AD_Window_ID = table.getAD_Window_ID();
// Nothing to Zoom to
if (AD_Window_ID == 0)
return AD_Window_ID;
// PO Zoom ?
boolean isSOTrx = true;
if (table.getPO_Window_ID() != 0)
{
String whereClause = table.getTableName() + "_ID=" + Record_ID;
isSOTrx = DB.isSOTrx(table.getTableName(), whereClause);
if (!isSOTrx)
AD_Window_ID = table.getPO_Window_ID();
}
if (log.isLoggable(Level.CONFIG)) log.config(table.getTableName() + " - Record_ID=" + Record_ID + " (IsSOTrx=" + isSOTrx + ")");
}
return AD_Window_ID;
}
/************************************************************************** /**************************************************************************
* Static Variables * Static Variables
*/ */

25
org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java
View File

@ -27,6 +27,7 @@ import org.adempiere.exceptions.DBException;
import org.adempiere.model.MBroadcastMessage; import org.adempiere.model.MBroadcastMessage;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.model.MNote; import org.compiere.model.MNote;
import org.compiere.model.MUser;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -61,20 +62,20 @@ public class BroadcastMsgUtil
// get list of users based on rule // get list of users based on rule
if (mbMessage.getTarget() != null) { if (mbMessage.getTarget() != null) {
String sql = "SELECT DISTINCT(AD_User_ID) FROM AD_User_Roles WHERE IsActive='Y'"; String sql = "SELECT DISTINCT(AD_User_ID) FROM AD_User_Roles WHERE IsActive='Y'";
// Role // Role
if (mbMessage.getTarget().equals(MBroadcastMessage.TARGET_Role)) { if (mbMessage.getTarget().equals(MBroadcastMessage.TARGET_Role)) {
sql += " AND AD_Role_ID=" + mbMessage.getAD_Role_ID(); sql += " AND AD_Role_ID=" + mbMessage.getAD_Role_ID();
} else if (mbMessage.getTarget().equals(MBroadcastMessage.TARGET_User)) { } else if (mbMessage.getTarget().equals(MBroadcastMessage.TARGET_User)) {
sql += " AND AD_User_ID=" + mbMessage.getAD_User_ID(); sql += " AND AD_User_ID=" + mbMessage.getAD_User_ID();
} else if (mbMessage.getTarget().equals(MBroadcastMessage.TARGET_Client)) { } else if (mbMessage.getTarget().equals(MBroadcastMessage.TARGET_Client)) {
sql += " AND ad_client_id = " + mbMessage.getNotification_Client_ID(); sql += " AND AD_Client_ID = " + Env.getAD_Client_ID(Env.getCtx());
} } // else Everybody doesn't need additional filtering
int[] userIDs = DB.getIDsEx(null, sql); int[] userIDs = DB.getIDsEx(null, sql);
for (int userID : userIDs) { for (int userID : userIDs) {
MNote note = new MNote(Env.getCtx(), 0, trxName); MNote note = new MNote(Env.getCtx(), 0, trxName);
note.setClientOrg(MUser.get(Env.getCtx(), userID).getAD_Client_ID(), 0);
note.setAD_BroadcastMessage_ID(messageID); note.setAD_BroadcastMessage_ID(messageID);
note.setAD_User_ID(userID); note.setAD_User_ID(userID);
note.setAD_Message_ID(0); note.setAD_Message_ID(0);
@ -147,13 +148,17 @@ public class BroadcastMsgUtil
* @param messageWindow * @param messageWindow
*/ */
public static void showPendingMessage(int AD_User_ID, IBroadcastMsgPopup messageWindow) { public static void showPendingMessage(int AD_User_ID, IBroadcastMsgPopup messageWindow) {
String sql = "SELECT bm.AD_BroadcastMessage_ID " String sql = ""
+ " FROM AD_Note n INNER JOIN AD_BroadcastMessage bm ON (bm.AD_BroadcastMessage_ID=n.AD_BroadcastMessage_ID) " + "SELECT bm.AD_BroadcastMessage_ID "
+ " WHERE n.AD_User_ID=?" + "FROM AD_Note n "
+ " AND n.AD_Client_ID=?" + " INNER JOIN AD_BroadcastMessage bm "
+ " AND (bm.BroadcastType='IL' OR bm.BroadcastType='L') " + " ON ( bm.AD_BroadcastMessage_ID = n.AD_BroadcastMessage_ID ) "
+ " AND bm.isPublished='Y' AND n.processed = 'N'" + "WHERE n.AD_User_ID = ? "
+ " AND ((bm.BroadcastFrequency='U' AND bm.Expired='N' AND (bm.expiration IS NULL OR bm.expiration > SYSDATE)) OR bm.BroadcastFrequency='J')"; + " AND n.AD_Client_ID = ? "
+ " AND ( bm.BroadcastType = 'IL' OR bm.BroadcastType = 'L' ) "
+ " AND bm.isPublished = 'Y' "
+ " AND ( n.Processed = 'N' OR ( n.Processed = 'Y' AND bm.BroadcastFrequency = 'E' ) ) "
+ " AND ( bm.Expired = 'N' AND ( bm.Expiration IS NULL OR bm.Expiration > SYSDATE ) ) ";
ArrayList<MBroadcastMessage> mbMessages = new ArrayList<MBroadcastMessage>(); ArrayList<MBroadcastMessage> mbMessages = new ArrayList<MBroadcastMessage>();
PreparedStatement pstmt = null; PreparedStatement pstmt = null;

74
org.adempiere.ui.swing/src/org/compiere/apps/AEnv.java
View File

@ -31,7 +31,6 @@ import java.awt.Window;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -55,7 +54,6 @@ import org.compiere.model.MMenu;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.MZoomCondition;
import org.compiere.process.DocumentEngine; import org.compiere.process.DocumentEngine;
import org.compiere.swing.CButton; import org.compiere.swing.CButton;
import org.compiere.swing.CFrame; import org.compiere.swing.CFrame;
@ -635,27 +633,12 @@ public final class AEnv
*/ */
public static void zoom (int AD_Table_ID, int Record_ID) public static void zoom (int AD_Table_ID, int Record_ID)
{ {
int AD_Window_ID = MZoomCondition.findZoomWindowByTableId(AD_Table_ID, Record_ID); int AD_Window_ID = Env.getZoomWindowID(AD_Table_ID, Record_ID);
// Nothing to Zoom to
if (AD_Window_ID == 0)
return;
MTable table = MTable.get(Env.getCtx(), AD_Table_ID); MTable table = MTable.get(Env.getCtx(), AD_Table_ID);
if (AD_Window_ID <= 0)
{
AD_Window_ID = table.getAD_Window_ID();
// Nothing to Zoom to
if (AD_Window_ID == 0)
return;
// PO Zoom ?
boolean isSOTrx = true;
if (table.getPO_Window_ID() != 0)
{
String whereClause = table.getTableName() + "_ID=" + Record_ID;
isSOTrx = DB.isSOTrx(table.getTableName(), whereClause);
if (!isSOTrx)
AD_Window_ID = table.getPO_Window_ID();
}
if (log.isLoggable(Level.CONFIG)) log.config(table.getTableName() + " - Record_ID=" + Record_ID + " (IsSOTrx=" + isSOTrx + ")");
}
AWindow frame = new AWindow(null); AWindow frame = new AWindow(null);
if (!frame.initWindow(AD_Window_ID, MQuery.getEqualQuery(table.getTableName() + "_ID", Record_ID))) if (!frame.initWindow(AD_Window_ID, MQuery.getEqualQuery(table.getTableName() + "_ID", Record_ID)))
@ -681,50 +664,11 @@ public final class AEnv
if (query == null || query.getTableName() == null || query.getTableName().length() == 0) if (query == null || query.getTableName() == null || query.getTableName().length() == 0)
return; return;
int AD_Window_ID = MZoomCondition.findZoomWindow(query); int AD_Window_ID = Env.getZoomWindowID(query);
if (AD_Window_ID <= 0) // Nothing to Zoom to
{ if (AD_Window_ID == 0)
String TableName = query.getTableName(); return;
int PO_Window_ID = 0;
String sql = "SELECT AD_Window_ID, PO_Window_ID FROM AD_Table WHERE TableName=?";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(sql, null);
pstmt.setString(1, TableName);
rs = pstmt.executeQuery();
if (rs.next())
{
AD_Window_ID = rs.getInt(1);
PO_Window_ID = rs.getInt(2);
}
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
finally
{
DB.close(rs, pstmt);
rs = null;
pstmt = null;
}
// Nothing to Zoom to
if (AD_Window_ID == 0)
return;
// PO Zoom ?
boolean isSOTrx = true;
if (PO_Window_ID != 0)
{
isSOTrx = DB.isSOTrx(TableName, query.getWhereClause(false));
if (!isSOTrx)
AD_Window_ID = PO_Window_ID;
}
if (log.isLoggable(Level.CONFIG)) log.config(query + " (IsSOTrx=" + isSOTrx + ")");
}
AWindow frame = new AWindow(null); AWindow frame = new AWindow(null);
if (!frame.initWindow(AD_Window_ID, query)) if (!frame.initWindow(AD_Window_ID, query))
return; return;

16
org.adempiere.ui.swing/src/org/compiere/print/AReport.java
View File

@ -86,8 +86,12 @@ public class AReport implements ActionListener
this.parent = parent; this.parent = parent;
this.WindowNo = WindowNo; this.WindowNo = WindowNo;
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), WindowNo, "_WinInfo_AD_Window_ID", true);
if (AD_Window_ID == 0)
AD_Window_ID = Env.getZoomWindowID(query);
// See What is there // See What is there
getPrintFormats (AD_Table_ID, invoker); getPrintFormats (AD_Table_ID, AD_Window_ID, invoker);
} // AReport } // AReport
/** /**
@ -116,8 +120,12 @@ public class AReport implements ActionListener
this.WindowNo = WindowNo; this.WindowNo = WindowNo;
this.m_whereExtended = whereExtended; this.m_whereExtended = whereExtended;
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), WindowNo, "_WinInfo_AD_Window_ID", true);
if (AD_Window_ID == 0)
AD_Window_ID = Env.getZoomWindowID(query);
// See What is there // See What is there
getPrintFormats (AD_Table_ID, invoker); getPrintFormats (AD_Table_ID, AD_Window_ID, invoker);
} // AReport } // AReport
/** The Query */ /** The Query */
@ -141,10 +149,10 @@ public class AReport implements ActionListener
* @param AD_Table_ID table * @param AD_Table_ID table
* @param invoker component to display popup (optional) * @param invoker component to display popup (optional)
*/ */
private void getPrintFormats (int AD_Table_ID, JComponent invoker) private void getPrintFormats (int AD_Table_ID, int AD_Window_ID, JComponent invoker)
{ {
int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx()); int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
RowSet rowSet = MPrintFormat.getAccessiblePrintFormats(AD_Table_ID, -1, null); RowSet rowSet = MPrintFormat.getAccessiblePrintFormats(AD_Table_ID, AD_Window_ID, -1, null);
KeyNamePair pp = null; KeyNamePair pp = null;
try try
{ {

7
org.adempiere.ui.swing/src/org/compiere/print/Viewer.java
View File

@ -429,6 +429,10 @@ public class Viewer extends CFrame
comboReport.removeActionListener(this); comboReport.removeActionListener(this);
comboReport.removeAllItems(); comboReport.removeAllItems();
KeyNamePair selectValue = null; KeyNamePair selectValue = null;
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), m_reportEngine.getWindowNo(), "_WinInfo_AD_Window_ID", true);
if (AD_Window_ID == 0)
AD_Window_ID = Env.getZoomWindowID(m_reportEngine.getQuery());
// fill Report Options // fill Report Options
String sql = MRole.getDefault().addAccessSQL( String sql = MRole.getDefault().addAccessSQL(
"SELECT AD_PrintFormat_ID, Name, Description " "SELECT AD_PrintFormat_ID, Name, Description "
@ -437,6 +441,7 @@ public class Viewer extends CFrame
//Added Lines by Armen //Added Lines by Armen
+ "AND IsActive='Y' " + "AND IsActive='Y' "
//End of Added Lines //End of Added Lines
+ (AD_Window_ID > 0 ? "AND (AD_Window_ID=? OR AD_Window_ID IS NULL) " : "")
+ "ORDER BY Name", + "ORDER BY Name",
"AD_PrintFormat", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); "AD_PrintFormat", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
int AD_Table_ID = m_reportEngine.getPrintFormat().getAD_Table_ID(); int AD_Table_ID = m_reportEngine.getPrintFormat().getAD_Table_ID();
@ -446,6 +451,8 @@ public class Viewer extends CFrame
{ {
pstmt = DB.prepareStatement(sql, null); pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, AD_Table_ID); pstmt.setInt(1, AD_Table_ID);
if (AD_Window_ID > 0)
pstmt.setInt(2, AD_Window_ID);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {

73
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AEnv.java
View File

@ -24,9 +24,6 @@ import java.io.IOException;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -155,24 +152,11 @@ public final class AEnv
*/ */
public static void zoom (int AD_Table_ID, int Record_ID) public static void zoom (int AD_Table_ID, int Record_ID)
{ {
int AD_Window_ID = MZoomCondition.findZoomWindowByTableId(AD_Table_ID, Record_ID); int AD_Window_ID = Env.getZoomWindowID(AD_Table_ID, Record_ID);
// Nothing to Zoom to
if (AD_Window_ID == 0)
return;
MTable table = MTable.get(Env.getCtx(), AD_Table_ID); MTable table = MTable.get(Env.getCtx(), AD_Table_ID);
if (AD_Window_ID <= 0)
{
AD_Window_ID = table.getAD_Window_ID();
// PO Zoom ?
boolean isSOTrx = true;
if (table.getPO_Window_ID() != 0)
{
String whereClause = table.getTableName() + "_ID=" + Record_ID;
isSOTrx = DB.isSOTrx(table.getTableName(), whereClause);
if (!isSOTrx)
AD_Window_ID = table.getPO_Window_ID();
}
if (log.isLoggable(Level.CONFIG)) log.config(table.getTableName() + " - Record_ID=" + Record_ID + " (IsSOTrx=" + isSOTrx + ")");
}
zoom(AD_Window_ID, MQuery.getEqualQuery(table.getKeyColumns()[0], Record_ID)); zoom(AD_Window_ID, MQuery.getEqualQuery(table.getKeyColumns()[0], Record_ID));
} // zoom } // zoom
@ -431,56 +415,15 @@ public final class AEnv
{ {
if (query == null || query.getTableName() == null || query.getTableName().length() == 0) if (query == null || query.getTableName() == null || query.getTableName().length() == 0)
return; return;
int AD_Window_ID = MZoomCondition.findZoomWindow(query);
if (AD_Window_ID <= 0) int AD_Window_ID = Env.getZoomWindowID(query);
{ // Nothing to Zoom to
String TableName = query.getTableName(); if (AD_Window_ID == 0)
int PO_Window_ID = 0; return;
String sql = "SELECT AD_Window_ID, PO_Window_ID FROM AD_Table WHERE TableName=?";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(sql, null);
pstmt.setString(1, TableName);
rs = pstmt.executeQuery();
if (rs.next())
{
AD_Window_ID = rs.getInt(1);
PO_Window_ID = rs.getInt(2);
}
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
finally
{
DB.close(rs, pstmt);
rs = null;
pstmt = null;
}
// Nothing to Zoom to
if (AD_Window_ID == 0)
return;
// PO Zoom ?
boolean isSOTrx = true;
if (PO_Window_ID != 0)
{
isSOTrx = DB.isSOTrx(TableName, query.getWhereClause(false));
if (!isSOTrx)
AD_Window_ID = PO_Window_ID;
}
if (log.isLoggable(Level.CONFIG)) log.config(query + " (IsSOTrx=" + isSOTrx + ")");
}
zoom(AD_Window_ID, query); zoom(AD_Window_ID, query);
} }
/** /**
* Get ImageIcon. * Get ImageIcon.
* *

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/WReport.java
View File

@ -100,8 +100,12 @@ public class WReport implements EventListener<Event> {
this.WindowNo = WindowNo; this.WindowNo = WindowNo;
this.whereExtended = whereExtended; this.whereExtended = whereExtended;
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), WindowNo, "_WinInfo_AD_Window_ID", true);
if (AD_Window_ID == 0)
AD_Window_ID = Env.getZoomWindowID(query);
// See What is there // See What is there
getPrintFormats (AD_Table_ID); getPrintFormats (AD_Table_ID, AD_Window_ID);
} // AReport } // AReport
/** The Query */ /** The Query */
@ -124,10 +128,10 @@ public class WReport implements EventListener<Event> {
* @param AD_Table_ID table * @param AD_Table_ID table
* @param invoker component to display popup (optional) * @param invoker component to display popup (optional)
*/ */
private void getPrintFormats (int AD_Table_ID) private void getPrintFormats (int AD_Table_ID, int AD_Window_ID)
{ {
int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx()); int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
RowSet rowSet = MPrintFormat.getAccessiblePrintFormats(AD_Table_ID, -1, null); RowSet rowSet = MPrintFormat.getAccessiblePrintFormats(AD_Table_ID, AD_Window_ID, -1, null);
KeyNamePair pp = null; KeyNamePair pp = null;
try try
{ {

23
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/BroadcastMessageWindow.java
View File

@ -293,15 +293,17 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
textMsgNo.setValue((currMsg+1)+"/"+noOfMsgs); textMsgNo.setValue((currMsg+1)+"/"+noOfMsgs);
textMsgContent.setContent(mbMessage.getBroadcastMessage()); textMsgContent.setContent(mbMessage.getBroadcastMessage());
if(!isTest && mbMessage.isLogAcknowledge() && broadcastFrequency.equals(MBroadcastMessage.BROADCASTFREQUENCY_UntilExpiration)){ if (!isTest && mbMessage.isLogAcknowledge()) {
boolean ack = hashMessages.get(mbMessage.get_ID()); boolean ack = hashMessages.get(mbMessage.get_ID());
acknowledged.setChecked(ack); acknowledged.setChecked(ack);
acknowledged.setVisible(true); acknowledged.setVisible(true);
}else if((broadcastFrequency.equals(MBroadcastMessage.BROADCASTFREQUENCY_JustOnce)) } else if(mbMessage.isLogAcknowledge()) {
|| (mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate))){ acknowledged.setVisible(true);
} else if ( broadcastFrequency.equals(MBroadcastMessage.BROADCASTFREQUENCY_JustOnce)
|| mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate)) {
acknowledged.setVisible(false); acknowledged.setVisible(false);
hashMessages.put(mbMessages.get(currMsg).get_ID(), true); hashMessages.put(mbMessages.get(currMsg).get_ID(), true);
}else{ } else {
acknowledged.setVisible(false); acknowledged.setVisible(false);
} }
@ -315,18 +317,19 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
public MNote getMNote(MBroadcastMessage mbMessage) { public MNote getMNote(MBroadcastMessage mbMessage) {
MNote note =null; MNote note =null;
if(!mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate)){ if(!mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate)){
String sql = "SELECT * FROM AD_Note WHERE AD_BroadcastMessage_ID = ? AND AD_User_ID = ?"; String sql = "SELECT * FROM AD_Note WHERE AD_BroadcastMessage_ID = ? AND AD_User_ID = ? AND AD_Client_ID = ?";
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs=null; ResultSet rs=null;
try { try {
pstmt = DB.prepareStatement(sql, null); pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, mbMessage.get_ID()); pstmt.setInt(1, mbMessage.get_ID());
pstmt.setInt(2, Env.getAD_User_ID(Env.getCtx())); pstmt.setInt(2, Env.getAD_User_ID(Env.getCtx()));
pstmt.setInt(3, Env.getAD_Client_ID(Env.getCtx()));
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
note = new MNote(Env.getCtx(), rs, null); note = new MNote(Env.getCtx(), rs, null);
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "Note for the Mesaage Could not be retrieved ",e); log.log(Level.SEVERE, "Note for the Message Could not be retrieved ",e);
throw new DBException(e); throw new DBException(e);
}finally{ }finally{
DB.close(rs, pstmt); DB.close(rs, pstmt);
@ -340,7 +343,8 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
super.onClose(); super.onClose();
if (!isTest) { if (!isTest) {
if(mbMessages.size()==1){ if(mbMessages.size()==1){
if ((mbMessages.get(0).getBroadcastFrequency().equals("J")) if ((mbMessages.get(0).getBroadcastFrequency().equals(MBroadcastMessage.BROADCASTFREQUENCY_JustOnce))
|| (mbMessages.get(0).getBroadcastFrequency().equals(MBroadcastMessage.BROADCASTFREQUENCY_UntilExpiration))
|| (mbMessages.get(0).getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate))) { || (mbMessages.get(0).getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate))) {
hashMessages.put(mbMessages.get(0).get_ID(), true); hashMessages.put(mbMessages.get(0).get_ID(), true);
} }
@ -349,7 +353,10 @@ public class BroadcastMessageWindow extends Window implements IBroadcastMsgPopup
for (MBroadcastMessage mbMessage : mbMessages) { for (MBroadcastMessage mbMessage : mbMessages) {
if(!mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate)){ if(!mbMessage.getBroadcastType().equals(MBroadcastMessage.BROADCASTTYPE_Immediate)){
MNote note = getMNote(mbMessage); MNote note = getMNote(mbMessage);
note.setProcessed(hashMessages.get(mbMessage.get_ID())); if (mbMessage.getBroadcastFrequency().equals(MBroadcastMessage.BROADCASTFREQUENCY_UntilExpiration))
note.setProcessed(true);
else
note.setProcessed(hashMessages.get(mbMessage.get_ID()));
if(hashMessages.get(mbMessage.get_ID())){ if(hashMessages.get(mbMessage.get_ID())){
acknowedgedMsgs.add(mbMessage); acknowedgedMsgs.add(mbMessage);
} }

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java
View File

@ -89,7 +89,7 @@ public class ReportAction implements EventListener<Event>
public ReportAction(AbstractADWindowContent panel) public ReportAction(AbstractADWindowContent panel)
{ {
this.panel = panel; this.panel = panel;
getPrintFormats(panel.getActiveGridTab().getAD_Table_ID()); getPrintFormats(panel.getActiveGridTab().getAD_Table_ID(), panel.getActiveGridTab().getAD_Window_ID());
} }
public void show() public void show()
@ -447,12 +447,12 @@ public class ReportAction implements EventListener<Event>
} }
} }
private void getPrintFormats(int AD_Table_ID) private void getPrintFormats(int AD_Table_ID, int AD_Window_ID)
{ {
printFormatList.clear(); printFormatList.clear();
int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx()); int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
RowSet rowSet = MPrintFormat.getAccessiblePrintFormats(AD_Table_ID, -1, null); RowSet rowSet = MPrintFormat.getAccessiblePrintFormats(AD_Table_ID, AD_Window_ID, -1, null);
KeyNamePair pp = null; KeyNamePair pp = null;
try try
{ {

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java
View File

@ -360,6 +360,8 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
south.appendChild(linkDiv); south.appendChild(linkDiv);
//m_WindowNo //m_WindowNo
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), m_reportEngine.getWindowNo(), "_WinInfo_AD_Window_ID", true); int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), m_reportEngine.getWindowNo(), "_WinInfo_AD_Window_ID", true);
if (AD_Window_ID == 0)
AD_Window_ID = Env.getZoomWindowID(m_reportEngine.getQuery());
int AD_Process_ID = m_reportEngine.getPrintInfo() != null ? m_reportEngine.getPrintInfo().getAD_Process_ID() : 0; int AD_Process_ID = m_reportEngine.getPrintInfo() != null ? m_reportEngine.getPrintInfo().getAD_Process_ID() : 0;
updateToolbarAccess(AD_Window_ID, AD_Process_ID); updateToolbarAccess(AD_Window_ID, AD_Process_ID);
@ -596,6 +598,11 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
comboReport.removeEventListener(Events.ON_SELECT, this); comboReport.removeEventListener(Events.ON_SELECT, this);
comboReport.getItems().clear(); comboReport.getItems().clear();
KeyNamePair selectValue = null; KeyNamePair selectValue = null;
int AD_Window_ID = Env.getContextAsInt(Env.getCtx(), m_reportEngine.getWindowNo(), "_WinInfo_AD_Window_ID", true);
if (AD_Window_ID == 0)
AD_Window_ID = Env.getZoomWindowID(m_reportEngine.getQuery());
// fill Report Options // fill Report Options
String sql = MRole.getDefault().addAccessSQL( String sql = MRole.getDefault().addAccessSQL(
"SELECT AD_PrintFormat_ID, Name, Description " "SELECT AD_PrintFormat_ID, Name, Description "
@ -604,6 +611,7 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
//Added Lines by Armen //Added Lines by Armen
+ "AND IsActive='Y' " + "AND IsActive='Y' "
//End of Added Lines //End of Added Lines
+ (AD_Window_ID > 0 ? "AND (AD_Window_ID=? OR AD_Window_ID IS NULL) " : "")
+ "ORDER BY Name", + "ORDER BY Name",
"AD_PrintFormat", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO); "AD_PrintFormat", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO);
int AD_Table_ID = m_reportEngine.getPrintFormat().getAD_Table_ID(); int AD_Table_ID = m_reportEngine.getPrintFormat().getAD_Table_ID();
@ -613,6 +621,8 @@ public class ZkReportViewer extends Window implements EventListener<Event>, ITab
{ {
pstmt = DB.prepareStatement(sql, null); pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, AD_Table_ID); pstmt.setInt(1, AD_Table_ID);
if (AD_Window_ID > 0)
pstmt.setInt(2, AD_Window_ID);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while (rs.next()) while (rs.next())
{ {

16
org.adempiere.ui/src/org/compiere/print/ReportCtl.java
View File

@ -155,11 +155,11 @@ public class ReportCtl
return startDocumentPrint(ReportEngine.DUNNING, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview()); return startDocumentPrint(ReportEngine.DUNNING, pi.getRecord_ID(), parent, WindowNo, !pi.isPrintPreview());
else if (pi.getAD_Process_ID() == PROCESS_RPT_FINREPORT // Financial Report else if (pi.getAD_Process_ID() == PROCESS_RPT_FINREPORT // Financial Report
|| pi.getAD_Process_ID() == PROCESS_RPT_FINSTATEMENT) // Financial Statement || pi.getAD_Process_ID() == PROCESS_RPT_FINSTATEMENT) // Financial Statement
return startFinReport (pi); return startFinReport (pi, WindowNo);
/******************** /********************
* Standard Report * Standard Report
*******************/ *******************/
return startStandardReport (pi); return startStandardReport (pi, WindowNo);
} // create } // create
/************************************************************************** /**************************************************************************
@ -169,10 +169,10 @@ public class ReportCtl
* @param IsDirectPrint if true, prints directly - otherwise View * @param IsDirectPrint if true, prints directly - otherwise View
* @return true if OK * @return true if OK
*/ */
static public boolean startStandardReport (ProcessInfo pi, boolean IsDirectPrint) static public boolean startStandardReport (ProcessInfo pi, int WindowNo, boolean IsDirectPrint)
{ {
pi.setPrintPreview(!IsDirectPrint); pi.setPrintPreview(!IsDirectPrint);
return startStandardReport(pi); return startStandardReport(pi, WindowNo);
} }
/************************************************************************** /**************************************************************************
@ -187,7 +187,7 @@ public class ReportCtl
* @param IsDirectPrint if true, prints directly - otherwise View * @param IsDirectPrint if true, prints directly - otherwise View
* @return true if OK * @return true if OK
*/ */
static public boolean startStandardReport (ProcessInfo pi) static public boolean startStandardReport (ProcessInfo pi, int WindowNo)
{ {
ReportEngine re = null; ReportEngine re = null;
// //
@ -202,6 +202,7 @@ public class ReportCtl
MQuery query = MQuery.get (ctx, pi.getAD_PInstance_ID(), TableName); MQuery query = MQuery.get (ctx, pi.getAD_PInstance_ID(), TableName);
PrintInfo info = new PrintInfo(pi); PrintInfo info = new PrintInfo(pi);
re = new ReportEngine(ctx, format, query, info); re = new ReportEngine(ctx, format, query, info);
re.setWindowNo(WindowNo);
createOutput(re, pi.isPrintPreview(), null); createOutput(re, pi.isPrintPreview(), null);
return true; return true;
} }
@ -214,6 +215,7 @@ public class ReportCtl
pi.setSummary("No ReportEngine"); pi.setSummary("No ReportEngine");
return false; return false;
} }
re.setWindowNo(WindowNo);
} }
createOutput(re, pi.isPrintPreview(), null); createOutput(re, pi.isPrintPreview(), null);
@ -225,7 +227,7 @@ public class ReportCtl
* @param pi Process Info * @param pi Process Info
* @return true if OK * @return true if OK
*/ */
static public boolean startFinReport (ProcessInfo pi) static public boolean startFinReport (ProcessInfo pi, int WindowNo)
{ {
@SuppressWarnings("unused") @SuppressWarnings("unused")
int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx()); int AD_Client_ID = Env.getAD_Client_ID(Env.getCtx());
@ -246,6 +248,7 @@ public class ReportCtl
PrintInfo info = new PrintInfo(pi); PrintInfo info = new PrintInfo(pi);
ReportEngine re = new ReportEngine(Env.getCtx(), format, query, info); ReportEngine re = new ReportEngine(Env.getCtx(), format, query, info);
re.setWindowNo(WindowNo);
createOutput(re, pi.isPrintPreview(), null); createOutput(re, pi.isPrintPreview(), null);
return true; return true;
} // startFinReport } // startFinReport
@ -311,6 +314,7 @@ public class ReportCtl
{ {
throw new AdempiereException("NoDocPrintFormat"); throw new AdempiereException("NoDocPrintFormat");
} }
re.setWindowNo(WindowNo);
if (customPrintFormat!=null) { if (customPrintFormat!=null) {
// Use custom print format if available // Use custom print format if available
re.setPrintFormat(customPrintFormat); re.setPrintFormat(customPrintFormat);