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

Merge with 226388bdba1e6652da9bad68680987523fc10267 ( iDempiere Head )

This commit is contained in:
Heng Sin Low 2012-05-01 23:19:57 +08:00
parent fbf734ea36 4fa70b977f
commit 8d01b94373
124 changed files with 3015 additions and 1355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
migration/360lts-release/oracle/835_IDEMPIERE-195_MenuAutoExpand.sql Normal file
View File

@ -0,0 +1,345 @@
-- Apr 12, 2012 11:08:20 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,200023,0,'IsMenuAutoExpand',TO_DATE('2012-04-12 11:08:19','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded','D','Y','Auto expand menu','Auto expand menu',TO_DATE('2012-04-12 11:08:19','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:08:21 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Description,Help,Name,PO_Description,PO_Help,PO_Name,PO_PrintName,PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Element_ID, t.Description,t.Help,t.Name,t.PO_Description,t.PO_Help,t.PO_Name,t.PO_PrintName,t.PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200023 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
;
-- Apr 12, 2012 11:09:31 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,SeqNo,Updated,UpdatedBy,Version) VALUES (0,200112,200023,0,20,156,'IsMenuAutoExpand',TO_DATE('2012-04-12 11:09:31','YYYY-MM-DD HH24:MI:SS'),100,'N','If ticked, the menu is automatically expanded','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','Y','Auto expand menu',0,TO_DATE('2012-04-12 11:09:31','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Apr 12, 2012 11:09:31 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200112 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)
;
-- Apr 12, 2012 11:09:41 AM CEST
-- IDEMPIERE-129 Expand menu automatically
ALTER TABLE AD_Role ADD IsMenuAutoExpand CHAR(1) DEFAULT 'N' CHECK (IsMenuAutoExpand IN ('Y','N')) NOT NULL
;
-- Apr 12, 2012 11:10:42 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SortNo,Updated,UpdatedBy) VALUES (0,200112,200071,0,119,TO_DATE('2012-04-12 11:10:41','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded',0,'D','Y','Y','Y','N','N','N','N','N','Auto expand menu',430,0,TO_DATE('2012-04-12 11:10:41','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:10:42 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200071 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)
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=200071
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=50168
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=50169
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=50170
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=50171
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=50172
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=360,IsDisplayed='Y' WHERE AD_Field_ID=50173
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=370,IsDisplayed='Y' WHERE AD_Field_ID=50174
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=380,IsDisplayed='Y' WHERE AD_Field_ID=50175
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=390,IsDisplayed='Y' WHERE AD_Field_ID=50176
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=400,IsDisplayed='Y' WHERE AD_Field_ID=50177
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=410,IsDisplayed='Y' WHERE AD_Field_ID=50178
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=420,IsDisplayed='Y' WHERE AD_Field_ID=55432
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=430,IsDisplayed='Y' WHERE AD_Field_ID=55433
;
-- Apr 12, 2012 11:12:28 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,SeqNo,Updated,UpdatedBy,Version) VALUES (0,200113,200023,0,20,114,'IsMenuAutoExpand',TO_DATE('2012-04-12 11:12:27','YYYY-MM-DD HH24:MI:SS'),100,'N','If ticked, the menu is automatically expanded','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','Y','Auto expand menu',0,TO_DATE('2012-04-12 11:12:27','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Apr 12, 2012 11:12:28 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200113 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)
;
-- Apr 12, 2012 11:12:29 AM CEST
-- IDEMPIERE-129 Expand menu automatically
ALTER TABLE AD_User ADD IsMenuAutoExpand CHAR(1) DEFAULT 'N' CHECK (IsMenuAutoExpand IN ('Y','N')) NOT NULL
;
-- Apr 12, 2012 11:13:08 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SortNo,Updated,UpdatedBy) VALUES (0,200113,200072,0,118,TO_DATE('2012-04-12 11:13:07','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded',0,'D','Y','Y','Y','N','N','N','N','N','Auto expand menu',310,0,TO_DATE('2012-04-12 11:13:07','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:13:08 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200072 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)
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=52010
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=6515
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=6517
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=6514
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=6518
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=11679
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=12324
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=12323
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=5883
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=5884
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=4261
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=10491
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=6511
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=12640
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=200072
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=6513
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=11525
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=6520
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=8342
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=6519
;
-- Apr 12, 2012 11:13:47 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SortNo,Updated,UpdatedBy) VALUES (0,200113,200073,0,53282,TO_DATE('2012-04-12 11:13:46','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded',0,'D','Y','Y','Y','N','N','N','N','N','Auto expand menu',310,0,TO_DATE('2012-04-12 11:13:46','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:13:47 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200073 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)
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=57995
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=57997
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=57998
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=57999
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=58000
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=58001
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=58002
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=58003
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=58004
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=58005
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=58006
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=58007
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=58008
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=58009
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=200073
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=58010
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=58011
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=58012
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=58013
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=58014
;
UPDATE AD_System
SET LastMigrationScriptApplied='835_IDEMPIERE-195_MenuAutoExpand.sql'
WHERE LastMigrationScriptApplied<'835_IDEMPIERE-195_MenuAutoExpand.sql'
OR LastMigrationScriptApplied IS NULL
;

205
migration/360lts-release/oracle/836_IDEMPIERE-156.sql Normal file
View File

@ -0,0 +1,205 @@
-- 12/04/2012 09:40:45 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column (AD_Column_ID,AD_Table_ID,EntityType,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,Help,IsParent,Description,Name,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,ColumnName,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,IsAllowCopy,CreatedBy,Updated,AD_Client_ID,AD_Org_ID,IsActive,Created,UpdatedBy) VALUES (62513,297,'U',0,'N','N','N',0,'The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','N','Alphanumeric identifier of the entity','Name',60,'N',10,'N','N',469,'N','Y','Name','N','Y','N','Y',0,TO_DATE('2012-04-12 09:40:44','YYYY-MM-DD HH24:MI:SS'),0,0,'Y',TO_DATE('2012-04-12 09:40:44','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 12/04/2012 09:40:45 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=62513 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)
;
-- 12/04/2012 09:43:11 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount ADD Name NVARCHAR2(60) DEFAULT NULL
;
-- 12/04/2012 09:44:29 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column (AD_Column_ID,AD_Table_ID,EntityType,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,Help,IsParent,Description,Name,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,ColumnName,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,IsAllowCopy,CreatedBy,Updated,AD_Client_ID,AD_Org_ID,IsActive,Created,UpdatedBy) VALUES (62512,297,'U',0,'N','N','N',0,'A search key allows you a fast method of finding a particular record.
If you leave the search key empty, the system automatically creates a numeric number. The document sequence used for this fallback number is defined in the "Maintain Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table (e.g. C_Order).','N','Search key for the record in the format required - must be unique','Search Key',40,'N',10,'N','N',620,'N','Y','Value','N','Y','N','Y',0,TO_DATE('2012-04-12 09:44:29','YYYY-MM-DD HH24:MI:SS'),0,0,'Y',TO_DATE('2012-04-12 09:44:29','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 12/04/2012 09:44:29 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=62512 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)
;
-- 12/04/2012 09:44:58 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount ADD Value NVARCHAR2(40) DEFAULT NULL
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field (IsEncrypted,Description,DisplayLength,Name,IsDisplayed,IsSameLine,IsHeading,AD_Column_ID,IsFieldOnly,IsCentrallyMaintained,AD_Tab_ID,AD_Field_ID,IsReadOnly,Help,EntityType,UpdatedBy,AD_Org_ID,IsActive,Created,AD_Client_ID,CreatedBy,Updated) VALUES ('N','Alphanumeric identifier of the entity',60,'Name','Y','N','N',62513,'N','Y',228,63003,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','U',0,0,'Y',TO_DATE('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'),0,0,TO_DATE('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'))
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Name,Help, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Name,t.Help, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=63003 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)
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field (IsEncrypted,Description,DisplayLength,Name,IsDisplayed,IsSameLine,IsHeading,AD_Column_ID,IsFieldOnly,IsCentrallyMaintained,AD_Tab_ID,AD_Field_ID,IsReadOnly,Help,EntityType,UpdatedBy,AD_Org_ID,IsActive,Created,AD_Client_ID,CreatedBy,Updated) VALUES ('N','Search key for the record in the format required - must be unique',40,'Search Key','Y','N','N',62512,'N','Y',228,63002,'N','A search key allows you a fast method of finding a particular record.
If you leave the search key empty, the system automatically creates a numeric number. The document sequence used for this fallback number is defined in the "Maintain Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table (e.g. C_Order).','U',0,0,'Y',TO_DATE('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'),0,0,TO_DATE('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'))
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Name,Help, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Name,t.Help, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=63002 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)
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=63002
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=63003
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=2217
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=2214
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=11201
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=11017
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=11016
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=2222
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=3220
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=2219
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=4114
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=2220
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=2221
;
-- 12/04/2012 09:51:08 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='N',Updated=TO_DATE('2012-04-12 09:51:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=3074
;
-- 12/04/2012 09:51:23 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='Y',Updated=TO_DATE('2012-04-12 09:51:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 09:51:34 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='Y', SeqNo=3,Updated=TO_DATE('2012-04-12 09:51:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
update c_bankaccount set name=accountno,value=accountno;
-- 12/04/2012 11:46:17 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET SeqNo=0,Updated=TO_DATE('2012-04-12 11:46:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=3074
;
-- 12/04/2012 11:46:49 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='N', SeqNo=0,Updated=TO_DATE('2012-04-12 11:46:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
-- 12/04/2012 11:47:00 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET SeqNo=2, IsUpdateable='N',Updated=TO_DATE('2012-04-12 11:47:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=3072
;
-- 12/04/2012 11:47:07 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET SeqNo=1,Updated=TO_DATE('2012-04-12 11:47:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 11:50:38 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2012-04-12 11:50:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 11:50:43 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount MODIFY Name NVARCHAR2(60)
;
-- 12/04/2012 11:50:43 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount MODIFY Name NOT NULL
;
-- 12/04/2012 11:50:58 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsMandatory='Y',Updated=TO_DATE('2012-04-12 11:50:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
-- 12/04/2012 11:51:01 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount MODIFY Value NVARCHAR2(40)
;
-- 12/04/2012 11:51:01 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount MODIFY Value NOT NULL
;
-- 12/04/2012 11:51:29 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2012-04-12 11:51:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
-- 12/04/2012 11:51:46 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET EntityType='D',Updated=TO_DATE('2012-04-12 11:51:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 11:53:28 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Ref_Table SET AD_Display=62513,Updated=TO_DATE('2012-04-12 11:53:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Reference_ID=53283
;
UPDATE AD_System
SET LastMigrationScriptApplied='836_IDEMPIERE-156.sql'
WHERE LastMigrationScriptApplied<'836_IDEMPIERE-156.sql'
OR LastMigrationScriptApplied IS NULL
;

22
migration/360lts-release/oracle/837_IDEMPIERE-195.sql Normal file
View File

@ -0,0 +1,22 @@
-- Apr 18, 2012 10:41:39 AM COT
-- IDEMPIERE-195 Expand menu automatically
UPDATE AD_Column SET AD_Reference_ID=17, AD_Reference_Value_ID=319, DefaultValue=NULL, IsMandatory='N',Updated=TO_DATE('2012-04-18 10:41:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200113
;
-- Apr 18, 2012 10:41:41 AM COT
-- IDEMPIERE-195 Expand menu automatically
ALTER TABLE AD_User MODIFY IsMenuAutoExpand CHAR(1) DEFAULT NULL
;
-- Apr 18, 2012 10:41:44 AM COT
-- IDEMPIERE-195 Expand menu automatically
ALTER TABLE AD_User MODIFY IsMenuAutoExpand NULL
;
UPDATE AD_User SET IsMenuAutoExpand=NULL;
UPDATE AD_System
SET LastMigrationScriptApplied='837_IDEMPIERE-195.sql'
WHERE LastMigrationScriptApplied<'837_IDEMPIERE-195.sql'
OR LastMigrationScriptApplied IS NULL
;

345
migration/360lts-release/postgresql/835_IDEMPIERE-195_MenuAutoExpand.sql Normal file
View File

@ -0,0 +1,345 @@
-- Apr 12, 2012 11:08:21 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Element (AD_Client_ID,AD_Element_ID,AD_Org_ID,ColumnName,Created,CreatedBy,Description,EntityType,IsActive,Name,PrintName,Updated,UpdatedBy) VALUES (0,200023,0,'IsMenuAutoExpand',TO_TIMESTAMP('2012-04-12 11:08:19','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded','D','Y','Auto expand menu','Auto expand menu',TO_TIMESTAMP('2012-04-12 11:08:19','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:08:21 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Description,Help,Name,PO_Description,PO_Help,PO_Name,PO_PrintName,PrintName, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Element_ID, t.Description,t.Help,t.Name,t.PO_Description,t.PO_Help,t.PO_Name,t.PO_PrintName,t.PrintName, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Element t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Element_ID=200023 AND NOT EXISTS (SELECT * FROM AD_Element_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Element_ID=t.AD_Element_ID)
;
-- Apr 12, 2012 11:09:31 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,SeqNo,Updated,UpdatedBy,Version) VALUES (0,200112,200023,0,20,156,'IsMenuAutoExpand',TO_TIMESTAMP('2012-04-12 11:09:31','YYYY-MM-DD HH24:MI:SS'),100,'N','If ticked, the menu is automatically expanded','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','Y','Auto expand menu',0,TO_TIMESTAMP('2012-04-12 11:09:31','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Apr 12, 2012 11:09:31 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200112 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)
;
-- Apr 12, 2012 11:09:41 AM CEST
-- IDEMPIERE-129 Expand menu automatically
ALTER TABLE AD_Role ADD COLUMN IsMenuAutoExpand CHAR(1) DEFAULT 'N' CHECK (IsMenuAutoExpand IN ('Y','N')) NOT NULL
;
-- Apr 12, 2012 11:10:42 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SortNo,Updated,UpdatedBy) VALUES (0,200112,200071,0,119,TO_TIMESTAMP('2012-04-12 11:10:41','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded',0,'D','Y','Y','Y','N','N','N','N','N','Auto expand menu',430,0,TO_TIMESTAMP('2012-04-12 11:10:41','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:10:42 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200071 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)
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=200071
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=50168
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=50169
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=330,IsDisplayed='Y' WHERE AD_Field_ID=50170
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=340,IsDisplayed='Y' WHERE AD_Field_ID=50171
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=350,IsDisplayed='Y' WHERE AD_Field_ID=50172
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=360,IsDisplayed='Y' WHERE AD_Field_ID=50173
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=370,IsDisplayed='Y' WHERE AD_Field_ID=50174
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=380,IsDisplayed='Y' WHERE AD_Field_ID=50175
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=390,IsDisplayed='Y' WHERE AD_Field_ID=50176
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=400,IsDisplayed='Y' WHERE AD_Field_ID=50177
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=410,IsDisplayed='Y' WHERE AD_Field_ID=50178
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=420,IsDisplayed='Y' WHERE AD_Field_ID=55432
;
-- Apr 12, 2012 11:11:23 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=430,IsDisplayed='Y' WHERE AD_Field_ID=55433
;
-- Apr 12, 2012 11:12:28 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,ColumnName,Created,CreatedBy,DefaultValue,Description,EntityType,FieldLength,IsActive,IsAllowCopy,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsEncrypted,IsIdentifier,IsKey,IsMandatory,IsParent,IsSelectionColumn,IsSyncDatabase,IsTranslated,IsUpdateable,Name,SeqNo,Updated,UpdatedBy,Version) VALUES (0,200113,200023,0,20,114,'IsMenuAutoExpand',TO_TIMESTAMP('2012-04-12 11:12:27','YYYY-MM-DD HH24:MI:SS'),100,'N','If ticked, the menu is automatically expanded','D',1,'Y','Y','Y','N','N','N','N','N','Y','N','N','N','N','Y','Auto expand menu',0,TO_TIMESTAMP('2012-04-12 11:12:27','YYYY-MM-DD HH24:MI:SS'),100,0)
;
-- Apr 12, 2012 11:12:28 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=200113 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)
;
-- Apr 12, 2012 11:12:29 AM CEST
-- IDEMPIERE-129 Expand menu automatically
ALTER TABLE AD_User ADD COLUMN IsMenuAutoExpand CHAR(1) DEFAULT 'N' CHECK (IsMenuAutoExpand IN ('Y','N')) NOT NULL
;
-- Apr 12, 2012 11:13:08 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SortNo,Updated,UpdatedBy) VALUES (0,200113,200072,0,118,TO_TIMESTAMP('2012-04-12 11:13:07','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded',0,'D','Y','Y','Y','N','N','N','N','N','Auto expand menu',310,0,TO_TIMESTAMP('2012-04-12 11:13:07','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:13:08 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200072 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)
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=52010
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=6515
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=6517
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=6514
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=6518
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=11679
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=12324
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=12323
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=5883
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=5884
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=4261
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=10491
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=6511
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=12640
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=200072
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=6513
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=11525
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=6520
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=8342
;
-- Apr 12, 2012 11:13:25 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=6519
;
-- Apr 12, 2012 11:13:47 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,Created,CreatedBy,Description,DisplayLength,EntityType,IsActive,IsCentrallyMaintained,IsDisplayed,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SortNo,Updated,UpdatedBy) VALUES (0,200113,200073,0,53282,TO_TIMESTAMP('2012-04-12 11:13:46','YYYY-MM-DD HH24:MI:SS'),100,'If ticked, the menu is automatically expanded',0,'D','Y','Y','Y','N','N','N','N','N','Auto expand menu',310,0,TO_TIMESTAMP('2012-04-12 11:13:46','YYYY-MM-DD HH24:MI:SS'),100)
;
-- Apr 12, 2012 11:13:47 AM CEST
-- IDEMPIERE-129 Expand menu automatically
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200073 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)
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=57995
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=57997
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=57998
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=160,IsDisplayed='Y' WHERE AD_Field_ID=57999
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=170,IsDisplayed='Y' WHERE AD_Field_ID=58000
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=180,IsDisplayed='Y' WHERE AD_Field_ID=58001
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=190,IsDisplayed='Y' WHERE AD_Field_ID=58002
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=200,IsDisplayed='Y' WHERE AD_Field_ID=58003
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=210,IsDisplayed='Y' WHERE AD_Field_ID=58004
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=220,IsDisplayed='Y' WHERE AD_Field_ID=58005
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=230,IsDisplayed='Y' WHERE AD_Field_ID=58006
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=240,IsDisplayed='Y' WHERE AD_Field_ID=58007
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=250,IsDisplayed='Y' WHERE AD_Field_ID=58008
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=260,IsDisplayed='Y' WHERE AD_Field_ID=58009
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=270,IsDisplayed='Y' WHERE AD_Field_ID=200073
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=280,IsDisplayed='Y' WHERE AD_Field_ID=58010
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=290,IsDisplayed='Y' WHERE AD_Field_ID=58011
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=300,IsDisplayed='Y' WHERE AD_Field_ID=58012
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=310,IsDisplayed='Y' WHERE AD_Field_ID=58013
;
-- Apr 12, 2012 11:13:58 AM CEST
-- IDEMPIERE-129 Expand menu automatically
UPDATE AD_Field SET SeqNo=320,IsDisplayed='Y' WHERE AD_Field_ID=58014
;
UPDATE AD_System
SET LastMigrationScriptApplied='835_IDEMPIERE-195_MenuAutoExpand.sql'
WHERE LastMigrationScriptApplied<'835_IDEMPIERE-195_MenuAutoExpand.sql'
OR LastMigrationScriptApplied IS NULL
;

207
migration/360lts-release/postgresql/836_IDEMPIERE-156.sql Normal file
View File

@ -0,0 +1,207 @@
-- 12/04/2012 09:40:45 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column (AD_Column_ID,AD_Table_ID,EntityType,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,Help,IsParent,Description,Name,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,ColumnName,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,IsAllowCopy,CreatedBy,Updated,AD_Client_ID,AD_Org_ID,IsActive,Created,UpdatedBy) VALUES (62513,297,'U',0,'N','N','N',0,'The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','N','Alphanumeric identifier of the entity','Name',60,'N',10,'N','N',469,'N','Y','Name','N','Y','N','Y',0,TO_TIMESTAMP('2012-04-12 09:40:44','YYYY-MM-DD HH24:MI:SS'),0,0,'Y',TO_TIMESTAMP('2012-04-12 09:40:44','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 12/04/2012 09:40:45 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=62513 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)
;
-- 12/04/2012 09:43:11 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount ADD COLUMN Name VARCHAR(60) DEFAULT NULL
;
-- 12/04/2012 09:44:29 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column (AD_Column_ID,AD_Table_ID,EntityType,Version,IsMandatory,IsTranslated,IsIdentifier,SeqNo,Help,IsParent,Description,Name,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,ColumnName,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,IsAllowCopy,CreatedBy,Updated,AD_Client_ID,AD_Org_ID,IsActive,Created,UpdatedBy) VALUES (62512,297,'U',0,'N','N','N',0,'A search key allows you a fast method of finding a particular record.
If you leave the search key empty, the system automatically creates a numeric number. The document sequence used for this fallback number is defined in the "Maintain Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table (e.g. C_Order).','N','Search key for the record in the format required - must be unique','Search Key',40,'N',10,'N','N',620,'N','Y','Value','N','Y','N','Y',0,TO_TIMESTAMP('2012-04-12 09:44:29','YYYY-MM-DD HH24:MI:SS'),0,0,'Y',TO_TIMESTAMP('2012-04-12 09:44:29','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 12/04/2012 09:44:29 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) 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 FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=62512 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)
;
-- 12/04/2012 09:44:58 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
ALTER TABLE C_BankAccount ADD COLUMN Value VARCHAR(40) DEFAULT NULL
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field (IsEncrypted,Description,DisplayLength,Name,IsDisplayed,IsSameLine,IsHeading,AD_Column_ID,IsFieldOnly,IsCentrallyMaintained,AD_Tab_ID,AD_Field_ID,IsReadOnly,Help,EntityType,UpdatedBy,AD_Org_ID,IsActive,Created,AD_Client_ID,CreatedBy,Updated) VALUES ('N','Alphanumeric identifier of the entity',60,'Name','Y','N','N',62513,'N','Y',228,63003,'N','The name of an entity (record) is used as an default search option in addition to the search key. The name is up to 60 characters in length.','U',0,0,'Y',TO_TIMESTAMP('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'),0,0,TO_TIMESTAMP('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'))
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Name,Help, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Name,t.Help, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=63003 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)
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field (IsEncrypted,Description,DisplayLength,Name,IsDisplayed,IsSameLine,IsHeading,AD_Column_ID,IsFieldOnly,IsCentrallyMaintained,AD_Tab_ID,AD_Field_ID,IsReadOnly,Help,EntityType,UpdatedBy,AD_Org_ID,IsActive,Created,AD_Client_ID,CreatedBy,Updated) VALUES ('N','Search key for the record in the format required - must be unique',40,'Search Key','Y','N','N',62512,'N','Y',228,63002,'N','A search key allows you a fast method of finding a particular record.
If you leave the search key empty, the system automatically creates a numeric number. The document sequence used for this fallback number is defined in the "Maintain Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table (e.g. C_Order).','U',0,0,'Y',TO_TIMESTAMP('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'),0,0,TO_TIMESTAMP('2012-04-12 09:49:26','YYYY-MM-DD HH24:MI:SS'))
;
-- 12/04/2012 09:49:26 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Name,Help, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Name,t.Help, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=63002 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)
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=30,IsDisplayed='Y' WHERE AD_Field_ID=63002
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=40,IsDisplayed='Y' WHERE AD_Field_ID=63003
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=50,IsDisplayed='Y' WHERE AD_Field_ID=2217
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=60,IsDisplayed='Y' WHERE AD_Field_ID=2214
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=70,IsDisplayed='Y' WHERE AD_Field_ID=11201
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=11017
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=11016
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=2222
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=3220
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=2219
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=4114
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=2220
;
-- 12/04/2012 09:50:39 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Field SET SeqNo=150,IsDisplayed='Y' WHERE AD_Field_ID=2221
;
-- 12/04/2012 09:51:08 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='N',Updated=TO_TIMESTAMP('2012-04-12 09:51:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=3074
;
-- 12/04/2012 09:51:23 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='Y',Updated=TO_TIMESTAMP('2012-04-12 09:51:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 09:51:34 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='Y', SeqNo=3,Updated=TO_TIMESTAMP('2012-04-12 09:51:34','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
update c_bankaccount set name=accountno,value=accountno;
-- 12/04/2012 11:46:17 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET SeqNo=0,Updated=TO_TIMESTAMP('2012-04-12 11:46:17','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=3074
;
-- 12/04/2012 11:46:49 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsIdentifier='N', SeqNo=0,Updated=TO_TIMESTAMP('2012-04-12 11:46:49','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
-- 12/04/2012 11:47:00 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET SeqNo=2, IsUpdateable='N',Updated=TO_TIMESTAMP('2012-04-12 11:47:00','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=3072
;
-- 12/04/2012 11:47:07 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET SeqNo=1,Updated=TO_TIMESTAMP('2012-04-12 11:47:07','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 11:50:38 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2012-04-12 11:50:38','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 11:50:43 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO t_alter_column values('c_bankaccount','Name','VARCHAR(60)',null,null)
;
-- 12/04/2012 11:50:43 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO t_alter_column values('c_bankaccount','Name',null,'NOT NULL',null)
;
-- 12/04/2012 11:50:58 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET IsMandatory='Y',Updated=TO_TIMESTAMP('2012-04-12 11:50:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
-- 12/04/2012 11:51:01 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO t_alter_column values('c_bankaccount','Value','VARCHAR(40)',null,null)
;
-- 12/04/2012 11:51:01 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
INSERT INTO t_alter_column values('c_bankaccount','Value',null,'NOT NULL',null)
;
-- 12/04/2012 11:51:29 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2012-04-12 11:51:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62512
;
-- 12/04/2012 11:51:46 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Column SET EntityType='D',Updated=TO_TIMESTAMP('2012-04-12 11:51:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Column_ID=62513
;
-- 12/04/2012 11:53:28 AM COT
-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
UPDATE AD_Ref_Table SET AD_Display=62513,Updated=TO_TIMESTAMP('2012-04-12 11:53:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=0 WHERE AD_Reference_ID=53283
;
UPDATE AD_System
SET LastMigrationScriptApplied='836_IDEMPIERE-156.sql'
WHERE LastMigrationScriptApplied<'836_IDEMPIERE-156.sql'
OR LastMigrationScriptApplied IS NULL
;

22
migration/360lts-release/postgresql/837_IDEMPIERE-195.sql Normal file
View File

@ -0,0 +1,22 @@
-- Apr 18, 2012 10:41:39 AM COT
-- IDEMPIERE-195 Expand menu automatically
UPDATE AD_Column SET AD_Reference_ID=17, AD_Reference_Value_ID=319, DefaultValue=NULL, IsMandatory='N',Updated=TO_TIMESTAMP('2012-04-18 10:41:39','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=200113
;
-- Apr 18, 2012 10:41:41 AM COT
-- IDEMPIERE-195 Expand menu automatically
INSERT INTO t_alter_column values('ad_user','IsMenuAutoExpand','CHAR(1)',null,'NULL')
;
-- Apr 18, 2012 10:41:44 AM COT
-- IDEMPIERE-195 Expand menu automatically
INSERT INTO t_alter_column values('ad_user','IsMenuAutoExpand',null,'NULL',null)
;
UPDATE AD_User SET IsMenuAutoExpand=NULL;
UPDATE AD_System
SET LastMigrationScriptApplied='837_IDEMPIERE-195.sql'
WHERE LastMigrationScriptApplied<'837_IDEMPIERE-195.sql'
OR LastMigrationScriptApplied IS NULL
;

1
org.adempiere.base.process/src/org/adempiere/process/ImmediateBankTransfer.java
View File

@ -259,6 +259,7 @@ public class ImmediateBankTransfer extends SvrProcess
"Cash Processing failed: " + cash + " - "
+ cash.getProcessMsg()
+ " / please complete it manually");
throw new IllegalStateException("Cash Processing failed: " + cash + " - " + cash.getProcessMsg());
}
if (!cash.save())
{

1
org.adempiere.base.process/src/org/adempiere/process/InOutGenerateRMA.java
View File

@ -246,6 +246,7 @@ public class InOutGenerateRMA extends SvrProcess
{
processMsg.append(" (NOT Processed)");
log.warning("Shipment Processing failed: " + shipment + " - " + shipment.getProcessMsg());
throw new IllegalStateException("Shipment Processing failed: " + shipment + " - " + shipment.getProcessMsg());
}
if (!shipment.save())

1
org.adempiere.base.process/src/org/adempiere/process/InvoiceGenerateRMA.java
View File

@ -207,6 +207,7 @@ public class InvoiceGenerateRMA extends SvrProcess
{
processMsg.append(" (NOT Processed)");
log.warning("Invoice Processing failed: " + invoice + " - " + invoice.getProcessMsg());
throw new IllegalStateException("Invoice Processing failed: " + invoice + " - " + invoice.getProcessMsg());
}
if (!invoice.save())

5
org.adempiere.base.process/src/org/compiere/process/AllocationAuto.java
View File

@ -828,8 +828,9 @@ public class AllocationAuto extends SvrProcess
if (m_allocation == null)
return true;
boolean success = m_allocation.processIt(MAllocationHdr.DOCACTION_Complete);
if (success)
success = m_allocation.save();
if (!success)
throw new IllegalStateException("Allocation Process Failed "+ m_allocation.getDocumentNo() +
" " + m_allocation.getProcessMsg());
else
m_allocation.saveEx();
addLog(0, m_allocation.getDateAcct(), null, m_allocation.getDescription());

6
org.adempiere.base.process/src/org/compiere/process/BankStatementPayment.java
View File

@ -223,7 +223,11 @@ public class BankStatementPayment extends SvrProcess
return null;
payment.saveEx();
//
payment.processIt(MPayment.DOCACTION_Complete);
if (!payment.processIt(MPayment.DOCACTION_Complete)) {
log.warning("Payment Process Failed: " + payment.getDocumentNo() + " " + payment.getProcessMsg());
throw new IllegalStateException("Payment Process Failed: " + payment.getDocumentNo() + " " + payment.getProcessMsg());
}
payment.saveEx();
return payment;
} // createPayment

13
org.adempiere.base.process/src/org/compiere/process/CopyOrder.java
View File

@ -94,10 +94,19 @@ public class CopyOrder extends SvrProcess
{
MOrder original = new MOrder (getCtx(), p_C_Order_ID, get_TrxName());
original.setDocAction(MOrder.DOCACTION_Complete);
original.processIt(MOrder.DOCACTION_Complete);
if (!original.processIt(MOrder.DOCACTION_Complete)) {
log.warning("Order Process Failed: " + original.getDocumentNo() + " " + original.getProcessMsg());
throw new IllegalStateException("Order Process Failed: " + original.getDocumentNo() + " " + original.getProcessMsg());
}
original.saveEx();
original.setDocAction(MOrder.DOCACTION_Close);
original.processIt(MOrder.DOCACTION_Close);
if (!original.processIt(MOrder.DOCACTION_Close)) {
log.warning("Order Process Failed: " + original.getDocumentNo() + " " + original.getProcessMsg());
throw new IllegalStateException("Order Process Failed: " + original.getDocumentNo() + " " + original.getProcessMsg());
}
original.saveEx();
}
//

6
org.adempiere.base.process/src/org/compiere/process/ExpenseAPInvoice.java
View File

@ -212,7 +212,11 @@ public class ExpenseAPInvoice extends SvrProcess
if (invoice == null)
return;
invoice.setDocAction(DocAction.ACTION_Prepare);
invoice.processIt(DocAction.ACTION_Prepare);
if (!invoice.processIt(DocAction.ACTION_Prepare)) {
log.warning("Invoice Process Failed: " + invoice + " - " + invoice.getProcessMsg());
throw new IllegalStateException("Invoice Process Failed: " + invoice + " - " + invoice.getProcessMsg());
}
if (!invoice.save())
new IllegalStateException("Cannot save Invoice");
//

5
org.adempiere.base.process/src/org/compiere/process/ExpenseSOrder.java
View File

@ -270,7 +270,10 @@ public class ExpenseSOrder extends SvrProcess
if (m_order == null)
return;
m_order.setDocAction(DocAction.ACTION_Prepare);
m_order.processIt(DocAction.ACTION_Prepare);
if (!m_order.processIt(DocAction.ACTION_Prepare)) {
log.warning("Order Process Failed: " + m_order + " - " + m_order.getProcessMsg());
throw new IllegalStateException("Order Process Failed: " + m_order + " - " + m_order.getProcessMsg());
}
if (!m_order.save())
throw new IllegalStateException("Cannot save Order");
m_noOrders++;

12
org.adempiere.base.process/src/org/compiere/process/ImportInvoice.java
View File

@ -644,7 +644,11 @@ public class ImportInvoice extends SvrProcess
{
if (invoice != null)
{
invoice.processIt(m_docAction);
if (!invoice.processIt(m_docAction)) {
log.warning("Invoice Process Failed: " + invoice + " - " + invoice.getProcessMsg());
throw new IllegalStateException("Invoice Process Failed: " + invoice + " - " + invoice.getProcessMsg());
}
invoice.saveEx();
}
// Group Change
@ -740,7 +744,11 @@ public class ImportInvoice extends SvrProcess
}
if (invoice != null)
{
invoice.processIt (m_docAction);
if(!invoice.processIt (m_docAction)) {
log.warning("Invoice Process Failed: " + invoice + " - " + invoice.getProcessMsg());
throw new IllegalStateException("Invoice Process Failed: " + invoice + " - " + invoice.getProcessMsg());
}
invoice.saveEx();
}
rs.close();

12
org.adempiere.base.process/src/org/compiere/process/ImportOrder.java
View File

@ -666,7 +666,11 @@ public class ImportOrder extends SvrProcess
if (m_docAction != null && m_docAction.length() > 0)
{
order.setDocAction(m_docAction);
order.processIt (m_docAction);
if(!order.processIt (m_docAction)) {
log.warning("Order Process Failed: " + order + " - " + order.getProcessMsg());
throw new IllegalStateException("Order Process Failed: " + order + " - " + order.getProcessMsg());
}
}
order.saveEx();
}
@ -767,7 +771,11 @@ public class ImportOrder extends SvrProcess
if (m_docAction != null && m_docAction.length() > 0)
{
order.setDocAction(m_docAction);
order.processIt (m_docAction);
if(!order.processIt (m_docAction)) {
log.warning("Order Process Failed: " + order + " - " + order.getProcessMsg());
throw new IllegalStateException("Order Process Failed: " + order + " - " + order.getProcessMsg());
}
}
order.saveEx();
}

6
org.adempiere.base.process/src/org/compiere/process/ImportPayment.java
View File

@ -502,7 +502,11 @@ public class ImportPayment extends SvrProcess
if (payment != null && m_docAction != null && m_docAction.length() > 0)
{
payment.setDocAction(m_docAction);
payment.processIt (m_docAction);
if(!payment.processIt (m_docAction)) {
log.warning("Payment Process Failed: " + payment + " - " + payment.getProcessMsg());
throw new IllegalStateException("Payment Process Failed: " + payment + " - " + payment.getProcessMsg());
}
payment.saveEx();
}
}

5
org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java
View File

@ -578,8 +578,11 @@ public class InOutGenerate extends SvrProcess
if (m_shipment != null)
{
// Fails if there is a confirmation
if (!m_shipment.processIt(p_docAction))
if (!m_shipment.processIt(p_docAction)) {
log.warning("Failed: " + m_shipment);
throw new IllegalStateException("Shipment Process Failed: " + m_shipment + " - " + m_shipment.getProcessMsg());
}
m_shipment.saveEx();
//
addLog(m_shipment.getM_InOut_ID(), m_shipment.getMovementDate(), null, m_shipment.getDocumentNo());

6
org.adempiere.base.process/src/org/compiere/process/InvoiceBatchProcess.java
View File

@ -155,7 +155,11 @@ public class InvoiceBatchProcess extends SvrProcess
return;
m_invoice.setDocAction(p_DocAction);
m_invoice.processIt(p_DocAction);
if(!m_invoice.processIt(p_DocAction)) {
log.warning("Invoice Process Failed: " + m_invoice + " - " + m_invoice.getProcessMsg());
throw new IllegalStateException("Invoice Process Failed: " + m_invoice + " - " + m_invoice.getProcessMsg());
}
m_invoice.saveEx();
addLog(0, m_invoice.getDateInvoiced(), m_invoice.getGrandTotal(), m_invoice.getDocumentNo());

2
org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java
View File

@ -492,6 +492,8 @@ public class InvoiceGenerate extends SvrProcess
{
log.warning("completeInvoice - failed: " + m_invoice);
addLog("completeInvoice - failed: " + m_invoice); // Elaine 2008/11/25
throw new IllegalStateException("Invoice Process Failed: " + m_invoice + " - " + m_invoice.getProcessMsg());
}
m_invoice.saveEx();

16
org.adempiere.base.process/src/org/compiere/process/InvoiceWriteOff.java
View File

@ -304,8 +304,12 @@ public class InvoiceWriteOff extends SvrProcess
return true;
processPayment();
// Process It
if (m_alloc.processIt(DocAction.ACTION_Complete) && m_alloc.save())
{
if (!m_alloc.processIt(DocAction.ACTION_Complete)) {
log.warning("Allocation Process Failed: " + m_alloc + " - " + m_alloc.getProcessMsg());
throw new IllegalStateException("Allocation Process Failed: " + m_alloc + " - " + m_alloc.getProcessMsg());
}
if (m_alloc.save()) {
m_alloc = null;
return true;
}
@ -323,8 +327,12 @@ public class InvoiceWriteOff extends SvrProcess
if (m_payment == null)
return true;
// Process It
if (m_payment.processIt(DocAction.ACTION_Complete) && m_payment.save())
{
if (!m_payment.processIt(DocAction.ACTION_Complete)) {
log.warning("Payment Process Failed: " + m_payment + " - " + m_payment.getProcessMsg());
throw new IllegalStateException("Payment Process Failed: " + m_payment + " - " + m_payment.getProcessMsg());
}
if (m_payment.save()) {
m_payment = null;
return true;
}

10
org.adempiere.base.process/src/org/compiere/process/OrderBatchProcess.java
View File

@ -177,9 +177,15 @@ public class OrderBatchProcess extends SvrProcess
order.saveEx();
addLog(0, null, null, order.getDocumentNo() + ": OK");
return true;
} else {
log.warning("Order Process Failed: " + order + " - " + order.getProcessMsg());
throw new IllegalStateException("Order Process Failed: " + order + " - " + order.getProcessMsg());
}
addLog (0, null, null, order.getDocumentNo() + ": Error " + order.getProcessMsg());
return false;
// commented by zuhri - unreachable code
//addLog (0, null, null, order.getDocumentNo() + ": Error " + order.getProcessMsg());
//return false;
// end commented out by zuhri
} // process
} // OrderBatchProcess

6
org.adempiere.base.process/src/org/compiere/process/RequestInvoice.java
View File

@ -178,7 +178,11 @@ public class RequestInvoice extends SvrProcess
m_invoice.delete(false);
else
{
m_invoice.processIt(MInvoice.ACTION_Prepare);
if(!m_invoice.processIt(MInvoice.ACTION_Prepare)) {
log.warning("Invoice Process Failed: " + m_invoice + " - " + m_invoice.getProcessMsg());
throw new IllegalStateException("Invoice Process Failed: " + m_invoice + " - " + m_invoice.getProcessMsg());
}
m_invoice.saveEx();
addLog(0, null, m_invoice.getGrandTotal(), m_invoice.getDocumentNo());
}

6
org.adempiere.base.process/src/org/compiere/process/StorageCleanup.java
View File

@ -170,7 +170,11 @@ public class StorageCleanup extends SvrProcess
} // for all movements
// Process
mh.processIt(MMovement.ACTION_Complete);
if (!mh.processIt(MMovement.ACTION_Complete)) {
log.warning("Movement Process Failed: " + mh + " - " + mh.getProcessMsg());
throw new IllegalStateException("Movement Process Failed: " + mh + " - " + mh.getProcessMsg());
}
mh.saveEx();
addLog(0, null, new BigDecimal(lines), "@M_Movement_ID@ " + mh.getDocumentNo() + " ("

3
org.adempiere.base.process/src/org/compiere/process/SynchronizeTerminology.java
View File

@ -78,6 +78,7 @@ public class SynchronizeTerminology extends SvrProcess
rs.close();
trx.commit(true);
// Create Elements for Process Parameters which are centrally maintained
/* IDEMPIERE 109 - this create unwanted Element
sql="SELECT DISTINCT ColumnName, Name, Description, Help, EntityType "
+" FROM AD_PROCESS_PARA p "
+" WHERE NOT EXISTS "
@ -102,7 +103,7 @@ public class SynchronizeTerminology extends SvrProcess
}
pstmt.close();
rs.close();
trx.commit(true);
trx.commit(true);*/
log.info("Adding missing Element Translations");
sql="INSERT INTO AD_ELEMENT_TRL (AD_Element_ID, AD_LANGUAGE, AD_Client_ID, AD_Org_ID,"
+" IsActive, Created, CreatedBy, Updated, UpdatedBy,"

5
org.adempiere.base/src/org/compiere/Base.java
View File

@ -23,6 +23,7 @@ import org.compiere.model.GridWindow;
import org.compiere.model.GridWindowVO;
import org.compiere.model.MConversionRate;
import org.compiere.model.MUOMConversion;
import org.compiere.model.SystemIDs;
import org.compiere.util.Env;
import org.compiere.util.Login;
@ -32,7 +33,7 @@ import org.compiere.util.Login;
* @author Jorg Janke
* @version $Id: Base.java,v 1.5 2006/09/21 20:44:54 jjanke Exp $
*/
class Base
class Base implements SystemIDs
{
/**
* Base Test
@ -52,7 +53,7 @@ class Base
// *******************************************************************
// Table=100, Shipper=142, Window=102, Reference=101
int AD_Window_ID = 102;
int AD_Window_ID = WINDOW_WINDOW_TAB_FIELD;
long startTime = System.currentTimeMillis();
GridWindowVO vo = GridWindowVO.create(Env.getCtx(), 1, AD_Window_ID);
GridWindow w = new GridWindow(vo);

2
org.adempiere.base/src/org/compiere/acct/Doc.java
View File

@ -455,6 +455,8 @@ public abstract class Doc
{
log.log(Level.SEVERE, "Resubmit - Cannot lock " + get_TableName() + "_ID="
+ get_ID() + ", Force=" + force + ",RePost=" + repost);
if (!p_po.isActive())
return "Cannot post inactive document";
if (force)
return "Cannot Lock - ReSubmit";
return "Cannot Lock - ReSubmit or RePost with Force";

11
org.adempiere.base/src/org/compiere/impexp/ImpFormat.java
View File

@ -24,6 +24,7 @@ import java.util.Properties;
import java.util.logging.Level;
import org.compiere.model.I_AD_ImpFormat;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_ImpFormat;
import org.compiere.model.X_I_GLJournal;
import org.compiere.util.CLogger;
@ -39,7 +40,7 @@ import org.compiere.util.Env;
* @version $Id: ImpFormat.java,v 1.3 2006/07/30 00:51:05 jjanke Exp $
*/
public final class ImpFormat
public final class ImpFormat implements SystemIDs
{
/**
* Format
@ -150,24 +151,24 @@ public final class ImpFormat
m_tableUniqueChild = "H_Commodity1"; // Vendor No may not be unique !
m_tableUniqueParent = "H_PartnrID"; // Makes it unique
}
else if (m_AD_Table_ID == 532) // I_Product
else if (m_AD_Table_ID == TABLE_I_PRODUCT) // I_Product
{
m_tableUnique1 = "UPC"; // UPC = unique
m_tableUnique2 = "Value";
m_tableUniqueChild = "VendorProductNo"; // Vendor No may not be unique !
m_tableUniqueParent = "BPartner_Value"; // Makes it unique
}
else if (m_AD_Table_ID == 533) // I_BPartner
else if (m_AD_Table_ID == TABLE_I_BPARTNER) // I_BPartner
{
// gody: 20070113 to allow multiple contacts per BP
// m_tableUnique1 = "Value"; // the key
}
else if (m_AD_Table_ID == 534) // I_ElementValue
else if (m_AD_Table_ID == TABLE_I_ELEMENTVALUE) // I_ElementValue
{
m_tableUniqueParent = "ElementName"; // the parent key
m_tableUniqueChild = "Value"; // the key
}
else if (m_AD_Table_ID == 535) // I_ReportLine
else if (m_AD_Table_ID == TABLE_I_REPORTLINE) // I_ReportLine
{
m_tableUniqueParent = "ReportLineSetName"; // the parent key
m_tableUniqueChild = "Name"; // the key

4
org.adempiere.base/src/org/compiere/model/GridFieldVO.java
View File

@ -39,7 +39,7 @@ import org.compiere.util.Env;
* @see http://sourceforge.net/tracker/?func=detail&atid=879335&aid=1877902&group_id=176962 to FR [1877902]
* @version $Id: GridFieldVO.java,v 1.3 2006/07/30 00:58:04 jjanke Exp $
*/
public class GridFieldVO implements Serializable
public class GridFieldVO implements Serializable, SystemIDs
{
/**
*
@ -351,7 +351,7 @@ public class GridFieldVO implements Serializable
vo.ColumnName += "By";
vo.displayType = isTimestamp ? DisplayType.DateTime : DisplayType.Table;
if (!isTimestamp)
vo.AD_Reference_Value_ID = 110; // AD_User Table Reference
vo.AD_Reference_Value_ID = REFERENCE_AD_USER; // AD_User Table Reference
vo.IsDisplayed = false;
vo.IsMandatory = false;
vo.IsReadOnly = false;

4
org.adempiere.base/src/org/compiere/model/GridTable.java
View File

@ -85,7 +85,7 @@ import org.compiere.util.ValueNamePair;
* https://sourceforge.net/tracker/?func=detail&aid=2910368&group_id=176962&atid=879332
*/
public class GridTable extends AbstractTableModel
implements Serializable
implements Serializable, SystemIDs
{
/**
* generated
@ -1434,7 +1434,7 @@ public class GridTable extends AbstractTableModel
boolean specialZeroUpdate = false;
if (!m_inserting // not inserting, updating a record
&& manualCmd // in a manual way (pushing the save button)
&& (Env.getAD_User_ID(m_ctx) == 0 || Env.getAD_User_ID(m_ctx) == 100) // user must know what is doing -> just allowed to System or SuperUser (Hardcoded)
&& (Env.getAD_User_ID(m_ctx) == USER_SYSTEM || Env.getAD_User_ID(m_ctx) == USER_SUPERUSER) // user must know what is doing -> just allowed to System or SuperUser (Hardcoded)
&& getKeyID(m_rowChanged) == 0) { // the record being changed has ID = 0
String tablename = getTableName(); // just the allowed tables (HardCoded)
if (tablename.equals("AD_Org") ||

16
org.adempiere.base/src/org/compiere/model/I_AD_Role.java
View File

@ -18,11 +18,12 @@ package org.compiere.model;
import java.math.BigDecimal;
import java.sql.Timestamp;
import org.compiere.model.*;
import org.compiere.util.KeyNamePair;
/** Generated Interface for AD_Role
* @author Adempiere (generated)
* @version Release 3.6.0LTS
* @version 360LTS.015
*/
public interface I_AD_Role
{
@ -440,6 +441,19 @@ public interface I_AD_Role
*/
public boolean isManual();
/** Column name IsMenuAutoExpand */
public static final String COLUMNNAME_IsMenuAutoExpand = "IsMenuAutoExpand";
/** Set Auto expand menu.
* If ticked, the menu is automatically expanded
*/
public void setIsMenuAutoExpand (boolean IsMenuAutoExpand);
/** Get Auto expand menu.
* If ticked, the menu is automatically expanded
*/
public boolean isMenuAutoExpand();
/** Column name IsPersonalAccess */
public static final String COLUMNNAME_IsPersonalAccess = "IsPersonalAccess";

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

@ -22,7 +22,7 @@ import org.compiere.util.KeyNamePair;
/** Generated Interface for AD_User
* @author Adempiere (generated)
* @version Release 3.6.0LTS
* @version 360LTS.015
*/
public interface I_AD_User
{
@ -333,6 +333,19 @@ public interface I_AD_User
*/
public boolean isInPayroll();
/** Column name IsMenuAutoExpand */
public static final String COLUMNNAME_IsMenuAutoExpand = "IsMenuAutoExpand";
/** Set Auto expand menu.
* If ticked, the menu is automatically expanded
*/
public void setIsMenuAutoExpand (String IsMenuAutoExpand);
/** Get Auto expand menu.
* If ticked, the menu is automatically expanded
*/
public String getIsMenuAutoExpand();
/** Column name LastContact */
public static final String COLUMNNAME_LastContact = "LastContact";

6
org.adempiere.base/src/org/compiere/model/MCashLine.java
View File

@ -21,6 +21,7 @@ import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.Properties;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Msg;
@ -154,7 +155,10 @@ public class MCashLine extends X_C_CashLine
{
saveEx(trxName);
order.setC_CashLine_ID(getC_CashLine_ID());
order.processIt(MOrder.ACTION_WaitComplete);
// added AdempiereException by Zuhri
if (!order.processIt(MOrder.ACTION_WaitComplete))
throw new AdempiereException("Failed when processing document - " + order.getProcessMsg());
// end added
order.saveEx(trxName);
// Set Invoice
MInvoice[] invoices = order.getInvoices();

21
org.adempiere.base/src/org/compiere/model/MCost.java
View File

@ -708,7 +708,20 @@ public class MCost extends X_M_Cost
s_log.config(product.getName());
// Cost Elements
List <MCostElement> ces = MCostElement.getCostElementsWithCostingMethods(product);
MCostElement[] ces = MCostElement.getCostingMethods(product);
MCostElement ce = null;
for (MCostElement element : ces) {
if (X_M_CostElement.COSTINGMETHOD_StandardCosting.equals(element.getCostingMethod()))
{
ce = element;
break;
}
}
if (ce == null)
{
s_log.fine("No Standard Costing in System");
return;
}
MAcctSchema[] mass = MAcctSchema.getClientAcctSchema(product.getCtx(),
product.getAD_Client_ID(), product.get_TrxName());
@ -720,8 +733,6 @@ public class MCost extends X_M_Cost
String cl = product.getCostingLevel(as);
// Create Std Costing
if (MAcctSchema.COSTINGLEVEL_Client.equals(cl))
{
for(MCostElement ce : ces)
{
MCost cost = MCost.get (product, M_ASI_ID,
as, 0, ce.getM_CostElement_ID(), product.get_TrxName());
@ -735,15 +746,12 @@ public class MCost extends X_M_Cost
+ " - " + as.getName());
}
}
}
else if (MAcctSchema.COSTINGLEVEL_Organization.equals(cl))
{
if (orgs == null)
orgs = MOrg.getOfClient(product);
for (MOrg o : orgs)
{
for(MCostElement ce : ces)
{
MCost cost = MCost.get (product, M_ASI_ID,
as, o.getAD_Org_ID(), ce.getM_CostElement_ID(), product.get_TrxName());
if (cost.is_new())
@ -756,7 +764,6 @@ public class MCost extends X_M_Cost
s_log.warning("Not created: Std.Cost for " + product.getName()
+ " - " + o.getName()
+ " - " + as.getName());
}
}
} // for all orgs
}

4
org.adempiere.base/src/org/compiere/model/MCountry.java
View File

@ -41,7 +41,7 @@ import org.compiere.util.Language;
* <li>BF [ 2695078 ] Country is not translated on invoice
*/
public final class MCountry extends X_C_Country
implements Comparator, Serializable
implements Comparator, Serializable, SystemIDs
{
/**
*
@ -124,7 +124,7 @@ public final class MCountry extends X_C_Country
// Country code of Client Language
if (lang != null && lang.getCountryCode().equals(c.getCountryCode()))
s_default = c;
if (c.getC_Country_ID() == 100) // USA
if (c.getC_Country_ID() == COUNTRY_US) // USA
usa = c;
}
rs.close();

4
org.adempiere.base/src/org/compiere/model/MEntityType.java
View File

@ -38,7 +38,7 @@ import org.compiere.util.CLogger;
* <li>BF [ 2861194 ] EntityType is not using normal PO framework for getting IDs
* https://sourceforge.net/tracker/?func=detail&aid=2861194&group_id=176962&atid=879332
*/
public class MEntityType extends X_AD_EntityType
public class MEntityType extends X_AD_EntityType implements SystemIDs
{
/**
*
@ -219,7 +219,7 @@ public class MEntityType extends X_AD_EntityType
if (!newRecord)
{
int id = getAD_EntityType_ID();
boolean systemMaintained = (id == 10 || id == 20); // C/D
boolean systemMaintained = (id == ENTITYTYPE_DICTIONARY || id == ENTITYTYPE_ADEMPIERE); // C/D
if (systemMaintained)
{
log.saveError("Error", "You cannot modify a System maintained entity");

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

@ -1684,7 +1684,10 @@ public class MInOut extends X_M_InOut implements DocAction
log.fine(dropShipment.toString());
dropShipment.setDocAction(DocAction.ACTION_Complete);
dropShipment.processIt(DocAction.ACTION_Complete);
// added AdempiereException by Zuhri
if (!dropShipment.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + dropShipment.getProcessMsg());
// end added
dropShipment.saveEx();
return dropShipment;
@ -1903,7 +1906,10 @@ public class MInOut extends X_M_InOut implements DocAction
if (counterDT.getDocAction() != null)
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
// added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction()))
throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg());
// end added
counter.saveEx(get_TrxName());
}
}

11
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -2027,7 +2027,10 @@ public class MInvoice extends X_C_Invoice implements DocAction
if (counterDT.getDocAction() != null)
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
// added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction()))
throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg());
// end added
counter.saveEx(get_TrxName());
}
}
@ -2268,8 +2271,10 @@ public class MInvoice extends X_C_Invoice implements DocAction
Env.ZERO, Env.ZERO, Env.ZERO);
rLine.setC_Invoice_ID(reversal.getC_Invoice_ID());
rLine.saveEx();
// Process It
if (alloc.processIt(DocAction.ACTION_Complete))
// added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg());
// end added
alloc.saveEx();
}

5
org.adempiere.base/src/org/compiere/model/MJournalBatch.java
View File

@ -474,7 +474,10 @@ public class MJournalBatch extends X_GL_JournalBatch implements DocAction
;
else
{
journal.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!journal.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + journal.getProcessMsg());
// end added
journal.saveEx();
if (!DocAction.STATUS_Completed.equals(journal.getDocStatus()))
{

20
org.adempiere.base/src/org/compiere/model/MOrder.java
View File

@ -30,6 +30,9 @@ import java.util.Vector;
import java.util.logging.Level;
import java.util.regex.Pattern;
import javax.mail.internet.AddressException;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.BPartnerNoBillToAddressException;
import org.adempiere.exceptions.BPartnerNoShipToAddressException;
import org.adempiere.exceptions.FillMandatoryException;
@ -1895,8 +1898,10 @@ public class MOrder extends X_C_Order implements DocAction
return null;
}
}
// Manually Process Shipment
shipment.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!shipment.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + shipment.getProcessMsg());
// end added
shipment.saveEx(get_TrxName());
if (!DOCSTATUS_Completed.equals(shipment.getDocStatus()))
{
@ -1996,8 +2001,10 @@ public class MOrder extends X_C_Order implements DocAction
}
}
// Manually Process Invoice
invoice.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!invoice.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + invoice.getProcessMsg());
// end added
invoice.saveEx(get_TrxName());
setC_CashLine_ID(invoice.getC_CashLine_ID());
if (!DOCSTATUS_Completed.equals(invoice.getDocStatus()))
@ -2081,7 +2088,10 @@ public class MOrder extends X_C_Order implements DocAction
if (counterDT.getDocAction() != null)
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
// added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction()))
throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg());
// end added
counter.saveEx(get_TrxName());
}
}

7
org.adempiere.base/src/org/compiere/model/MPaySelectionCheck.java
View File

@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Properties;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.process.DocAction;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -326,8 +327,10 @@ public final class MPaySelectionCheck extends X_C_PaySelectionCheck
{
check.setC_Payment_ID (C_Payment_ID);
check.saveEx(); // Payment process needs it
// Should start WF
payment.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!payment.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + payment.getProcessMsg());
// end added
if (!payment.save())
s_log.log(Level.SEVERE, "Payment not saved: " + payment);
}

36
org.adempiere.base/src/org/compiere/model/MPayment.java
View File

@ -1659,8 +1659,10 @@ public final class MPayment extends X_C_Payment
order.setC_Payment_ID(getC_Payment_ID());
order.setDocAction(X_C_Order.DOCACTION_WaitComplete);
order.set_TrxName(get_TrxName());
// boolean ok =
order.processIt (X_C_Order.DOCACTION_WaitComplete);
// added AdempiereException by zuhri
if (!order.processIt (X_C_Order.DOCACTION_WaitComplete))
throw new AdempiereException("Failed when processing document - " + order.getProcessMsg());
// end added
m_processMsg = order.getProcessMsg();
order.saveEx(get_TrxName());
// Set Invoice
@ -1991,7 +1993,10 @@ public final class MPayment extends X_C_Payment
if (counterDT.getDocAction() != null)
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
// added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction()))
throw new AdempiereException("Failed when rocessing document - " + counter.getProcessMsg());
// end added
counter.saveEx(get_TrxName());
}
}
@ -2055,8 +2060,10 @@ public final class MPayment extends X_C_Payment
pa.saveEx();
}
}
// Should start WF
alloc.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg());
// end added
m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo();
return alloc.save(get_TrxName());
} // allocateIt
@ -2088,8 +2095,10 @@ public final class MPayment extends X_C_Payment
aLine.setDocInfo(getC_BPartner_ID(), 0, getC_Invoice_ID());
aLine.setC_Payment_ID(getC_Payment_ID());
aLine.saveEx(get_TrxName());
// Should start WF
alloc.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg());
// end added
alloc.saveEx(get_TrxName());
m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo();
@ -2183,8 +2192,12 @@ public final class MPayment extends X_C_Payment
}
else
{
alloc.processIt(DocAction.ACTION_Complete);
ok = alloc.save(get_TrxName());
// added Adempiere Exception by zuhri
if(alloc.processIt(DocAction.ACTION_Complete))
ok = alloc.save(get_TrxName());
else
throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg());
// end added by zuhri
m_processMsg = "@C_AllocationHdr_ID@: " + alloc.getDocumentNo();
}
return ok;
@ -2417,7 +2430,10 @@ public final class MPayment extends X_C_Payment
if (!aLine.save(get_TrxName()))
log.warning("Automatic allocation - reversal line not saved");
}
alloc.processIt(DocAction.ACTION_Complete);
// added AdempiereException by zuhri
if (!alloc.processIt(DocAction.ACTION_Complete))
throw new AdempiereException("Failed when processing document - " + alloc.getProcessMsg());
// end added
alloc.saveEx(get_TrxName());
//
StringBuffer info = new StringBuffer (reversal.getDocumentNo());

27
org.adempiere.base/src/org/compiere/model/MProcessPara.java
View File

@ -37,8 +37,7 @@ public class MProcessPara extends X_AD_Process_Para
/**
*
*/
private static final long serialVersionUID = -2387741816477468470L;
private static final long serialVersionUID = -6254678383726841920L;
/**
* Get MProcessPara from Cache
@ -268,4 +267,28 @@ public class MProcessPara extends X_AD_Process_Para
}
/**************************************************************************
* Before Save
* @param newRecord
* @return save
*/
protected boolean beforeSave (boolean newRecord)
{
if (isCentrallyMaintained() && getAD_Element_ID() == 0)
setIsCentrallyMaintained(false); // IDEMPIERE 109 - param without element can't be centrally maintained
// Sync Terminology
if ((newRecord || is_ValueChanged ("AD_Element_ID"))
&& getAD_Element_ID() != 0 && isCentrallyMaintained())
{
M_Element element = new M_Element (getCtx(), getAD_Element_ID (), get_TrxName());
setColumnName (element.getColumnName());
setName (element.getName());
setDescription (element.getDescription());
setHelp (element.getHelp());
}
return true;
} // beforeSave
} // MProcessPara

6
org.adempiere.base/src/org/compiere/model/MRMA.java
View File

@ -24,6 +24,7 @@ import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.process.DocAction;
import org.compiere.process.DocumentEngine;
import org.compiere.util.DB;
@ -497,7 +498,10 @@ public class MRMA extends X_M_RMA implements DocAction
if (counterDT.getDocAction() != null)
{
counter.setDocAction(counterDT.getDocAction());
counter.processIt(counterDT.getDocAction());
// added AdempiereException by zuhri
if (!counter.processIt(counterDT.getDocAction()))
throw new AdempiereException("Failed when processing document - " + counter.getProcessMsg());
// end added
counter.saveEx(get_TrxName());
}
}

4
org.adempiere.base/src/org/compiere/model/MRegion.java
View File

@ -40,7 +40,7 @@ import org.compiere.util.Env;
* @version $Id: MRegion.java,v 1.3 2006/07/30 00:58:36 jjanke Exp $
*/
public final class MRegion extends X_C_Region
implements Comparator, Serializable
implements Comparator, Serializable, SystemIDs
{
/**
*
@ -236,7 +236,7 @@ public final class MRegion extends X_C_Region
* Please make sure that the file is converted via the Java utility
* native2ascii - i.e. all seven bit code with /u0000 unicode stuff
*/
int C_Country_ID = 216; // Japan
int C_Country_ID = COUNTRY_JAPAN; // Japan
MCountry country = new MCountry(Env.getCtx(), C_Country_ID, null);
// Hokkaido
MRegion temp = new MRegion (country, "\u5317\u6d77\u9053");

4
org.adempiere.base/src/org/compiere/model/MRequest.java
View File

@ -38,7 +38,7 @@ import org.compiere.util.TimeUtil;
* @author Jorg Janke
* @version $Id: MRequest.java,v 1.2 2006/07/30 00:51:03 jjanke Exp $
*/
public class MRequest extends X_R_Request
public class MRequest extends X_R_Request implements SystemIDs
{
/**
*
@ -1212,7 +1212,7 @@ public class MRequest extends X_R_Request
if (X_AD_User.NOTIFICATIONTYPE_Notice.equals(NotificationType)
|| X_AD_User.NOTIFICATIONTYPE_EMailPlusNotice.equals(NotificationType))
{
int AD_Message_ID = 834;
int AD_Message_ID = MESSAGE_REQUESTUPDATE;
MNote note = new MNote(getCtx(), AD_Message_ID, AD_User_ID,
X_R_Request.Table_ID, getR_Request_ID(),
subject, message.toString(), get_TrxName());

8
org.adempiere.base/src/org/compiere/model/MRole.java
View File

@ -54,7 +54,7 @@ import org.compiere.util.Trace;
* @contributor KittiU - FR [ 3062553 ] - Duplicated action in DocAction list for Multiple Role Users
* @version $Id: MRole.java,v 1.5 2006/08/09 16:38:47 jjanke Exp $
*/
public final class MRole extends X_AD_Role
public final class MRole extends X_AD_Role implements SystemIDs
{
/**
*
@ -246,10 +246,10 @@ public final class MRole extends X_AD_Role
public static final boolean SQL_NOTQUALIFIED = false;
/** The AD_User_ID of the SuperUser */
public static final int SUPERUSER_USER_ID = 100;
public static final int SUPERUSER_USER_ID = USER_SUPERUSER;
/** The AD_User_ID of the System Administrator */
public static final int SYSTEM_USER_ID = 0;
public static final int SYSTEM_USER_ID = USER_SYSTEM;
private static final String ROLE_KEY = "org.compiere.model.DefaultRole";

4
org.adempiere.base/src/org/compiere/model/MSetup.java
View File

@ -46,7 +46,7 @@ import org.compiere.util.Trx;
* @author Carlos Ruiz - globalqss
* <li>Setup correctly IsSOTrx for return documents
*/
public final class MSetup
public final class MSetup implements SystemIDs
{
/**
* Constructor
@ -1058,7 +1058,7 @@ public final class MSetup
sqlCmd.append("(C_TaxCategory_ID,").append(m_stdColumns).append(",");
sqlCmd.append(" Name,IsDefault) VALUES (");
sqlCmd.append(C_TaxCategory_ID).append(",").append(m_stdValues).append(", ");
if (C_Country_ID == 100) // US
if (C_Country_ID == COUNTRY_US) // US
sqlCmd.append("'Sales Tax','Y')");
else
sqlCmd.append(defaultEntry).append("'Y')");

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

@ -50,8 +50,7 @@ public class MUser extends X_AD_User
/**
*
*/
private static final long serialVersionUID = 1399447378628744412L;
private static final long serialVersionUID = -5845477151929518375L;
/**
* Get active Users of BPartner
@ -804,7 +803,20 @@ public class MUser extends X_AD_User
setValue(super.getValue());
return true;
} // beforeSave
/**
* Is Menu Auto Expand - user preference
* Check if the user has a preference, otherwise use the value from current role
* @return boolean
*/
public boolean isMenuAutoExpand() {
boolean isMenuAutoExpand = false;
if (getIsMenuAutoExpand() != null)
isMenuAutoExpand = ISMENUAUTOEXPAND_Yes.equals(getIsMenuAutoExpand());
else
isMenuAutoExpand = MRole.getDefault().isMenuAutoExpand();
return isMenuAutoExpand;
}
/**
* Test

148
org.adempiere.base/src/org/compiere/model/SystemIDs.java Normal file
View File

@ -0,0 +1,148 @@
/******************************************************************************
* Product: Adempiere ERP & CRM Smart Business Solution *
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
* or via info@compiere.org or http://www.compiere.org/license.html *
*****************************************************************************/
package org.compiere.model;
import org.compiere.util.DisplayType;
/**
* List all hardcoded ID used in the code
* @author Carlos Ruiz, Nicolas Micoud, ...
*/
public interface SystemIDs
{
public final static int COLUMN_AD_WF_ACTIVITY_AD_USER_ID = 10443;
public final static int COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID = 4917;
public final static int COLUMN_C_PERIOD_AD_ORG_ID = 839;
public final static int COLUMN_C_INVOICE_C_BPARTNER_ID = 3499;
public final static int COLUMN_C_INVOICE_C_CURRENCY_ID = 3505;
public final static int COLUMN_C_INVOICELINE_M_PRODUCT_ID = 3840;
public final static int COLUMN_C_PAYMENT_V_TENDERTYPE = 8416;
public final static int COLUMN_C_PAYSELECTIONCHECK_C_PAYSELECTION_ID = 7670;
public final static int COLUMN_FACT_ACCT_C_ACCTSCHEMA_ID = 2513;
public final static int COLUMN_FACT_ACCT_M_PRODUCT_ID = 2527;
public final static int COLUMN_M_MOVEMENTLINE_M_ATTRIBUTESETINSTANCE_ID = 8851;
public final static int COLUMN_M_PRODUCT_M_ATTRIBUTESETINSTANCE_ID = 8418;
public final static int COLUMN_S_RESOURCE_S_RESOURCETYPE_ID = 6851;
public final static int COLUMN_S_RESOURCEASSIGNMENT_S_RESOURCE_ID = 6826;
public final static int COUNTRY_US = 100;
public final static int COUNTRY_JAPAN = 216;
public final static int ENTITYTYPE_ADEMPIERE = 20;
public final static int ENTITYTYPE_DICTIONARY = 10;
public final static int FORM_PAYMENT_PRINT_EXPORT = 106;
public final static int FORM_ARCHIVEVIEWER = 118;
public final static int MENU_NOTICE = 233;
public final static int MESSAGE_REQUESTUPDATE = 834;
public final static int MESSAGE_WORKFLOWRESULT = 753;
public final static int PRINTFORMAT_STATEMENTOFACCOUNT = 134;
public final static int PROCESS_AD_WORKFLOW_DOCVALUE = 305;
public final static int PROCESS_AD_CHANGELOG_UNDO = 306;
public final static int PROCESS_AD_CHANGELOG_REDO = 307;
public final static int PROCESS_AD_NATIVE_SEQUENCE_ENABLE = 53156;
public final static int PROCESS_C_INVOICE_GENERATE = 119;
public final static int PROCESS_C_INVOICE_GENERATE_MANUAL = 134;
public final static int PROCESS_C_INVOICE_GENERATERMA_MANUAL = 52002;
public final static int PROCESS_C_PAYSELECTION_CREATEPAYMENT = 155;
public final static int PROCESS_M_INOUT_GENERATE = 118;
public final static int PROCESS_M_INOUT_GENERATE_MANUAL = 199;
public final static int PROCESS_M_INOUT_GENERATERMA_MANUAL = 52001;
public final static int PROCESS_RPT_C_ORDER = 110;
public final static int PROCESS_RPT_C_PAYMENT = 313;
public final static int PROCESS_RPT_M_INOUT = 117;
public final static int PROCESS_RPT_C_INVOICE = 116;
public final static int PROCESS_RPT_C_PROJECT = 217;
public final static int PROCESS_RPT_C_RFQRESPONSE = 276;
public final static int PROCESS_RPT_C_DUNNING = 159;
public final static int PROCESS_RPT_FINREPORT = 202;
public final static int PROCESS_RPT_FINSTATEMENT = 204;
public final static int REFERENCE_DATATYPE_ACCOUNT = 25;
public final static int REFERENCE_DATATYPE_AMOUNT = 12;
public final static int REFERENCE_DATATYPE_ASSIGNMENT = 33;
public final static int REFERENCE_DATATYPE_BINARY = 23;
public final static int REFERENCE_DATATYPE_BUTTON = 28;
public final static int REFERENCE_DATATYPE_COLOR = 27;
public final static int REFERENCE_DATATYPE_COSTPRICE = 37;
public final static int REFERENCE_DATATYPE_DATE = 15;
public final static int REFERENCE_DATATYPE_DATETIME = 16;
public final static int REFERENCE_DATATYPE_FILENAME = 39;
public final static int REFERENCE_DATATYPE_FILEPATH = 38;
public final static int REFERENCE_DATATYPE_ID = 13;
public final static int REFERENCE_DATATYPE_IMAGE = 32;
public final static int REFERENCE_DATATYPE_INTEGER = 11;
public final static int REFERENCE_DATATYPE_LIST = 17;
public final static int REFERENCE_DATATYPE_LOCATION = 21;
public final static int REFERENCE_DATATYPE_LOCATOR = 31;
public final static int REFERENCE_DATATYPE_MEMO = 34;
public final static int REFERENCE_DATATYPE_NUMBER = 22;
public final static int REFERENCE_DATATYPE_PRINTNAME = 42;
public final static int REFERENCE_DATATYPE_PRODUCTATTRIBUTE = 35;
public final static int REFERENCE_DATATYPE_QUANTITY = 29;
public final static int REFERENCE_DATATYPE_ROWID = 26;
public final static int REFERENCE_DATATYPE_SEARCH = 30;
public final static int REFERENCE_DATATYPE_STRING = 10;
public final static int REFERENCE_DATATYPE_TABLE = 18;
public final static int REFERENCE_DATATYPE_TABLEDIR = 19;
public final static int REFERENCE_DATATYPE_TEXT = 14;
public final static int REFERENCE_DATATYPE_TEXTLONG = 36;
public final static int REFERENCE_DATATYPE_TIME = 24;
public final static int REFERENCE_DATATYPE_URL = 40;
public final static int REFERENCE_DATATYPE_YES_NO = 20;
public static final int REFERENCE_AD_USER = 110;
public final static int REFERENCE_DOCUMENTACTION = 135;
public final static int REFERENCE_PAYMENTRULE = 195;
public final static int REFERENCE_POSTING_TYPE = 125;
public final static int REFERENCE_YESNO = 319;
public final static int TABLE_AD_TABLE = 100;
public final static int TABLE_AD_WF_PROCESS = 645;
public final static int TABLE_AD_WF_ACTIVITY = 644;
public final static int TABLE_I_PRODUCT = 532;
public final static int TABLE_I_BPARTNER = 533;
public final static int TABLE_I_ELEMENTVALUE = 534;
public final static int TABLE_I_REPORTLINE = 535;
public final static int TABLE_T_REPORT = 544;
public final static int TREE_MENUPRIMARY = 10;
public final static int USER_SUPERUSER = 100;
public final static int USER_SYSTEM = 0;
public final static int WINDOW_ACCOUNTCOMBINATION = 153;
public static final int WINDOW_CUSTOMERRETURN = 53097;
public final static int WINDOW_INVENTORYMOVE = 170;
public final static int WINDOW_LOT = 257;
public final static int WINDOW_MATERIALRECEIPT = 184;
public final static int WINDOW_MATERIALTRANSACTIONS_INDIRECTUSER = 223;
public final static int WINDOW_MY_REQUESTS = 237;
public final static int WINDOW_PHYSICALINVENTORY = 168;
public final static int WINDOW_PRINTFORMAT = 240;
public final static int WINDOW_PRODUCTION = 191;
public final static int WINDOW_REQUESTS_ALL = 232;
public static final int WINDOW_RETURNTOVENDOR = 53098;
public final static int WINDOW_SHIPMENT_CUSTOMER = 169;
public final static int WINDOW_WAREHOUSE_LOCATOR = 139;
public final static int WINDOW_WINDOW_TAB_FIELD = 102;
}

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

@ -25,14 +25,14 @@ import org.compiere.util.KeyNamePair;
/** Generated Model for AD_Role
* @author Adempiere (generated)
* @version Release 3.6.0LTS - $Id$ */
* @version 360LTS.015 - $Id$ */
public class X_AD_Role extends PO implements I_AD_Role, I_Persistent
{
/**
*
*/
private static final long serialVersionUID = 20110325L;
private static final long serialVersionUID = 20120412L;
/** Standard Constructor */
public X_AD_Role (Properties ctx, int AD_Role_ID, String trxName)
@ -81,6 +81,8 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent
setIsDiscountAllowedOnTotal (false);
setIsDiscountUptoLimitPrice (false);
setIsManual (false);
setIsMenuAutoExpand (false);
// N
setIsPersonalAccess (false);
// N
setIsPersonalLock (false);
@ -820,6 +822,30 @@ public class X_AD_Role extends PO implements I_AD_Role, I_Persistent
return false;
}
/** Set Auto expand menu.
@param IsMenuAutoExpand
If ticked, the menu is automatically expanded
*/
public void setIsMenuAutoExpand (boolean IsMenuAutoExpand)
{
set_Value (COLUMNNAME_IsMenuAutoExpand, Boolean.valueOf(IsMenuAutoExpand));
}
/** Get Auto expand menu.
@return If ticked, the menu is automatically expanded
*/
public boolean isMenuAutoExpand ()
{
Object oo = get_Value(COLUMNNAME_IsMenuAutoExpand);
if (oo != null)
{
if (oo instanceof Boolean)
return ((Boolean)oo).booleanValue();
return "Y".equals(oo);
}
return false;
}
/** Set Personal Access.
@param IsPersonalAccess
Allow access to all personal records

28
org.adempiere.base/src/org/compiere/model/X_AD_User.java
View File

@ -24,14 +24,14 @@ import org.compiere.util.KeyNamePair;
/** Generated Model for AD_User
* @author Adempiere (generated)
* @version Release 3.6.0LTS - $Id$ */
* @version 360LTS.015 - $Id$ */
public class X_AD_User extends PO implements I_AD_User, I_Persistent
{
/**
*
*/
private static final long serialVersionUID = 20100614L;
private static final long serialVersionUID = 20120418L;
/** Standard Constructor */
public X_AD_User (Properties ctx, int AD_User_ID, String trxName)
@ -465,6 +465,30 @@ public class X_AD_User extends PO implements I_AD_User, I_Persistent
return false;
}
/** IsMenuAutoExpand AD_Reference_ID=319 */
public static final int ISMENUAUTOEXPAND_AD_Reference_ID=319;
/** Yes = Y */
public static final String ISMENUAUTOEXPAND_Yes = "Y";
/** No = N */
public static final String ISMENUAUTOEXPAND_No = "N";
/** Set Auto expand menu.
@param IsMenuAutoExpand
If ticked, the menu is automatically expanded
*/
public void setIsMenuAutoExpand (String IsMenuAutoExpand)
{
set_Value (COLUMNNAME_IsMenuAutoExpand, IsMenuAutoExpand);
}
/** Get Auto expand menu.
@return If ticked, the menu is automatically expanded
*/
public String getIsMenuAutoExpand ()
{
return (String)get_Value(COLUMNNAME_IsMenuAutoExpand);
}
/** Set Last Contact.
@param LastContact
Date this individual was last contacted

7
org.adempiere.base/src/org/compiere/print/ReportEngine.java
View File

@ -71,6 +71,7 @@ import org.compiere.model.MProject;
import org.compiere.model.MQuery;
import org.compiere.model.MRfQResponse;
import org.compiere.model.PrintInfo;
import org.compiere.model.SystemIDs;
import org.compiere.print.layout.LayoutEngine;
import org.compiere.process.ProcessInfo;
import org.compiere.util.CLogger;
@ -81,7 +82,7 @@ import org.compiere.util.Ini;
import org.compiere.util.Language;
import org.compiere.util.Util;
import org.eevolution.model.MDDOrder;
import org.eevolution.model.X_PP_Order; // to be changed by MPPOrder
import org.eevolution.model.X_PP_Order;
/**
* Report Engine.
@ -107,7 +108,7 @@ import org.eevolution.model.X_PP_Order; // to be changed by MPPOrder
*
* FR 2872010 - Dunning Run for a complete Dunning (not just level) - Developer: Carlos Ruiz - globalqss - Sponsor: Metas
*/
public class ReportEngine implements PrintServiceAttributeListener
public class ReportEngine implements PrintServiceAttributeListener, SystemIDs
{
/**
* Constructor
@ -1644,7 +1645,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount)
{
org.compiere.Adempiere.startupEnvironment(true);
//
int AD_Table_ID = 100;
int AD_Table_ID = TABLE_AD_TABLE;
MQuery q = new MQuery("AD_Table");
q.addRestriction("AD_Table_ID", "<", 108);
//

2
org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java
View File

@ -1697,7 +1697,7 @@ public class LayoutEngine implements Pageable, Printable, Doc
else
value = o.toString();
data[row][col] = ImageElement.get (value);
data[row][col] = ImageElement.get (pde, value);
}
}
else if (item.isImageIsAttached())

3
org.adempiere.base/src/org/compiere/process/DocAction.java
View File

@ -21,6 +21,7 @@ import java.math.BigDecimal;
import java.util.Properties;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
/**
@ -88,7 +89,7 @@ public interface DocAction
public static final String STATUS_WaitingConfirmation = "WC";
/** DocAction Ref_List values **/
public static final int AD_REFERENCE_ID = 135;
public static final int AD_REFERENCE_ID = SystemIDs.REFERENCE_DOCUMENTACTION;
/**
* Set Doc Status

5
org.adempiere.base/src/org/compiere/report/FinReport.java
View File

@ -25,6 +25,7 @@ import java.util.logging.Level;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MReportCube;
import org.compiere.model.SystemIDs;
import org.compiere.print.MPrintFormat;
import org.compiere.print.MPrintFormatItem;
import org.compiere.process.ProcessInfoParameter;
@ -45,7 +46,7 @@ import org.compiere.util.TimeUtil;
*
* @version $Id: FinReport.java,v 1.2 2006/07/30 00:51:05 jjanke Exp $
*/
public class FinReport extends SvrProcess
public class FinReport extends SvrProcess implements SystemIDs
{
/** Period Parameter */
private int p_C_Period_ID = 0;
@ -1177,7 +1178,7 @@ public class FinReport extends SvrProcess
// Create New
if (createNew)
{
int AD_Table_ID = 544; // T_Report
int AD_Table_ID = TABLE_T_REPORT; // T_Report
pf = MPrintFormat.createFromTable(Env.getCtx(), AD_Table_ID);
AD_PrintFormat_ID = pf.getAD_PrintFormat_ID();
m_report.setAD_PrintFormat_ID(AD_PrintFormat_ID);

5
org.adempiere.base/src/org/compiere/report/FinStatement.java
View File

@ -27,6 +27,7 @@ import java.util.logging.Level;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MElementValue;
import org.compiere.model.MPeriod;
import org.compiere.model.SystemIDs;
import org.compiere.print.MPrintFormat;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess;
@ -52,7 +53,7 @@ import org.compiere.util.Msg;
* <li>FR [2857076] User Element 1 and 2 completion - https://sourceforge.net/tracker/?func=detail&aid=2857076&group_id=176962&atid=879335
*
*/
public class FinStatement extends SvrProcess
public class FinStatement extends SvrProcess implements SystemIDs
{
/** AcctSchame Parameter */
private int p_C_AcctSchema_ID = 0;
@ -273,7 +274,7 @@ public class FinStatement extends SvrProcess
createBalanceLine();
createDetailLines();
int AD_PrintFormat_ID = 134;
int AD_PrintFormat_ID = PRINTFORMAT_STATEMENTOFACCOUNT;
if (Ini.isClient())
getProcessInfo().setTransientObject (MPrintFormat.get (getCtx(), AD_PrintFormat_ID, false));
else

1164
org.adempiere.base/src/org/compiere/util/DisplayType.java
View File

File diff suppressed because it is too large Load Diff

5
org.adempiere.base/src/org/compiere/wf/DocWorkflowManager.java
View File

@ -22,6 +22,7 @@ import java.util.logging.Level;
import org.compiere.model.DocWorkflowMgr;
import org.compiere.model.PO;
import org.compiere.model.SystemIDs;
import org.compiere.process.ProcessInfo;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -35,7 +36,7 @@ import org.compiere.util.Evaluator;
* @author Jorg Janke
* @version $Id: DocWorkflowManager.java,v 1.2 2006/07/30 00:51:05 jjanke Exp $
*/
public class DocWorkflowManager implements DocWorkflowMgr
public class DocWorkflowManager implements DocWorkflowMgr, SystemIDs
{
/**
* Get Document Workflow Manager
@ -119,7 +120,7 @@ public class DocWorkflowManager implements DocWorkflowMgr
// Start Workflow
log.fine(logic);
int AD_Process_ID = 305; // HARDCODED
int AD_Process_ID = PROCESS_AD_WORKFLOW_DOCVALUE; // HARDCODED
ProcessInfo pi = new ProcessInfo (wf.getName(), AD_Process_ID,
AD_Table_ID, document.get_ID());
pi.setAD_User_ID (Env.getAD_User_ID(document.getCtx()));

5
org.adempiere.base/src/org/compiere/wf/MWFActivity.java
View File

@ -51,6 +51,7 @@ import org.compiere.model.MUser;
import org.compiere.model.MUserRoles;
import org.compiere.model.PO;
import org.compiere.model.Query;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_WF_Activity;
import org.compiere.print.ReportEngine;
import org.compiere.process.DocAction;
@ -72,7 +73,7 @@ import org.compiere.util.Util;
* @author Jorg Janke
* @version $Id: MWFActivity.java,v 1.4 2006/07/30 00:51:05 jjanke Exp $
*/
public class MWFActivity extends X_AD_WF_Activity implements Runnable
public class MWFActivity extends X_AD_WF_Activity implements Runnable, SystemIDs
{
/**
*
@ -1048,7 +1049,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
throw new IllegalStateException("Cannot create Report AD_Process_ID=" + m_node.getAD_Process_ID());
File report = re.getPDF();
// Notice
int AD_Message_ID = 753; // HARDCODED WorkflowResult
int AD_Message_ID = MESSAGE_WORKFLOWRESULT; // HARDCODED WorkflowResult
MNote note = new MNote(getCtx(), AD_Message_ID, getAD_User_ID(), trx.getTrxName());
note.setTextMsg(m_node.getName(true));
note.setDescription(m_node.getDescription(true));

10
org.adempiere.base/src/org/eevolution/process/BankTransfer.java
View File

@ -159,7 +159,10 @@ public class BankTransfer extends SvrProcess
paymentBankFrom.setC_DocType_ID(false);
paymentBankFrom.setC_Charge_ID(p_C_Charge_ID);
paymentBankFrom.saveEx();
paymentBankFrom.processIt(MPayment.DOCACTION_Complete);
if(!paymentBankFrom.processIt(MPayment.DOCACTION_Complete)) {
log.warning("Payment Process Failed: " + paymentBankFrom + " - " + paymentBankFrom.getProcessMsg());
throw new IllegalStateException("Payment Process Failed: " + paymentBankFrom + " - " + paymentBankFrom.getProcessMsg());
}
paymentBankFrom.saveEx();
MPayment paymentBankTo = new MPayment(getCtx(), 0 , get_TrxName());
@ -178,7 +181,10 @@ public class BankTransfer extends SvrProcess
paymentBankTo.setC_DocType_ID(true);
paymentBankTo.setC_Charge_ID(p_C_Charge_ID);
paymentBankTo.saveEx();
paymentBankTo.processIt(MPayment.DOCACTION_Complete);
if (!paymentBankTo.processIt(MPayment.DOCACTION_Complete)) {
log.warning("Payment Process Failed: " + paymentBankTo + " - " + paymentBankTo.getProcessMsg());
throw new IllegalStateException("Payment Process Failed: " + paymentBankTo + " - " + paymentBankTo.getProcessMsg());
}
paymentBankTo.saveEx();
m_created++;
return;

5
org.adempiere.base/src/org/eevolution/process/EnableNativeSequence.java
View File

@ -29,6 +29,7 @@ import org.compiere.model.MSequence;
import org.compiere.model.MSysConfig;
import org.compiere.model.MTable;
import org.compiere.model.Query;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_Table;
import org.compiere.process.ProcessInfo;
import org.compiere.process.SvrProcess;
@ -42,7 +43,7 @@ import org.compiere.util.Env;
* @author Victor Perez, e-Evolution, S.C.
* @author Teo Sarca, teo.sarca@gmail.com
*/
public class EnableNativeSequence extends SvrProcess
public class EnableNativeSequence extends SvrProcess implements SystemIDs
{
/**
@ -128,7 +129,7 @@ public class EnableNativeSequence extends SvrProcess
CLogMgt.setLevel(Level.INFO);
Properties ctx = Env.getCtx();
int AD_Process_ID = 53156; // HARDCODED
int AD_Process_ID = PROCESS_AD_NATIVE_SEQUENCE_ENABLE; // HARDCODED
MPInstance pinstance = new MPInstance(ctx, AD_Process_ID, -1);
pinstance.saveEx();

7
org.adempiere.pipo.legacy/src/org/adempiere/pipo/AbstractElementHandler.java
View File

@ -28,6 +28,7 @@ import javax.xml.transform.sax.TransformerHandler;
import org.compiere.model.PO;
import org.compiere.model.POInfo;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_Package_Imp_Detail;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -36,7 +37,7 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
public abstract class AbstractElementHandler implements ElementHandler {
public abstract class AbstractElementHandler implements ElementHandler, SystemIDs {
protected CLogger log = CLogger.getCLogger("PackIn");
@ -203,10 +204,10 @@ public abstract class AbstractElementHandler implements ElementHandler {
sqlD = new StringBuffer("SELECT MAX(AD_PACKAGE_IMP_DETAIL_ID) FROM AD_PACKAGE_IMP_DETAIL");
int idDetail = DB.getSQLValue(getTrxName(ctx),sqlD.toString())+1;
if (referenceID == 10 || referenceID == 14 || referenceID == 34 || referenceID == 17)
if (referenceID == REFERENCE_DATATYPE_STRING || referenceID == REFERENCE_DATATYPE_TEXT || referenceID == REFERENCE_DATATYPE_MEMO || referenceID == REFERENCE_DATATYPE_LIST)
if (from != null && from.get_Value(i)!= null)
colValue = from.get_Value(i).toString().replaceAll("'","''");
else if (referenceID == 20|| referenceID == 28)
else if (referenceID == REFERENCE_DATATYPE_YES_NO|| referenceID == REFERENCE_DATATYPE_BUTTON)
if (from != null && from.get_Value(i)!= null)
colValue = from.get_Value(i).toString().replaceAll("'","''");
else

45
org.adempiere.pipo.legacy/src/org/adempiere/pipo/PackRoll.java
View File

@ -25,6 +25,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.logging.Level;
import org.compiere.model.SystemIDs;
import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess;
import org.compiere.util.DB;
@ -36,7 +37,7 @@ import org.compiere.util.Env;
* @author Robert Klein
*
*/
public class PackRoll extends SvrProcess {
public class PackRoll extends SvrProcess implements SystemIDs {
/** Package from Record */
private int m_AD_Package_Imp_ID = 0;
private String m_Processing = null;
@ -258,14 +259,14 @@ public class PackRoll extends SvrProcess {
// Update columns that are Strings adjusting
// for single quotes
if (v_AD_Reference_ID == 10
|| v_AD_Reference_ID == 14
|| v_AD_Reference_ID == 34
|| v_AD_Reference_ID == 17
|| v_AD_Reference_ID == REFERENCE_DATATYPE_TEXT
|| v_AD_Reference_ID == REFERENCE_DATATYPE_MEMO
|| v_AD_Reference_ID == REFERENCE_DATATYPE_LIST
// Carlos Ruiz globalqss, special
// treatment for EntityType
// it's a Table reference but must
// be treated as String
|| (v_AD_Reference_ID == 18 && columnName
|| (v_AD_Reference_ID == REFERENCE_DATATYPE_TABLE && columnName
.equalsIgnoreCase("EntityType")))
if (rs2.getObject("ColValue")
.toString().equals("null")) {
@ -285,8 +286,8 @@ public class PackRoll extends SvrProcess {
+ " = " + recordID);
}
// Update true/false columns
else if (v_AD_Reference_ID == 20
|| v_AD_Reference_ID == 28) {
else if (v_AD_Reference_ID == REFERENCE_DATATYPE_YES_NO
|| v_AD_Reference_ID == REFERENCE_DATATYPE_BUTTON) {
sqlC = new StringBuffer("UPDATE "
+ tableName
+ " SET "
@ -301,15 +302,15 @@ public class PackRoll extends SvrProcess {
}
// Update columns that are Strings adjusting
// for single quotes
else if (v_AD_Reference_ID == 13
|| v_AD_Reference_ID == 18
|| v_AD_Reference_ID == 19
|| v_AD_Reference_ID == 21
|| v_AD_Reference_ID == 25
|| v_AD_Reference_ID == 27
|| v_AD_Reference_ID == 30
|| v_AD_Reference_ID == 31
|| v_AD_Reference_ID == 35)
else if (v_AD_Reference_ID == REFERENCE_DATATYPE_ID
|| v_AD_Reference_ID == REFERENCE_DATATYPE_TABLE
|| v_AD_Reference_ID == REFERENCE_DATATYPE_TABLEDIR
|| v_AD_Reference_ID == REFERENCE_DATATYPE_LOCATION
|| v_AD_Reference_ID == REFERENCE_DATATYPE_ACCOUNT
|| v_AD_Reference_ID == REFERENCE_DATATYPE_COLOR
|| v_AD_Reference_ID == REFERENCE_DATATYPE_SEARCH
|| v_AD_Reference_ID == REFERENCE_DATATYPE_LOCATOR
|| v_AD_Reference_ID == REFERENCE_DATATYPE_PRODUCTATTRIBUTE)
sqlC = new StringBuffer("UPDATE "
+ tableName
+ " SET "
@ -321,10 +322,10 @@ public class PackRoll extends SvrProcess {
+ " WHERE " + columnIDName
+ " = " + recordID);
// Update columns that are numbers
else if (v_AD_Reference_ID == 11
|| v_AD_Reference_ID == 12
|| v_AD_Reference_ID == 22
|| v_AD_Reference_ID == 29)
else if (v_AD_Reference_ID == REFERENCE_DATATYPE_INTEGER
|| v_AD_Reference_ID == REFERENCE_DATATYPE_AMOUNT
|| v_AD_Reference_ID == REFERENCE_DATATYPE_NUMBER
|| v_AD_Reference_ID == REFERENCE_DATATYPE_QUANTITY)
sqlC = new StringBuffer("UPDATE "
+ tableName
+ " SET "
@ -336,8 +337,8 @@ public class PackRoll extends SvrProcess {
+ " WHERE " + columnIDName
+ " = " + recordID);
// Update columns that are dates
else if (v_AD_Reference_ID == 15
|| v_AD_Reference_ID == 16)
else if (v_AD_Reference_ID == REFERENCE_DATATYPE_DATE
|| v_AD_Reference_ID == REFERENCE_DATATYPE_DATETIME)
// TODO Develop portable code to update
// date columns
;// ignore

5
org.adempiere.pipo.legacy/src/org/adempiere/pipo/handler/MenuElementHandler.java
View File

@ -27,6 +27,7 @@ import javax.xml.transform.sax.TransformerHandler;
import org.adempiere.pipo.AbstractElementHandler;
import org.adempiere.pipo.Element;
import org.adempiere.pipo.PackOut;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_Menu;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -34,7 +35,7 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
public class MenuElementHandler extends AbstractElementHandler {
public class MenuElementHandler extends AbstractElementHandler implements SystemIDs {
public void startElement(Properties ctx, Element element)
throws SAXException {
@ -197,7 +198,7 @@ public class MenuElementHandler extends AbstractElementHandler {
int idBackup = DB.getNextID(Env
.getAD_Client_ID(ctx), "AD_Package_Imp_Backup",
getTrxName(ctx));
if (referenceID == 20 || referenceID == 28)
if (referenceID == REFERENCE_DATATYPE_YES_NO || referenceID == REFERENCE_DATATYPE_BUTTON)
if (rs1.getObject(q).equals("Y"))
colValue = "true";
else

27
org.adempiere.report.jasper.swing/src/org/compiere/report/JasperReportViewer.java
View File

@ -16,10 +16,10 @@ import javax.swing.JSeparator;
import javax.swing.SwingConstants;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JRExporterParameter;
import net.sf.jasperreports.engine.JasperExportManager;
import net.sf.jasperreports.engine.JasperPrint;
import net.sf.jasperreports.engine.export.JRXlsExporter;
import net.sf.jasperreports.engine.export.JExcelApiExporter;
import net.sf.jasperreports.engine.export.JExcelApiExporterParameter;
import net.sf.jasperreports.view.JRViewer;
import org.compiere.apps.EMailDialog;
@ -29,9 +29,11 @@ import org.compiere.util.Env;
import org.compiere.util.Msg;
public class JasperReportViewer extends JRViewer {
/**
*
*/
private static final long serialVersionUID = -8622715538000831737L;
private static final long serialVersionUID = -7988455595896562947L;
/** Logger */
private static CLogger log = CLogger.getCLogger(JasperReportViewer.class);
@ -103,9 +105,20 @@ class ExportListener implements ActionListener {
} else if (viewer.getFormat().equals("HTML")) {
JasperExportManager.exportReportToHtmlFile( viewer.getJasperPrint(), file.getAbsolutePath());
} else if (viewer.getFormat().equals("XLS")) {
JRXlsExporter exporter = new net.sf.jasperreports.engine.export.JRXlsExporter();
exporter.setParameter(JRExporterParameter.OUTPUT_FILE_NAME, file.getAbsolutePath());
exporter.setParameter(JRExporterParameter.JASPER_PRINT, viewer.getJasperPrint());
//JRXlsExporter exporter = new net.sf.jasperreports.engine.export.JRXlsExporter();
//exporter.setParameter(JRExporterParameter.OUTPUT_FILE_NAME, file.getAbsolutePath());
//exporter.setParameter(JRExporterParameter.JASPER_PRINT, viewer.getJasperPrint());
JExcelApiExporter exporter = new JExcelApiExporter();
exporter.setParameter(JExcelApiExporterParameter.OUTPUT_FILE_NAME, file.getAbsolutePath());
exporter.setParameter(JExcelApiExporterParameter.JASPER_PRINT, viewer.getJasperPrint());
exporter.setParameter(JExcelApiExporterParameter.IS_ONE_PAGE_PER_SHEET, Boolean.FALSE);
exporter.setParameter(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_ROWS, Boolean.TRUE);
exporter.setParameter(JExcelApiExporterParameter.IS_REMOVE_EMPTY_SPACE_BETWEEN_COLUMNS, Boolean.TRUE);
exporter.setParameter(JExcelApiExporterParameter.IS_DETECT_CELL_TYPE , Boolean.TRUE);
exporter.setParameter(JExcelApiExporterParameter.IS_IGNORE_CELL_BACKGROUND, Boolean.TRUE);
exporter.setParameter(JExcelApiExporterParameter.IS_IGNORE_GRAPHICS, Boolean.TRUE);
exporter.setParameter(JExcelApiExporterParameter.IS_COLLAPSE_ROW_SPAN, Boolean.TRUE);
exporter.setParameter(JExcelApiExporterParameter.IS_WHITE_PAGE_BACKGROUND, Boolean.FALSE);
exporter.exportReport();
}
} catch (JRException e) {

931
org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java
View File

@ -3,19 +3,19 @@
* Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved. *
* This program is free software; you can redistribute it and/or modify it *
* under the terms version 2 of the GNU General Public License as published *
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
* or via info@compiere.org or http://www.compiere.org/license.html *
*****************************************************************************/
package org.compiere.acct;
* by the Free Software Foundation. This program is distributed in the hope *
* that it will be useful, but WITHOUT ANY WARRANTY; without even the implied *
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* See the GNU General Public License for more details. *
* You should have received a copy of the GNU General Public License along *
* with this program; if not, write to the Free Software Foundation, Inc., *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
* For the text or an alternative of this public license, you may reach us *
* ComPiere, Inc., 2620 Augustine Dr. #245, Santa Clara, CA 95054, USA *
* or via info@compiere.org or http://www.compiere.org/license.html *
*****************************************************************************/
package org.compiere.acct;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -29,6 +29,7 @@ import java.util.logging.Level;
import javax.swing.JComboBox;
import org.compiere.model.SystemIDs;
import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MFactAcct;
@ -44,439 +45,439 @@ import org.compiere.util.KeyNamePair;
import org.compiere.util.Language;
import org.compiere.util.Msg;
import org.compiere.util.ValueNamePair;
/**
* Account Viewer State - maintains State information for the Account Viewer
*
* @author Jorg Janke
/**
* Account Viewer State - maintains State information for the Account Viewer
*
* @author Jorg Janke
* @version $Id: AcctViewerData.java,v 1.3 2006/08/10 01:00:27 jjanke Exp $
*
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1748449 ] Info Account - Posting Type is not translated
* <li>BF [ 1778373 ] AcctViewer: data is not sorted proper
*/
class AcctViewerData
{
/**
* Constructor
* @param ctx context
* @param windowNo window no
* @param ad_Client_ID client
* @param ad_Table_ID table
*/
public AcctViewerData (Properties ctx, int windowNo, int ad_Client_ID, int ad_Table_ID)
{
WindowNo = windowNo;
AD_Client_ID = ad_Client_ID;
if (AD_Client_ID == 0)
AD_Client_ID = Env.getContextAsInt(Env.getCtx(), WindowNo, "AD_Client_ID");
if (AD_Client_ID == 0)
AD_Client_ID = Env.getContextAsInt(Env.getCtx(), "AD_Client_ID");
AD_Table_ID = ad_Table_ID;
//
ASchemas = MAcctSchema.getClientAcctSchema(ctx, AD_Client_ID);
ASchema = ASchemas[0];
} // AcctViewerData
/** Window */
public int WindowNo;
/** Client */
public int AD_Client_ID;
/** All Acct Schema */
public MAcctSchema[] ASchemas = null;
/** This Acct Schema */
public MAcctSchema ASchema = null;
// Selection Info
/** Document Query */
public boolean documentQuery = false;
/** Acct Schema */
public int C_AcctSchema_ID = 0;
/** Posting Type */
public String PostingType = "";
/** Organization */
public int AD_Org_ID = 0;
/** Date From */
public Timestamp DateFrom = null;
/** Date To */
public Timestamp DateTo = null;
// Document Table Selection Info
/** Table ID */
public int AD_Table_ID;
/** Record */
public int Record_ID;
/** Containing Column and Query */
public HashMap<String,String> whereInfo = new HashMap<String,String>();
/** Containing TableName and AD_Table_ID */
public HashMap<String,Integer> tableInfo = new HashMap<String,Integer>();
// Display Info
/** Display Qty */
boolean displayQty = false;
/** Display Source Currency */
boolean displaySourceAmt = false;
/** Display Document info */
boolean displayDocumentInfo = false;
//
String sortBy1 = "";
String sortBy2 = "";
String sortBy3 = "";
String sortBy4 = "";
//
boolean group1 = false;
boolean group2 = false;
boolean group3 = false;
boolean group4 = false;
/** Leasing Columns */
private int m_leadingColumns = 0;
/** UserElement1 Reference */
private String m_ref1 = null;
/** UserElement2 Reference */
private String m_ref2 = null;
/** Logger */
private static CLogger log = CLogger.getCLogger(AcctViewerData.class);
/**
* Dispose
*/
public void dispose()
{
ASchemas = null;
ASchema = null;
//
whereInfo.clear();
whereInfo = null;
//
Env.clearWinContext(WindowNo);
} // dispose
/**************************************************************************
* Fill Accounting Schema
* @param cb JComboBox to be filled
*/
protected void fillAcctSchema (JComboBox cb)
{
for (int i = 0; i < ASchemas.length; i++)
cb.addItem(new KeyNamePair(ASchemas[i].getC_AcctSchema_ID(),
ASchemas[i].getName()));
} // fillAcctSchema
/**
* Fill Posting Type
* @param cb JComboBox to be filled
*/
protected void fillPostingType (JComboBox cb)
{
int AD_Reference_ID = 125;
ValueNamePair[] pt = MRefList.getList(Env.getCtx(), AD_Reference_ID, true);
for (int i = 0; i < pt.length; i++)
cb.addItem(pt[i]);
} // fillPostingType
/**
* Fill Table with
* ValueNamePair (TableName, translatedKeyColumnName)
* and tableInfo with (TableName, AD_Table_ID)
* and select the entry for AD_Table_ID
*
* @param cb JComboBox to be filled
*/
protected void fillTable (JComboBox cb)
{
ValueNamePair select = null;
//
String sql = "SELECT AD_Table_ID, TableName FROM AD_Table t "
+ "WHERE EXISTS (SELECT * FROM AD_Column c"
+ " WHERE t.AD_Table_ID=c.AD_Table_ID AND c.ColumnName='Posted')"
+ " AND IsView='N'";
try
{
PreparedStatement pstmt = DB.prepareStatement(sql, null);
ResultSet rs = pstmt.executeQuery();
while (rs.next())
{
int id = rs.getInt(1);
String tableName = rs.getString(2);
String name = Msg.translate(Env.getCtx(), tableName+"_ID");
//
ValueNamePair pp = new ValueNamePair(tableName, name);
cb.addItem(pp);
tableInfo.put (tableName, new Integer(id));
if (id == AD_Table_ID)
select = pp;
}
rs.close();
pstmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
if (select != null)
cb.setSelectedItem(select);
} // fillTable
/**
* Fill Org
*
* @param cb JComboBox to be filled
*/
protected void fillOrg (JComboBox cb)
{
KeyNamePair pp = new KeyNamePair(0, "");
cb.addItem(pp);
String sql = "SELECT AD_Org_ID, Name FROM AD_Org WHERE AD_Client_ID=? ORDER BY Value";
try
{
PreparedStatement pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, AD_Client_ID);
ResultSet rs = pstmt.executeQuery();
while (rs.next())
cb.addItem(new KeyNamePair(rs.getInt(1), rs.getString(2)));
rs.close();
pstmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
} // fillOrg
/**
* Get Button Text
*
* @param tableName table
* @param columnName column
* @param selectSQL sql
* @return Text on button
*/
protected String getButtonText (String tableName, String columnName, String selectSQL)
{
// SELECT (<embedded>) FROM tableName avd WHERE avd.<selectSQL>
StringBuffer sql = new StringBuffer ("SELECT (");
Language language = Env.getLanguage(Env.getCtx());
sql.append(MLookupFactory.getLookup_TableDirEmbed(language, columnName, "avd"))
.append(") FROM ").append(tableName).append(" avd WHERE avd.").append(selectSQL);
String retValue = "<" + selectSQL + ">";
try
{
Statement stmt = DB.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next())
retValue = rs.getString(1);
rs.close();
stmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql.toString(), e);
}
return retValue;
} // getButtonText
/**************************************************************************
/**
* Create Query and submit
* @return Report Model
*/
protected RModel query()
{
// Set Where Clause
StringBuffer whereClause = new StringBuffer();
// Add Organization
if (C_AcctSchema_ID != 0)
whereClause.append(RModel.TABLE_ALIAS)
.append(".C_AcctSchema_ID=").append(C_AcctSchema_ID);
// Posting Type Selected
if (PostingType != null && PostingType.length() > 0)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS)
.append(".PostingType='").append(PostingType).append("'");
}
//
if (documentQuery)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS).append(".AD_Table_ID=").append(AD_Table_ID)
.append(" AND ").append(RModel.TABLE_ALIAS).append(".Record_ID=").append(Record_ID);
}
else
{
// get values (Queries)
Iterator<String> it = whereInfo.values().iterator();
while (it.hasNext())
{
String where = (String)it.next();
if (where != null && where.length() > 0) // add only if not empty
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS).append(".").append(where);
}
}
if (DateFrom != null || DateTo != null)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
if (DateFrom != null && DateTo != null)
whereClause.append("TRUNC(").append(RModel.TABLE_ALIAS).append(".DateAcct) BETWEEN ")
.append(DB.TO_DATE(DateFrom)).append(" AND ").append(DB.TO_DATE(DateTo));
else if (DateFrom != null)
whereClause.append("TRUNC(").append(RModel.TABLE_ALIAS).append(".DateAcct) >= ")
.append(DB.TO_DATE(DateFrom));
else // DateTo != null
whereClause.append("TRUNC(").append(RModel.TABLE_ALIAS).append(".DateAcct) <= ")
.append(DB.TO_DATE(DateTo));
}
// Add Organization
if (AD_Org_ID != 0)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS).append(".AD_Org_ID=").append(AD_Org_ID);
}
}
*/
class AcctViewerData implements SystemIDs
{
/**
* Constructor
* @param ctx context
* @param windowNo window no
* @param ad_Client_ID client
* @param ad_Table_ID table
*/
public AcctViewerData (Properties ctx, int windowNo, int ad_Client_ID, int ad_Table_ID)
{
WindowNo = windowNo;
AD_Client_ID = ad_Client_ID;
if (AD_Client_ID == 0)
AD_Client_ID = Env.getContextAsInt(Env.getCtx(), WindowNo, "AD_Client_ID");
if (AD_Client_ID == 0)
AD_Client_ID = Env.getContextAsInt(Env.getCtx(), "AD_Client_ID");
AD_Table_ID = ad_Table_ID;
//
ASchemas = MAcctSchema.getClientAcctSchema(ctx, AD_Client_ID);
ASchema = ASchemas[0];
} // AcctViewerData
/** Window */
public int WindowNo;
/** Client */
public int AD_Client_ID;
/** All Acct Schema */
public MAcctSchema[] ASchemas = null;
/** This Acct Schema */
public MAcctSchema ASchema = null;
// Selection Info
/** Document Query */
public boolean documentQuery = false;
/** Acct Schema */
public int C_AcctSchema_ID = 0;
/** Posting Type */
public String PostingType = "";
/** Organization */
public int AD_Org_ID = 0;
/** Date From */
public Timestamp DateFrom = null;
/** Date To */
public Timestamp DateTo = null;
// Document Table Selection Info
/** Table ID */
public int AD_Table_ID;
/** Record */
public int Record_ID;
/** Containing Column and Query */
public HashMap<String,String> whereInfo = new HashMap<String,String>();
/** Containing TableName and AD_Table_ID */
public HashMap<String,Integer> tableInfo = new HashMap<String,Integer>();
// Display Info
/** Display Qty */
boolean displayQty = false;
/** Display Source Currency */
boolean displaySourceAmt = false;
/** Display Document info */
boolean displayDocumentInfo = false;
//
String sortBy1 = "";
String sortBy2 = "";
String sortBy3 = "";
String sortBy4 = "";
//
boolean group1 = false;
boolean group2 = false;
boolean group3 = false;
boolean group4 = false;
/** Leasing Columns */
private int m_leadingColumns = 0;
/** UserElement1 Reference */
private String m_ref1 = null;
/** UserElement2 Reference */
private String m_ref2 = null;
/** Logger */
private static CLogger log = CLogger.getCLogger(AcctViewerData.class);
/**
* Dispose
*/
public void dispose()
{
ASchemas = null;
ASchema = null;
//
whereInfo.clear();
whereInfo = null;
//
Env.clearWinContext(WindowNo);
} // dispose
/**************************************************************************
* Fill Accounting Schema
* @param cb JComboBox to be filled
*/
protected void fillAcctSchema (JComboBox cb)
{
for (int i = 0; i < ASchemas.length; i++)
cb.addItem(new KeyNamePair(ASchemas[i].getC_AcctSchema_ID(),
ASchemas[i].getName()));
} // fillAcctSchema
/**
* Fill Posting Type
* @param cb JComboBox to be filled
*/
protected void fillPostingType (JComboBox cb)
{
int AD_Reference_ID = REFERENCE_POSTING_TYPE;
ValueNamePair[] pt = MRefList.getList(Env.getCtx(), AD_Reference_ID, true);
for (int i = 0; i < pt.length; i++)
cb.addItem(pt[i]);
} // fillPostingType
/**
* Fill Table with
* ValueNamePair (TableName, translatedKeyColumnName)
* and tableInfo with (TableName, AD_Table_ID)
* and select the entry for AD_Table_ID
*
* @param cb JComboBox to be filled
*/
protected void fillTable (JComboBox cb)
{
ValueNamePair select = null;
//
String sql = "SELECT AD_Table_ID, TableName FROM AD_Table t "
+ "WHERE EXISTS (SELECT * FROM AD_Column c"
+ " WHERE t.AD_Table_ID=c.AD_Table_ID AND c.ColumnName='Posted')"
+ " AND IsView='N'";
try
{
PreparedStatement pstmt = DB.prepareStatement(sql, null);
ResultSet rs = pstmt.executeQuery();
while (rs.next())
{
int id = rs.getInt(1);
String tableName = rs.getString(2);
String name = Msg.translate(Env.getCtx(), tableName+"_ID");
//
ValueNamePair pp = new ValueNamePair(tableName, name);
cb.addItem(pp);
tableInfo.put (tableName, new Integer(id));
if (id == AD_Table_ID)
select = pp;
}
rs.close();
pstmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
if (select != null)
cb.setSelectedItem(select);
} // fillTable
/**
* Fill Org
*
* @param cb JComboBox to be filled
*/
protected void fillOrg (JComboBox cb)
{
KeyNamePair pp = new KeyNamePair(0, "");
cb.addItem(pp);
String sql = "SELECT AD_Org_ID, Name FROM AD_Org WHERE AD_Client_ID=? ORDER BY Value";
try
{
PreparedStatement pstmt = DB.prepareStatement(sql, null);
pstmt.setInt(1, AD_Client_ID);
ResultSet rs = pstmt.executeQuery();
while (rs.next())
cb.addItem(new KeyNamePair(rs.getInt(1), rs.getString(2)));
rs.close();
pstmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql, e);
}
} // fillOrg
/**
* Get Button Text
*
* @param tableName table
* @param columnName column
* @param selectSQL sql
* @return Text on button
*/
protected String getButtonText (String tableName, String columnName, String selectSQL)
{
// SELECT (<embedded>) FROM tableName avd WHERE avd.<selectSQL>
StringBuffer sql = new StringBuffer ("SELECT (");
Language language = Env.getLanguage(Env.getCtx());
sql.append(MLookupFactory.getLookup_TableDirEmbed(language, columnName, "avd"))
.append(") FROM ").append(tableName).append(" avd WHERE avd.").append(selectSQL);
String retValue = "<" + selectSQL + ">";
try
{
Statement stmt = DB.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
if (rs.next())
retValue = rs.getString(1);
rs.close();
stmt.close();
}
catch (SQLException e)
{
log.log(Level.SEVERE, sql.toString(), e);
}
return retValue;
} // getButtonText
/**************************************************************************
/**
* Create Query and submit
* @return Report Model
*/
protected RModel query()
{
// Set Where Clause
StringBuffer whereClause = new StringBuffer();
// Add Organization
if (C_AcctSchema_ID != 0)
whereClause.append(RModel.TABLE_ALIAS)
.append(".C_AcctSchema_ID=").append(C_AcctSchema_ID);
// Posting Type Selected
if (PostingType != null && PostingType.length() > 0)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS)
.append(".PostingType='").append(PostingType).append("'");
}
//
if (documentQuery)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS).append(".AD_Table_ID=").append(AD_Table_ID)
.append(" AND ").append(RModel.TABLE_ALIAS).append(".Record_ID=").append(Record_ID);
}
else
{
// get values (Queries)
Iterator<String> it = whereInfo.values().iterator();
while (it.hasNext())
{
String where = (String)it.next();
if (where != null && where.length() > 0) // add only if not empty
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS).append(".").append(where);
}
}
if (DateFrom != null || DateTo != null)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
if (DateFrom != null && DateTo != null)
whereClause.append("TRUNC(").append(RModel.TABLE_ALIAS).append(".DateAcct) BETWEEN ")
.append(DB.TO_DATE(DateFrom)).append(" AND ").append(DB.TO_DATE(DateTo));
else if (DateFrom != null)
whereClause.append("TRUNC(").append(RModel.TABLE_ALIAS).append(".DateAcct) >= ")
.append(DB.TO_DATE(DateFrom));
else // DateTo != null
whereClause.append("TRUNC(").append(RModel.TABLE_ALIAS).append(".DateAcct) <= ")
.append(DB.TO_DATE(DateTo));
}
// Add Organization
if (AD_Org_ID != 0)
{
if (whereClause.length() > 0)
whereClause.append(" AND ");
whereClause.append(RModel.TABLE_ALIAS).append(".AD_Org_ID=").append(AD_Org_ID);
}
}
RModel rm = getRModel();
// Set Order By Clause
StringBuffer orderClause = new StringBuffer();
if (sortBy1.length() > 0)
// Set Order By Clause
StringBuffer orderClause = new StringBuffer();
if (sortBy1.length() > 0)
{
RColumn col = rm.getRColumn(sortBy1);
if (col != null)
orderClause.append(col.getDisplaySQL());
else
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy1);
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy1);
}
if (sortBy2.length() > 0)
{
if (orderClause.length() > 0)
orderClause.append(",");
if (sortBy2.length() > 0)
{
if (orderClause.length() > 0)
orderClause.append(",");
RColumn col = rm.getRColumn(sortBy2);
if (col != null)
orderClause.append(col.getDisplaySQL());
else
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy2);
}
if (sortBy3.length() > 0)
{
if (orderClause.length() > 0)
orderClause.append(",");
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy2);
}
if (sortBy3.length() > 0)
{
if (orderClause.length() > 0)
orderClause.append(",");
RColumn col = rm.getRColumn(sortBy3);
if (col != null)
orderClause.append(col.getDisplaySQL());
else
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy3);
}
if (sortBy4.length() > 0)
{
if (orderClause.length() > 0)
orderClause.append(",");
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy3);
}
if (sortBy4.length() > 0)
{
if (orderClause.length() > 0)
orderClause.append(",");
RColumn col = rm.getRColumn(sortBy4);
if (col != null)
orderClause.append(col.getDisplaySQL());
else
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy4);
}
if (orderClause.length() == 0)
orderClause.append(RModel.TABLE_ALIAS).append(".Fact_Acct_ID");
// Groups
if (group1 && sortBy1.length() > 0)
rm.setGroup(sortBy1);
if (group2 && sortBy2.length() > 0)
rm.setGroup(sortBy2);
if (group3 && sortBy3.length() > 0)
rm.setGroup(sortBy3);
if (group4 && sortBy4.length() > 0)
rm.setGroup(sortBy4);
// Totals
rm.setFunction("AmtAcctDr", RModel.FUNCTION_SUM);
rm.setFunction("AmtAcctCr", RModel.FUNCTION_SUM);
rm.query (Env.getCtx(), whereClause.toString(), orderClause.toString());
return rm;
} // query
/**
* Create Report Model (Columns)
* @return Report Model
*/
private RModel getRModel()
{
Properties ctx = Env.getCtx();
RModel rm = new RModel("Fact_Acct");
// Add Key (Lookups)
ArrayList<String> keys = createKeyColumns();
int max = m_leadingColumns;
if (max == 0)
max = keys.size();
for (int i = 0; i < max; i++)
{
String column = (String)keys.get(i);
if (column != null && column.startsWith("Date"))
rm.addColumn(new RColumn(ctx, column, DisplayType.Date));
else if (column != null && column.endsWith("_ID"))
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir));
}
// Main Info
rm.addColumn(new RColumn(ctx, "AmtAcctDr", DisplayType.Amount));
rm.addColumn(new RColumn(ctx, "AmtAcctCr", DisplayType.Amount));
if (displaySourceAmt)
{
if (!keys.contains("DateTrx"))
rm.addColumn(new RColumn(ctx, "DateTrx", DisplayType.Date));
rm.addColumn(new RColumn(ctx, "C_Currency_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "AmtSourceDr", DisplayType.Amount));
rm.addColumn(new RColumn(ctx, "AmtSourceCr", DisplayType.Amount));
rm.addColumn(new RColumn(ctx, "Rate", DisplayType.Amount,
"CASE WHEN (AmtSourceDr + AmtSourceCr) = 0 THEN 0"
+ " ELSE (AmtAcctDr + AmtAcctCr) / (AmtSourceDr + AmtSourceCr) END"));
}
// Remaining Keys
for (int i = max; i < keys.size(); i++)
{
String column = (String)keys.get(i);
if (column != null && column.startsWith("Date"))
rm.addColumn(new RColumn(ctx, column, DisplayType.Date));
else if (column.startsWith("UserElement"))
{
if (column.indexOf('1') != -1)
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir, null, 0, m_ref1));
else
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir, null, 0, m_ref2));
}
else if (column != null && column.endsWith("_ID"))
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir));
}
// Info
if (!keys.contains("DateAcct"))
rm.addColumn(new RColumn(ctx, "DateAcct", DisplayType.Date));
if (!keys.contains("C_Period_ID"))
rm.addColumn(new RColumn(ctx, "C_Period_ID", DisplayType.TableDir));
if (displayQty)
{
rm.addColumn(new RColumn(ctx, "C_UOM_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "Qty", DisplayType.Quantity));
}
if (displayDocumentInfo)
{
rm.addColumn(new RColumn(ctx, "AD_Table_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "Record_ID", DisplayType.ID));
orderClause.append(RModel.TABLE_ALIAS).append(".").append(sortBy4);
}
if (orderClause.length() == 0)
orderClause.append(RModel.TABLE_ALIAS).append(".Fact_Acct_ID");
// Groups
if (group1 && sortBy1.length() > 0)
rm.setGroup(sortBy1);
if (group2 && sortBy2.length() > 0)
rm.setGroup(sortBy2);
if (group3 && sortBy3.length() > 0)
rm.setGroup(sortBy3);
if (group4 && sortBy4.length() > 0)
rm.setGroup(sortBy4);
// Totals
rm.setFunction("AmtAcctDr", RModel.FUNCTION_SUM);
rm.setFunction("AmtAcctCr", RModel.FUNCTION_SUM);
rm.query (Env.getCtx(), whereClause.toString(), orderClause.toString());
return rm;
} // query
/**
* Create Report Model (Columns)
* @return Report Model
*/
private RModel getRModel()
{
Properties ctx = Env.getCtx();
RModel rm = new RModel("Fact_Acct");
// Add Key (Lookups)
ArrayList<String> keys = createKeyColumns();
int max = m_leadingColumns;
if (max == 0)
max = keys.size();
for (int i = 0; i < max; i++)
{
String column = (String)keys.get(i);
if (column != null && column.startsWith("Date"))
rm.addColumn(new RColumn(ctx, column, DisplayType.Date));
else if (column != null && column.endsWith("_ID"))
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir));
}
// Main Info
rm.addColumn(new RColumn(ctx, "AmtAcctDr", DisplayType.Amount));
rm.addColumn(new RColumn(ctx, "AmtAcctCr", DisplayType.Amount));
if (displaySourceAmt)
{
if (!keys.contains("DateTrx"))
rm.addColumn(new RColumn(ctx, "DateTrx", DisplayType.Date));
rm.addColumn(new RColumn(ctx, "C_Currency_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "AmtSourceDr", DisplayType.Amount));
rm.addColumn(new RColumn(ctx, "AmtSourceCr", DisplayType.Amount));
rm.addColumn(new RColumn(ctx, "Rate", DisplayType.Amount,
"CASE WHEN (AmtSourceDr + AmtSourceCr) = 0 THEN 0"
+ " ELSE (AmtAcctDr + AmtAcctCr) / (AmtSourceDr + AmtSourceCr) END"));
}
// Remaining Keys
for (int i = max; i < keys.size(); i++)
{
String column = (String)keys.get(i);
if (column != null && column.startsWith("Date"))
rm.addColumn(new RColumn(ctx, column, DisplayType.Date));
else if (column.startsWith("UserElement"))
{
if (column.indexOf('1') != -1)
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir, null, 0, m_ref1));
else
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir, null, 0, m_ref2));
}
else if (column != null && column.endsWith("_ID"))
rm.addColumn(new RColumn(ctx, column, DisplayType.TableDir));
}
// Info
if (!keys.contains("DateAcct"))
rm.addColumn(new RColumn(ctx, "DateAcct", DisplayType.Date));
if (!keys.contains("C_Period_ID"))
rm.addColumn(new RColumn(ctx, "C_Period_ID", DisplayType.TableDir));
if (displayQty)
{
rm.addColumn(new RColumn(ctx, "C_UOM_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "Qty", DisplayType.Quantity));
}
if (displayDocumentInfo)
{
rm.addColumn(new RColumn(ctx, "AD_Table_ID", DisplayType.TableDir));
rm.addColumn(new RColumn(ctx, "Record_ID", DisplayType.ID));
rm.addColumn(new RColumn(ctx, "Description", DisplayType.String));
}
if (PostingType == null || PostingType.length() == 0)
@ -486,46 +487,46 @@ class AcctViewerData
null));
return rm;
} // createRModel
/**
* Create the key columns in sequence
* @return List of Key Columns
*/
private ArrayList<String> createKeyColumns()
{
ArrayList<String> columns = new ArrayList<String>();
m_leadingColumns = 0;
// Sorting Fields
columns.add(sortBy1); // may add ""
if (!columns.contains(sortBy2))
columns.add(sortBy2);
if (!columns.contains(sortBy3))
columns.add(sortBy3);
if (!columns.contains(sortBy4))
columns.add(sortBy4);
// Add Account Segments
MAcctSchemaElement[] elements = ASchema.getAcctSchemaElements();
for (int i = 0; i < elements.length; i++)
{
if (m_leadingColumns == 0 && columns.contains("AD_Org_ID") && columns.contains("Account_ID"))
m_leadingColumns = columns.size();
//
MAcctSchemaElement ase = elements[i];
String columnName = ase.getColumnName();
if (columnName.startsWith("UserElement"))
{
if (columnName.indexOf('1') != -1)
m_ref1 = ase.getDisplayColumnName();
else
m_ref2 = ase.getDisplayColumnName();
}
if (!columns.contains(columnName))
columns.add(columnName);
}
if (m_leadingColumns == 0 && columns.contains("AD_Org_ID") && columns.contains("Account_ID"))
m_leadingColumns = columns.size();
return columns;
} // createKeyColumns
} // AcctViewerData
/**
* Create the key columns in sequence
* @return List of Key Columns
*/
private ArrayList<String> createKeyColumns()
{
ArrayList<String> columns = new ArrayList<String>();
m_leadingColumns = 0;
// Sorting Fields
columns.add(sortBy1); // may add ""
if (!columns.contains(sortBy2))
columns.add(sortBy2);
if (!columns.contains(sortBy3))
columns.add(sortBy3);
if (!columns.contains(sortBy4))
columns.add(sortBy4);
// Add Account Segments
MAcctSchemaElement[] elements = ASchema.getAcctSchemaElements();
for (int i = 0; i < elements.length; i++)
{
if (m_leadingColumns == 0 && columns.contains("AD_Org_ID") && columns.contains("Account_ID"))
m_leadingColumns = columns.size();
//
MAcctSchemaElement ase = elements[i];
String columnName = ase.getColumnName();
if (columnName.startsWith("UserElement"))
{
if (columnName.indexOf('1') != -1)
m_ref1 = ase.getDisplayColumnName();
else
m_ref2 = ase.getDisplayColumnName();
}
if (!columns.contains(columnName))
columns.add(columnName);
}
if (m_leadingColumns == 0 && columns.contains("AD_Org_ID") && columns.contains("Account_ID"))
m_leadingColumns = columns.size();
return columns;
} // createKeyColumns
} // AcctViewerData

5
org.adempiere.ui.swing/src/org/compiere/apps/AArchive.java
View File

@ -29,6 +29,7 @@ import javax.swing.JPopupMenu;
import org.compiere.apps.form.ArchiveViewer;
import org.compiere.apps.form.FormFrame;
import org.compiere.model.MBPartner;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -43,7 +44,7 @@ import org.compiere.util.Msg;
* @author Jorg Janke
* @version $Id: AArchive.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*/
public class AArchive implements ActionListener
public class AArchive implements ActionListener, SystemIDs
{
/**
* Constructor
@ -165,7 +166,7 @@ public class AArchive implements ActionListener
*/
public void actionPerformed (ActionEvent e)
{
int AD_Form_ID = 118; // ArchiveViewer
int AD_Form_ID = FORM_ARCHIVEVIEWER; // ArchiveViewer
FormFrame ff = new FormFrame(m_graphicsconfig);
ff.openForm(AD_Form_ID);
ArchiveViewer av = (ArchiveViewer)ff.getFormPanel();

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

@ -51,6 +51,7 @@ import org.compiere.interfaces.Server;
import org.compiere.model.MMenu;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.SystemIDs;
import org.compiere.process.DocumentEngine;
import org.compiere.swing.CButton;
import org.compiere.swing.CFrame;
@ -74,7 +75,7 @@ import org.compiere.util.Splash;
* @see FR [ 1966328 ] New Window Info to MRP and CRP into View http://sourceforge.net/tracker/index.php?func=detail&aid=1966328&group_id=176962&atid=879335
*
*/
public final class AEnv
public final class AEnv implements SystemIDs
{
// Array of active Windows
private static ArrayList<Container> s_windows = new ArrayList<Container>(20);
@ -795,12 +796,12 @@ public final class AEnv
if (s_workflow == null)
{
s_workflow = Boolean.FALSE;
int AD_Table_ID = 645; // AD_WF_Process
int AD_Table_ID = TABLE_AD_WF_PROCESS; // AD_WF_Process
if (MRole.getDefault().isTableAccess (AD_Table_ID, true)) // RO
s_workflow = Boolean.TRUE;
else
{
AD_Table_ID = 644; // AD_WF_Activity
AD_Table_ID = TABLE_AD_WF_ACTIVITY; // AD_WF_Activity
if (MRole.getDefault().isTableAccess (AD_Table_ID, true)) // RO
s_workflow = Boolean.TRUE;
else

15
org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
View File

@ -64,6 +64,7 @@ import org.compiere.model.MSysConfig;
import org.compiere.model.MSystem;
import org.compiere.model.MTreeNode;
import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CFrame;
import org.compiere.swing.CPanel;
@ -92,7 +93,7 @@ import org.compiere.util.Splash;
*
*/
public final class AMenu extends CFrame
implements ActionListener, PropertyChangeListener, ChangeListener, IEnvEventListener
implements ActionListener, PropertyChangeListener, ChangeListener, IEnvEventListener, SystemIDs
{
/**
* generated serialVersionUID
@ -167,7 +168,7 @@ public final class AMenu extends CFrame
+ " INNER JOIN AD_Role r ON (ci.AD_Client_ID=r.AD_Client_ID) "
+ "WHERE AD_Role_ID=?", AD_Role_ID);
if (AD_Tree_ID <= 0)
AD_Tree_ID = 10; // Menu
AD_Tree_ID = TREE_MENUPRIMARY; // Menu
treePanel.initTree(AD_Tree_ID);
// Translate
@ -195,6 +196,12 @@ public final class AMenu extends CFrame
infoUpdater = new InfoUpdater();
infoUpdaterThread = new Thread(infoUpdater, "InfoUpdater");
infoUpdaterThread.start();
// Auto Expand Tree - nmicoud IDEMPIERE 195
if (MUser.get(m_ctx).isMenuAutoExpand())
treePanel.expandTree(true);
// Auto Expand Tree - nmicoud IDEMPIERE 195
//
Env.addEventListener(this);
//
@ -649,7 +656,7 @@ public final class AMenu extends CFrame
+ " INNER JOIN AD_TABLE t ON (t.AD_Window_ID=m.AD_Window_ID) "
+ "WHERE t.AD_Table_ID=?", 389);
if (m_note_Menu_ID == 0)
m_note_Menu_ID = 233; // fallback HARDCODED
m_note_Menu_ID = MENU_NOTICE; // fallback HARDCODED
(new AMenuStartItem (m_note_Menu_ID, true, Msg.translate(m_ctx, "AD_Note_ID"), this)).start(); // async load
} // gotoMessage
@ -681,7 +688,7 @@ public final class AMenu extends CFrame
// + " INNER JOIN AD_TABLE t ON (t.AD_Window_ID=m.AD_Window_ID) "
// + "WHERE t.AD_Table_ID=?", 417);
if (m_request_Menu_ID == 0)
m_request_Menu_ID = 237; // My Requests
m_request_Menu_ID = WINDOW_MY_REQUESTS; // My Requests
(new AMenuStartItem (m_request_Menu_ID, true, Msg.translate(m_ctx, "R_Request_ID"), this)).start(); // async load
} // gotoRequests

5
org.adempiere.ui.swing/src/org/compiere/apps/APanel.java
View File

@ -90,6 +90,7 @@ import org.compiere.model.MRole;
import org.compiere.model.MToolBarButtonRestrict;
import org.compiere.model.MUser;
import org.compiere.model.MWindow;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_ToolBarButton;
import org.compiere.plaf.CompiereColor;
import org.compiere.print.AReport;
@ -143,7 +144,7 @@ import org.compiere.util.Util;
* @sponsor www.metas.de
*/
public final class APanel extends CPanel
implements DataStatusListener, ChangeListener, ActionListener, IProcessMonitor
implements DataStatusListener, ChangeListener, ActionListener, IProcessMonitor, SystemIDs
{
/**
*
@ -2509,7 +2510,7 @@ public final class APanel extends CPanel
record_ID = Env.getContextAsInt (m_ctx, m_curWindowNo, "AD_Language_ID");
// Record_ID - Change Log ID
if (record_ID == -1
&& (vButton.getProcess_ID() == 306 || vButton.getProcess_ID() == 307))
&& (vButton.getProcess_ID() == PROCESS_AD_CHANGELOG_UNDO || vButton.getProcess_ID() == PROCESS_AD_CHANGELOG_REDO))
{
Integer id = (Integer)m_curTab.getValue("AD_ChangeLog_ID");
record_ID = id.intValue();

5
org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java
View File

@ -41,6 +41,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRMA;
import org.compiere.model.MRequest;
import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
@ -58,7 +59,7 @@ import org.compiere.util.Msg;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1904928 ] Request: Related Request field not filled
*/
public class ARequest implements ActionListener
public class ARequest implements ActionListener, SystemIDs
{
/**
* Constructor
@ -209,7 +210,7 @@ public class ARequest implements ActionListener
query.setRecordCount(0);
}
//
int AD_Window_ID = 232; // 232=all - 201=my
int AD_Window_ID = WINDOW_REQUESTS_ALL; // 232=all - 201=my
AWindow frame = new AWindow(m_graphicsconfig);
if (!frame.initWindow(AD_Window_ID, query))
return;

11
org.adempiere.ui.swing/src/org/compiere/apps/ProcessDialog.java
View File

@ -37,6 +37,7 @@ import javax.swing.JSeparator;
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.exceptions.DBException;
import org.adempiere.util.IProcessMonitor;
import org.compiere.model.SystemIDs;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
@ -64,10 +65,10 @@ import org.compiere.util.Msg;
* - Implement ShowHelp option on processes and reports
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1893525 ] ProcessDialog: Cannot select the text from text field
* <li>BF [ 1963128 ] Running a process w/o trl should display an error
*/
* <li>BF [ 1963128 ] Running a process w/o trl should display an error
*/
public class ProcessDialog extends CFrame
implements ActionListener, IProcessMonitor
implements ActionListener, IProcessMonitor, SystemIDs
{
/**
*
@ -441,9 +442,9 @@ public class ProcessDialog extends CFrame
{
log.config("");
// Print invoices
if (m_AD_Process_ID == 119)
if (m_AD_Process_ID == PROCESS_C_INVOICE_GENERATE)
printInvoices();
else if (m_AD_Process_ID == 118)
else if (m_AD_Process_ID == PROCESS_M_INOUT_GENERATE)
printShipments();
}

9
org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java
View File

@ -45,6 +45,7 @@ import org.compiere.grid.ed.VLookup;
import org.compiere.minigrid.MiniTable;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.plaf.CompiereColor;
import org.compiere.swing.CPanel;
import org.compiere.swing.CTextField;
@ -55,7 +56,7 @@ import org.compiere.util.Trx;
import org.compiere.util.TrxRunnable;
public class VAllocation extends Allocation
implements FormPanel, ActionListener, TableModelListener, VetoableChangeListener
implements FormPanel, ActionListener, TableModelListener, VetoableChangeListener, SystemIDs
{
private CPanel panel = new CPanel();
@ -240,21 +241,21 @@ public class VAllocation extends Allocation
public void dynInit() throws Exception
{
// Currency
int AD_Column_ID = 3505; // C_Invoice.C_Currency_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_CURRENCY_ID; // C_Invoice.C_Currency_ID
MLookup lookupCur = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
currencyPick = new VLookup("C_Currency_ID", true, false, true, lookupCur);
currencyPick.setValue(new Integer(m_C_Currency_ID));
currencyPick.addVetoableChangeListener(this);
// Organization filter selection
AD_Column_ID = 839; //C_Period.AD_Org_ID (needed to allow org 0)
AD_Column_ID = COLUMN_C_PERIOD_AD_ORG_ID; //C_Period.AD_Org_ID (needed to allow org 0)
MLookup lookupOrg = MLookupFactory.get(Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
organizationPick = new VLookup("AD_Org_ID", true, false, true, lookupOrg);
organizationPick.setValue(Env.getAD_Org_ID(Env.getCtx()));
organizationPick.addVetoableChangeListener(this);
// BPartner
AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookupBP = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.Search);
bpartnerSearch = new VLookup("C_BPartner_ID", true, false, true, lookupBP);
bpartnerSearch.addVetoableChangeListener(this);

5
org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java
View File

@ -42,6 +42,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPaySelectionCheck;
import org.compiere.model.MPaymentBatch;
import org.compiere.model.SystemIDs;
import org.compiere.plaf.CompiereColor;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
@ -65,7 +66,7 @@ import org.compiere.util.ValueNamePair;
* Contributors:
* Carlos Ruiz - GlobalQSS - FR 3132033 - Make payment export class configurable per bank
*/
public class VPayPrint extends PayPrint implements FormPanel, ActionListener, VetoableChangeListener
public class VPayPrint extends PayPrint implements FormPanel, ActionListener, VetoableChangeListener, SystemIDs
{
private CPanel panel = new CPanel();
@ -198,7 +199,7 @@ public class VPayPrint extends PayPrint implements FormPanel, ActionListener, Ve
{
// C_PaySelection_ID
int AD_Column_ID = 7670; // C_PaySelectionCheck.C_PaySelection_ID
int AD_Column_ID = COLUMN_C_PAYSELECTIONCHECK_C_PAYSELECTION_ID; // C_PaySelectionCheck.C_PaySelection_ID
MLookup lookupPS = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.Search);
paySelectSearch = new VLookup("C_PaySelection_ID", true, false, true, lookupPS);
paySelectSearch.addVetoableChangeListener(this);

7
org.adempiere.ui.swing/src/org/compiere/apps/form/VPaySelect.java
View File

@ -46,6 +46,7 @@ import org.compiere.grid.ed.VCheckBox;
import org.compiere.grid.ed.VComboBox;
import org.compiere.grid.ed.VDate;
import org.compiere.minigrid.MiniTable;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_C_PaySelection;
import org.compiere.plaf.CompiereColor;
import org.compiere.process.ProcessInfo;
@ -65,7 +66,7 @@ import org.compiere.util.ValueNamePair;
* @author Jorg Janke
* @version $Id: VPaySelect.java,v 1.2 2008/07/11 08:20:12 cruiz Exp $
*/
public class VPaySelect extends PaySelect implements FormPanel, ActionListener, TableModelListener, IProcessMonitor
public class VPaySelect extends PaySelect implements FormPanel, ActionListener, TableModelListener, IProcessMonitor, SystemIDs
{
/** @todo withholding */
private CPanel panel = new CPanel();
@ -365,7 +366,7 @@ public class VPaySelect extends PaySelect implements FormPanel, ActionListener,
return;
// Prepare Process
int AD_Proces_ID = 155; // C_PaySelection_CreatePayment
int AD_Proces_ID = PROCESS_C_PAYSELECTION_CREATEPAYMENT; // C_PaySelection_CreatePayment
ProcessInfo pi = new ProcessInfo (m_frame.getTitle(), AD_Proces_ID,
X_C_PaySelection.Table_ID, m_ps.getC_PaySelection_ID());
pi.setAD_User_ID (Env.getAD_User_ID(Env.getCtx()));
@ -403,7 +404,7 @@ public class VPaySelect extends PaySelect implements FormPanel, ActionListener,
return;
// Start PayPrint
int AD_Form_ID = 106; // Payment Print/Export
int AD_Form_ID = FORM_PAYMENT_PRINT_EXPORT; // Payment Print/Export
FormFrame ff = new FormFrame();
ff.openForm (AD_Form_ID);
// Set Parameter

5
org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java
View File

@ -82,6 +82,7 @@ import org.compiere.model.MProduct;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MUserQuery;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_Column;
import org.compiere.swing.CButton;
import org.compiere.swing.CComboBox;
@ -112,7 +113,7 @@ import org.compiere.util.ValueNamePair;
* <li>BF [ 2564070 ] Saving user queries can produce unnecessary db errors
*/
public final class Find extends CDialog
implements ActionListener, ChangeListener, DataStatusListener
implements ActionListener, ChangeListener, DataStatusListener, SystemIDs
{
/**
*
@ -209,7 +210,7 @@ public final class Find extends CDialog
/** Length of Fields on first tab */
public static final int FIELDLENGTH = 20;
/** Reference ID for Yes/No */
public static final int AD_REFERENCE_ID_YESNO = 319;
public static final int AD_REFERENCE_ID_YESNO = REFERENCE_YESNO;
//

7
org.adempiere.ui.swing/src/org/compiere/apps/search/InfoAssignment.java
View File

@ -31,6 +31,7 @@ import org.compiere.grid.ed.VLookup;
import org.compiere.minigrid.IDColumn;
import org.compiere.model.Lookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CLabel;
import org.compiere.util.DB;
@ -45,7 +46,7 @@ import org.compiere.util.Msg;
* @author Jorg Janke
* @version $Id: InfoAssignment.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*/
public class InfoAssignment extends Info
public class InfoAssignment extends Info implements SystemIDs
{
/**
*
@ -120,10 +121,10 @@ public class InfoAssignment extends Info
{
try
{
int AD_Column_ID = 6851; // S_Resource.S_ResourceType_ID
int AD_Column_ID = COLUMN_S_RESOURCE_S_RESOURCETYPE_ID; // S_Resource.S_ResourceType_ID
Lookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
fieldResourceType = new VLookup ("S_ResourceType_ID", false, false, true, lookup);
AD_Column_ID = 6826; // S_ResourceAssignment.S_Resource_ID
AD_Column_ID = COLUMN_S_RESOURCEASSIGNMENT_S_RESOURCE_ID; // S_ResourceAssignment.S_Resource_ID
lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
fieldResource = new VLookup ("S_Resource_ID", false, false, true, lookup);
}

5
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java
View File

@ -35,6 +35,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MDocType;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
@ -42,7 +43,7 @@ import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionListener, VetoableChangeListener
public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionListener, VetoableChangeListener, SystemIDs
{
private static final long serialVersionUID = 1L;
@ -251,7 +252,7 @@ public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionLis
protected void initBPartner (boolean forInvoice) throws Exception
{
// load BPartner
int AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.Search);
bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup);
//

5
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java
View File

@ -30,13 +30,14 @@ import org.compiere.grid.ed.VLookup;
import org.compiere.model.GridTab;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeListener
public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeListener, SystemIDs
{
private static final long serialVersionUID = 1L;
@ -155,7 +156,7 @@ public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeLis
protected void initBPartner (boolean forInvoice) throws Exception
{
// load BPartner
int AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.Search);
bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup);
//

10
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java
View File

@ -52,6 +52,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MProduct;
import org.compiere.model.Query;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CPanel;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
@ -59,11 +60,8 @@ import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
import org.compiere.util.Msg;
public class VCreateFromShipmentUI extends CreateFromShipment implements ActionListener, VetoableChangeListener
public class VCreateFromShipmentUI extends CreateFromShipment implements ActionListener, VetoableChangeListener, SystemIDs
{
private static final int WINDOW_CUSTOMER_RETURN = 53097;
private static final int WINDOW_RETURN_TO_VENDOR = 53098;
private VCreateFromDialog dialog;
@ -161,7 +159,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL
*/
private void jbInit() throws Exception
{
boolean isRMAWindow = ((getGridTab().getAD_Window_ID() == WINDOW_RETURN_TO_VENDOR) || (getGridTab().getAD_Window_ID() == WINDOW_CUSTOMER_RETURN));
boolean isRMAWindow = ((getGridTab().getAD_Window_ID() == WINDOW_RETURNTOVENDOR) || (getGridTab().getAD_Window_ID() == WINDOW_CUSTOMERRETURN));
bPartnerLabel.setText(Msg.getElement(Env.getCtx(), "C_BPartner_ID"));
orderLabel.setText(Msg.getElement(Env.getCtx(), "C_Order_ID", false));
@ -304,7 +302,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL
protected void initBPartner (boolean forInvoice) throws Exception
{
// load BPartner
int AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.Search);
bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup);
//

5
org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java
View File

@ -43,6 +43,7 @@ import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPayment;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CLabel;
import org.compiere.swing.CPanel;
@ -52,7 +53,7 @@ import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
public class VCreateFromStatementUI extends CreateFromStatement implements ActionListener
public class VCreateFromStatementUI extends CreateFromStatement implements ActionListener, SystemIDs
{
private static final long serialVersionUID = 1L;
@ -145,7 +146,7 @@ public class VCreateFromStatementUI extends CreateFromStatement implements Actio
dialog.setTitle(getTitle());
int AD_Column_ID = 4917; // C_BankStatement.C_BankAccount_ID
int AD_Column_ID = COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID; // C_BankStatement.C_BankAccount_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup);
// Set Default

5
org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java
View File

@ -61,6 +61,7 @@ import org.compiere.model.MAccountLookup;
import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MQuery;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CDialog;
import org.compiere.swing.CPanel;
@ -76,7 +77,7 @@ import org.compiere.util.Msg;
* @version $Id: VAccountDialog.java,v 1.3 2006/07/30 00:51:28 jjanke Exp $
*/
public final class VAccountDialog extends CDialog
implements ActionListener, DataStatusListener, VetoableChangeListener
implements ActionListener, DataStatusListener, VetoableChangeListener, SystemIDs
{
/**
*
@ -272,7 +273,7 @@ public final class VAccountDialog extends CDialog
Env.setContext(Env.getCtx(), m_WindowNo, "C_AcctSchema_ID", m_C_AcctSchema_ID);
// Model
int AD_Window_ID = 153; // Maintain Account Combinations
int AD_Window_ID = WINDOW_ACCOUNTCOMBINATION; // Maintain Account Combinations
GridWindowVO wVO = Env.getMWindowVO (m_WindowNo, AD_Window_ID, 0);
if (wVO == null)
return false;

5
org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java
View File

@ -50,6 +50,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MTable;
import org.compiere.model.MWarehouse;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
@ -64,7 +65,7 @@ import org.compiere.util.Msg;
* @version $Id: VLocator.java,v 1.5 2006/07/30 00:51:27 jjanke Exp $
*/
public class VLocator extends JComponent
implements VEditor, ActionListener
implements VEditor, ActionListener, SystemIDs
{
/**
*
@ -521,7 +522,7 @@ public class VLocator extends JComponent
{
int AD_Window_ID = MTable.get(Env.getCtx(), MLocator.Table_ID).getAD_Window_ID();
if (AD_Window_ID <= 0)
AD_Window_ID = 139; // hardcoded window Warehouse & Locators
AD_Window_ID = WINDOW_WAREHOUSE_LOCATOR; // hardcoded window Warehouse & Locators
log.info("");
//
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));

9
org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java
View File

@ -58,6 +58,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CMenuItem;
import org.compiere.swing.CTextField;
@ -95,7 +96,7 @@ import org.compiere.util.ValueNamePair;
* @sponsor www.metas.de
*/
public class VLookup extends JComponent
implements VEditor, ActionListener, FocusListener
implements VEditor, ActionListener, FocusListener, SystemIDs
{
/**
*
@ -169,7 +170,7 @@ public class VLookup extends JComponent
*/
public static VLookup createBPartner (int WindowNo)
{
int AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
try
{
Lookup lookup = MLookupFactory.get (Env.getCtx(), WindowNo,
@ -190,7 +191,7 @@ public class VLookup extends JComponent
*/
public static VLookup createProduct (int WindowNo)
{
int AD_Column_ID = 3840; // C_InvoiceLine.M_Product_ID
int AD_Column_ID = COLUMN_C_INVOICELINE_M_PRODUCT_ID; // C_InvoiceLine.M_Product_ID
try
{
Lookup lookup = MLookupFactory.get (Env.getCtx(), WindowNo, 0,
@ -211,7 +212,7 @@ public class VLookup extends JComponent
*/
public static VLookup createUser (int WindowNo)
{
int AD_Column_ID = 10443; // AD_WF_Activity.AD_User_UD
int AD_Column_ID = COLUMN_AD_WF_ACTIVITY_AD_USER_ID; // AD_WF_Activity.AD_User_UD
try
{
Lookup lookup = MLookupFactory.get (Env.getCtx(), WindowNo, 0,

5
org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java
View File

@ -43,6 +43,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MAttributeSet;
import org.compiere.model.MPAttributeLookup;
import org.compiere.model.MProduct;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CMenuItem;
import org.compiere.util.CLogger;
@ -61,7 +62,7 @@ import org.compiere.util.Msg;
* <li>BF [ 2011222 ] ASI Dialog is reseting locator
*/
public class VPAttribute extends JComponent
implements VEditor, ActionListener
implements VEditor, ActionListener, SystemIDs
{
/**
*
@ -400,7 +401,7 @@ public class VPAttribute extends JComponent
+ ", AD_Column_ID=" + m_AD_Column_ID);
// M_Product.M_AttributeSetInstance_ID = 8418
boolean productWindow = m_AD_Column_ID == 8418; // HARDCODED
boolean productWindow = m_AD_Column_ID == COLUMN_M_PRODUCT_M_ATTRIBUTESETINSTANCE_ID; // HARDCODED
// Exclude ability to enter ASI
boolean exclude = true;

7
org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttributeDialog.java
View File

@ -54,6 +54,7 @@ import org.compiere.model.MLotCtl;
import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MSerNoCtl;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_M_MovementLine;
import org.compiere.swing.CButton;
import org.compiere.swing.CCheckBox;
@ -79,7 +80,7 @@ import org.compiere.util.Msg;
* @version $Id: VPAttributeDialog.java,v 1.4 2006/07/30 00:51:27 jjanke Exp $
*/
public class VPAttributeDialog extends CDialog
implements ActionListener
implements ActionListener, SystemIDs
{
/**
*
@ -600,7 +601,7 @@ public class VPAttributeDialog extends CDialog
// teo_sarca [ 1564520 ] Inventory Move: can't select existing attributes
int M_Locator_ID = 0;
if (m_AD_Column_ID == 8551) { // TODO: hardcoded: M_MovementLine[324].M_AttributeSetInstance_ID[8551]
if (m_AD_Column_ID == COLUMN_M_MOVEMENTLINE_M_ATTRIBUTESETINSTANCE_ID) { // TODO: hardcoded: M_MovementLine[324].M_AttributeSetInstance_ID[8551]
M_Locator_ID = Env.getContextAsInt(Env.getCtx(), m_WindowNoParent, X_M_MovementLine.COLUMNNAME_M_Locator_ID, true); // only window
}
@ -683,7 +684,7 @@ public class VPAttributeDialog extends CDialog
//
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
//
int AD_Window_ID = 257; // Lot
int AD_Window_ID = WINDOW_LOT; // Lot
AWindow frame = new AWindow();
if (frame.initWindow(AD_Window_ID, zoomQuery))
{

12
org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
View File

@ -173,7 +173,7 @@ public final class VTreePanel extends CPanel
/**
*
*/
private static final long serialVersionUID = -6798614427038652192L;
private static final long serialVersionUID = -7188402231414573844L;
private static final String PREFIX_DOCUMENT_SEARCH = "/";
@ -962,6 +962,16 @@ public final class VTreePanel extends CPanel
return no == 1;
} // barDBupdate
// Auto Expand Tree - nmicoud IDEMPIERE 195
/**
* Expand/Collapse tree
* @param expand true if tree should be expanded
*/
public void expandTree(boolean expand)
{
treeExpand.setSelected(expand);
expandTree();
}
/**
* Clicked on Expand All

5
org.adempiere.ui.swing/src/org/compiere/pos/PosPayment.java
View File

@ -53,6 +53,7 @@ import org.compiere.model.MPOS;
import org.compiere.model.MPOSKey;
import org.compiere.model.MPayment;
import org.compiere.model.MPaymentValidate;
import org.compiere.model.SystemIDs;
import org.compiere.swing.CButton;
import org.compiere.swing.CComboBox;
import org.compiere.swing.CDialog;
@ -64,7 +65,7 @@ import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.ValueNamePair;
public class PosPayment extends CDialog implements PosKeyListener, VetoableChangeListener, ActionListener {
public class PosPayment extends CDialog implements PosKeyListener, VetoableChangeListener, ActionListener, SystemIDs {
/**
*
*/
@ -247,7 +248,7 @@ public class PosPayment extends CDialog implements PosKeyListener, VetoableChang
mainPanel.add(new CLabel(Msg.translate(p_ctx, "TenderType"), "growx"));
// Payment type selection
int AD_Column_ID = 8416; //C_Payment_v.TenderType
int AD_Column_ID = COLUMN_C_PAYMENT_V_TENDERTYPE; //C_Payment_v.TenderType
MLookup lookup = MLookupFactory.get(Env.getCtx(), 0, 0, AD_Column_ID, DisplayType.List);
ArrayList<Object> types = lookup.getData(true, false, true, true);

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

@ -80,6 +80,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRole;
import org.compiere.model.MUser;
import org.compiere.model.PrintInfo;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_C_Invoice;
import org.compiere.swing.CButton;
import org.compiere.swing.CCheckBox;
@ -124,7 +125,7 @@ import org.compiere.util.ValueNamePair;
*
*/
public class Viewer extends CFrame
implements ActionListener, ChangeListener, WindowStateListener, IReportEngineEventListener
implements ActionListener, ChangeListener, WindowStateListener, IReportEngineEventListener, SystemIDs
{
/**
*
@ -1188,7 +1189,7 @@ public class Viewer extends CFrame
{
AWindow win = new AWindow (getGraphicsConfiguration());
new AWindowListener (win, this); // forwards Window Events
int AD_Window_ID = 240; // hardcoded
int AD_Window_ID = WINDOW_PRINTFORMAT; // hardcoded
int AD_PrintFormat_ID = m_reportEngine.getPrintFormat().get_ID();
boolean loadedOK = win.initWindow(AD_Window_ID, MQuery.getEqualQuery("AD_PrintFormat_ID", AD_PrintFormat_ID));
if (loadedOK)

15
org.adempiere.ui.swing/src/org/eevolution/form/VInOutInvoiceGen.java
View File

@ -58,6 +58,7 @@ import org.compiere.model.MPInstance;
import org.compiere.model.MPInstancePara;
import org.compiere.model.MPrivateAccess;
import org.compiere.model.MRMA;
import org.compiere.model.SystemIDs;
import org.compiere.plaf.CompiereColor;
import org.compiere.print.ReportCtl;
import org.compiere.print.ReportEngine;
@ -83,7 +84,7 @@ import org.compiere.util.Trx;
*/
public class VInOutInvoiceGen extends CPanel
implements FormPanel, ActionListener, VetoableChangeListener,
ChangeListener, TableModelListener, IProcessMonitor
ChangeListener, TableModelListener, IProcessMonitor, SystemIDs
{
/**
*
@ -534,11 +535,11 @@ public class VInOutInvoiceGen extends CPanel
if (docTypeKNPair.getKey() == MRMA.Table_ID)
{
AD_Process_ID = 52001; // M_InOut_GenerateRMA - org.adempiere.process.InOutGenerateRMA
AD_Process_ID = PROCESS_M_INOUT_GENERATERMA_MANUAL; // M_InOut_GenerateRMA - org.adempiere.process.InOutGenerateRMA
}
else
{
AD_Process_ID = 199; // M_InOut_Generate - org.compiere.process.InOutGenerate
AD_Process_ID = PROCESS_M_INOUT_GENERATE_MANUAL; // M_InOut_Generate - org.compiere.process.InOutGenerate
}
MPInstance instance = new MPInstance(Env.getCtx(), AD_Process_ID, 0);
@ -702,11 +703,11 @@ public class VInOutInvoiceGen extends CPanel
if (docTypeKNPair.getKey() == MRMA.Table_ID)
{
AD_Process_ID = 52002; // C_Invoice_GenerateRMA - org.adempiere.process.InvoiceGenerateRMA
AD_Process_ID = PROCESS_C_INVOICE_GENERATERMA_MANUAL; // C_Invoice_GenerateRMA - org.adempiere.process.InvoiceGenerateRMA
}
else
{
AD_Process_ID = 134; // HARDCODED C_InvoiceCreate
AD_Process_ID = PROCESS_C_INVOICE_GENERATE_MANUAL; // HARDCODED C_InvoiceCreate
}
MPInstance instance = new MPInstance(Env.getCtx(), AD_Process_ID, 0);
if (!instance.save())
@ -864,12 +865,12 @@ public class VInOutInvoiceGen extends CPanel
public void unlockUI (ProcessInfo pi)
{
//
if(pi.getAD_Process_ID() == 199)
if(pi.getAD_Process_ID() == PROCESS_M_INOUT_GENERATE_MANUAL)
{
generateShipments_complete(pi);
generateInvoices ();
}
if(pi.getAD_Process_ID() == 134)
if(pi.getAD_Process_ID() == PROCESS_C_INVOICE_GENERATE_MANUAL)
{
generateInvoice_complete(pi);
this.setEnabled(true);

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WArchive.java
View File

@ -9,6 +9,7 @@ import org.adempiere.webui.component.Window;
import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.session.SessionManager;
import org.compiere.model.MBPartner;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -27,7 +28,7 @@ import org.zkoss.zul.Menupopup;
* @author Jorg Janke
* @version $Id: AArchive.java,v 1.2 2006/07/30 00:51:27 jjanke Exp $
*/
public class WArchive implements EventListener
public class WArchive implements EventListener, SystemIDs
{
/**
* Constructor
@ -153,7 +154,7 @@ public class WArchive implements EventListener
{
if (e.getTarget() instanceof Menuitem)
{
int AD_Form_ID = 118; // ArchiveViewer
int AD_Form_ID = FORM_ARCHIVEVIEWER; // ArchiveViewer
ADForm form = ADForm.openForm(AD_Form_ID);
WArchiveViewer av = (WArchiveViewer) form.getICustomForm();

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java
View File

@ -35,6 +35,7 @@ import org.compiere.model.MQuery;
import org.compiere.model.MRMA;
import org.compiere.model.MRequest;
import org.compiere.model.MUser;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env;
@ -56,7 +57,7 @@ import org.zkoss.zul.Menupopup;
* @author Teo Sarca, SC ARHIPAC SERVICE SRL
* <li>BF [ 1904928 ] Request: Related Request field not filled
*/
public class WRequest implements EventListener
public class WRequest implements EventListener, SystemIDs
{
/**
* Constructor
@ -204,7 +205,7 @@ public class WRequest implements EventListener
query.setRecordCount(0);
}
int AD_Window_ID = 232; // 232=all - 201=my
int AD_Window_ID = WINDOW_REQUESTS_ALL; // 232=all - 201=my
ADWindow frame = SessionManager.getAppDesktop().openWindow(AD_Window_ID, query);
if(frame == null)
return;

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java
View File

@ -38,6 +38,7 @@ import org.compiere.model.MAcctSchemaElement;
import org.compiere.model.MFactAcct;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MRefList;
import org.compiere.model.SystemIDs;
import org.compiere.report.core.RColumn;
import org.compiere.report.core.RModel;
import org.compiere.util.CLogger;
@ -57,7 +58,7 @@ import org.compiere.util.ValueNamePair;
* July 27, 2007
*/
public class WAcctViewerData
public class WAcctViewerData implements SystemIDs
{
/** Window */
public int WindowNo;
@ -199,7 +200,7 @@ public class WAcctViewerData
protected void fillPostingType (Listbox cb)
{
int AD_Reference_ID = 125;
int AD_Reference_ID = REFERENCE_POSTING_TYPE;
ValueNamePair[] pt = MRefList.getList(Env.getCtx(), AD_Reference_ID, true);
for (int i = 0; i < pt.length; i++)

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -22,6 +22,7 @@ import org.adempiere.webui.process.WProcessInfo;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.window.FDialog;
import org.adempiere.webui.window.SimplePDFViewer;
import org.compiere.model.SystemIDs;
import org.compiere.print.ReportEngine;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil;
@ -78,7 +79,7 @@ import com.lowagie.text.pdf.PdfWriter;
* @author arboleda - globalqss
* - Implement ShowHelp option on processes and reports
*/
public class ProcessDialog extends Window implements EventListener<Event>, IProcessMonitor
public class ProcessDialog extends Window implements EventListener<Event>, IProcessMonitor, SystemIDs
{
/**
* generate serial version ID
@ -474,9 +475,9 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
{
log.config("");
// Print invoices
if (m_AD_Process_ID == 119)
if (m_AD_Process_ID == PROCESS_C_INVOICE_GENERATE)
printInvoices();
else if (m_AD_Process_ID == 118)
else if (m_AD_Process_ID == PROCESS_M_INOUT_GENERATE)
printShipments();
}

9
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java
View File

@ -47,6 +47,7 @@ import org.adempiere.webui.window.FDialog;
import org.compiere.apps.form.Allocation;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
import org.compiere.util.Msg;
@ -69,7 +70,7 @@ import org.zkoss.zul.Space;
* Contributor : Fabian Aguilar - OFBConsulting - Multiallocation
*/
public class WAllocation extends Allocation
implements IFormController, EventListener, WTableModelListener, ValueChangeListener
implements IFormController, EventListener, WTableModelListener, ValueChangeListener, SystemIDs
{
/**
@ -294,21 +295,21 @@ public class WAllocation extends Allocation
public void dynInit() throws Exception
{
// Currency
int AD_Column_ID = 3505; // C_Invoice.C_Currency_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_CURRENCY_ID; // C_Invoice.C_Currency_ID
MLookup lookupCur = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir);
currencyPick = new WTableDirEditor("C_Currency_ID", true, false, true, lookupCur);
currencyPick.setValue(new Integer(m_C_Currency_ID));
currencyPick.addValueChangeListener(this);
// Organization filter selection
AD_Column_ID = 839; //C_Period.AD_Org_ID (needed to allow org 0)
AD_Column_ID = COLUMN_C_PERIOD_AD_ORG_ID; //C_Period.AD_Org_ID (needed to allow org 0)
MLookup lookupOrg = MLookupFactory.get(Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir);
organizationPick = new WTableDirEditor("AD_Org_ID", true, false, true, lookupOrg);
organizationPick.setValue(Env.getAD_Org_ID(Env.getCtx()));
organizationPick.addValueChangeListener(this);
// BPartner
AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookupBP = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.Search);
bpartnerSearch = new WSearchEditor("C_BPartner_ID", true, false, true, lookupBP);
bpartnerSearch.addValueChangeListener(this);

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java
View File

@ -37,6 +37,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MDocType;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -48,7 +49,7 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Space;
public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventListener, ValueChangeListener
public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventListener, ValueChangeListener, SystemIDs
{
private static final long serialVersionUID = 1L;
@ -246,7 +247,7 @@ public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventList
protected void initBPartner (boolean forInvoice) throws Exception
{
// load BPartner
int AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.Search);
bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup);
//

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java
View File

@ -32,6 +32,7 @@ import org.compiere.grid.CreateFromRMA;
import org.compiere.model.GridTab;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -39,7 +40,7 @@ import org.compiere.util.Msg;
import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListener
public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListener, SystemIDs
{
private static final long serialVersionUID = 1L;
@ -148,7 +149,7 @@ public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListen
protected void initBPartner (boolean forInvoice) throws Exception
{
// load BPartner
int AD_Column_ID = 3499; // C_Invoice.C_BPartner_ID
int AD_Column_ID = COLUMN_C_INVOICE_C_BPARTNER_ID; // C_Invoice.C_BPartner_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.Search);
bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup);
//

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java
View File

@ -45,6 +45,7 @@ import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MProduct;
import org.compiere.model.MRMA;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -57,11 +58,8 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Space;
public class WCreateFromShipmentUI extends CreateFromShipment implements EventListener, ValueChangeListener
public class WCreateFromShipmentUI extends CreateFromShipment implements EventListener, ValueChangeListener, SystemIDs
{
private static final int WINDOW_CUSTOMER_RETURN = 53097;
private static final int WINDOW_RETURN_TO_VENDOR = 53098;
private WCreateFromWindow window;
@ -149,7 +147,7 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi
protected void zkInit() throws Exception
{
boolean isRMAWindow = ((getGridTab().getAD_Window_ID() == WINDOW_RETURN_TO_VENDOR) || (getGridTab().getAD_Window_ID() == WINDOW_CUSTOMER_RETURN));
boolean isRMAWindow = ((getGridTab().getAD_Window_ID() == WINDOW_RETURNTOVENDOR) || (getGridTab().getAD_Window_ID() == WINDOW_CUSTOMERRETURN));
bPartnerLabel.setText(Msg.getElement(Env.getCtx(), "C_BPartner_ID"));
orderLabel.setText(Msg.getElement(Env.getCtx(), "C_Order_ID", false));

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java
View File

@ -44,6 +44,7 @@ import org.compiere.model.MColumn;
import org.compiere.model.MLookup;
import org.compiere.model.MLookupFactory;
import org.compiere.model.MPayment;
import org.compiere.model.SystemIDs;
import org.compiere.util.CLogger;
import org.compiere.util.DisplayType;
import org.compiere.util.Env;
@ -55,7 +56,7 @@ import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
public class WCreateFromStatementUI extends CreateFromStatement implements EventListener
public class WCreateFromStatementUI extends CreateFromStatement implements EventListener, SystemIDs
{
private static final long serialVersionUID = 1L;
@ -143,7 +144,7 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event
window.setTitle(getTitle());
int AD_Column_ID = 4917; // C_BankStatement.C_BankAccount_ID
int AD_Column_ID = COLUMN_C_BANKSTATEMENT_C_BANKACCOUNT_ID; // C_BankStatement.C_BankAccount_ID
MLookup lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, AD_Column_ID, DisplayType.TableDir);
bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup);
// Set Default

Some files were not shown because too many files have changed in this diff Show More