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

hg merge 958f9fad5398

This commit is contained in:
Carlos Ruiz 2012-10-16 08:36:25 -05:00
parent 4d56084f3f dbf854396a
commit 650f1344fd
9 changed files with 332 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/360lts-release/oracle/934_IDEMPIERE-389.sql
View File

@ -1,6 +1,6 @@
-- Oct 15, 2012 6:21:27 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ServerName',200182,'Load balancing instance name','U','Server Name','Server Name','7bd7b80a-d97d-4643-8d69-e2856a2a144a',0,TO_DATE('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ServerName',200182,'Node instance name','D','Server Name','Server Name','7bd7b80a-d97d-4643-8d69-e2856a2a144a',0,TO_DATE('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
;
-- Oct 15, 2012 6:21:27 PM IST
@ -10,7 +10,7 @@ INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_He
-- Oct 15, 2012 6:22:04 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,566,200613,'U','N','N','N',0,'N',40,'Y',14,'N','N',200182,'N','Y','14d3c02e-9f80-40cb-8507-e040fbaf3ef6','N','Y','N','ServerName','Load balancing instance name','Server Name','Y',100,TO_DATE('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),100,0,0)
INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,566,200613,'D','N','N','N',0,'N',80,'Y',14,'N','N',200182,'N','Y','14d3c02e-9f80-40cb-8507-e040fbaf3ef6','N','Y','N','ServerName','Node instance name','Server Name','Y',100,TO_DATE('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),100,0,0)
;
-- Oct 15, 2012 6:22:04 PM IST
@ -20,7 +20,7 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien
-- Oct 15, 2012 6:22:45 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
ALTER TABLE AD_Session ADD ServerName NVARCHAR2(40) DEFAULT NULL
ALTER TABLE AD_Session ADD ServerName NVARCHAR2(80) DEFAULT NULL
;
SELECT register_migration_script('934_IDEMPIERE-389.sql') FROM dual

133
migration/360lts-release/oracle/936_IDEMPIERE-389_ServerName_Field.sql Normal file
View File

@ -0,0 +1,133 @@
-- Oct 16, 2012 11:39:49 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',475,36,'N','N',60501,'Y',200638,'N','D','AD_Session_UU','N','Y','bf38a28b-bfab-4c21-8626-18322acd7807',100,0,TO_DATE('2012-10-16 11:39:47','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-10-16 11:39:47','YYYY-MM-DD HH24:MI:SS'),'Y')
;
-- Oct 16, 2012 11:39:49 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200638 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)
;
-- Oct 16, 2012 11:39:50 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',475,40,'N','N',200613,'Y',200639,'N','Node instance name','D','Server Name','N','Y','7b8abf7a-5cb6-4d8e-9ed4-a0191ea16c7f',100,0,TO_DATE('2012-10-16 11:39:49','YYYY-MM-DD HH24:MI:SS'),0,100,TO_DATE('2012-10-16 11:39:49','YYYY-MM-DD HH24:MI:SS'),'Y')
;
-- Oct 16, 2012 11:39:50 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200639 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)
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=6620
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=54394
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=54395
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=54393
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=6622
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=200638
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=6620
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=54394
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=54395
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=54393
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=6622
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=200638
;
-- Oct 16, 2012 12:03:37 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET IsSameLine='Y',Updated=TO_DATE('2012-10-16 12:03:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:04:28 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET XPosition=3,Updated=TO_DATE('2012-10-16 12:04:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:05:12 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET XPosition=1,Updated=TO_DATE('2012-10-16 12:05:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:05:44 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET IsSameLine='N',Updated=TO_DATE('2012-10-16 12:05:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:06:43 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET IsSameLine='Y', XPosition=4,Updated=TO_DATE('2012-10-16 12:06:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6620
;
-- Oct 16, 2012 12:11:26 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=110, XPosition=1,Updated=TO_DATE('2012-10-16 12:11:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54394
;
-- Oct 16, 2012 12:11:43 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=100,Updated=TO_DATE('2012-10-16 12:11:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54395
;
-- Oct 16, 2012 12:12:44 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET XPosition=4,Updated=TO_DATE('2012-10-16 12:12:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54394
;
SELECT register_migration_script('936_IDEMPIERE-389_ServerName_Field.sql') FROM dual
;

6
migration/360lts-release/postgresql/934_IDEMPIERE-389.sql
View File

@ -1,6 +1,6 @@
-- Oct 15, 2012 6:21:27 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ServerName',200182,'Load balancing instance name','U','Server Name','Server Name','7bd7b80a-d97d-4643-8d69-e2856a2a144a',0,TO_TIMESTAMP('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
INSERT INTO AD_Element (ColumnName,AD_Element_ID,Help,EntityType,Name,PrintName,AD_Element_UU,AD_Client_ID,Created,Updated,AD_Org_ID,CreatedBy,UpdatedBy,IsActive) VALUES ('ServerName',200182,'Node instance name','D','Server Name','Server Name','7bd7b80a-d97d-4643-8d69-e2856a2a144a',0,TO_TIMESTAMP('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2012-10-15 18:21:26','YYYY-MM-DD HH24:MI:SS'),0,100,100,'Y')
;
-- Oct 15, 2012 6:21:27 PM IST
@ -10,7 +10,7 @@ INSERT INTO AD_Element_Trl (AD_Language,AD_Element_ID, Help,PO_Description,PO_He
-- Oct 15, 2012 6:22:04 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,566,200613,'U','N','N','N',0,'N',40,'Y',14,'N','N',200182,'N','Y','14d3c02e-9f80-40cb-8507-e040fbaf3ef6','N','Y','N','ServerName','Load balancing instance name','Server Name','Y',100,TO_TIMESTAMP('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),100,0,0)
INSERT INTO AD_Column (Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,SeqNo,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsSyncDatabase,IsKey,AD_Element_ID,IsAutocomplete,IsAllowLogging,AD_Column_UU,IsEncrypted,IsUpdateable,IsAlwaysUpdateable,ColumnName,Help,Name,IsAllowCopy,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,SeqNoSelection) VALUES (0,566,200613,'D','N','N','N',0,'N',80,'Y',14,'N','N',200182,'N','Y','14d3c02e-9f80-40cb-8507-e040fbaf3ef6','N','Y','N','ServerName','Node instance name','Server Name','Y',100,TO_TIMESTAMP('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-10-15 18:22:03','YYYY-MM-DD HH24:MI:SS'),100,0,0)
;
-- Oct 15, 2012 6:22:04 PM IST
@ -20,7 +20,7 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien
-- Oct 15, 2012 6:22:45 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
ALTER TABLE AD_Session ADD COLUMN ServerName VARCHAR(40) DEFAULT NULL
ALTER TABLE AD_Session ADD COLUMN ServerName VARCHAR(80) DEFAULT NULL
;
SELECT register_migration_script('934_IDEMPIERE-389.sql') FROM dual

133
migration/360lts-release/postgresql/936_IDEMPIERE-389_ServerName_Field.sql Normal file
View File

@ -0,0 +1,133 @@
-- Oct 16, 2012 11:39:49 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',475,36,'N','N',60501,'Y',200638,'N','D','AD_Session_UU','N','Y','bf38a28b-bfab-4c21-8626-18322acd7807',100,0,TO_TIMESTAMP('2012-10-16 11:39:47','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-10-16 11:39:47','YYYY-MM-DD HH24:MI:SS'),'Y')
;
-- Oct 16, 2012 11:39:49 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200638 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)
;
-- Oct 16, 2012 11:39:50 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field (IsEncrypted,AD_Tab_ID,DisplayLength,IsSameLine,IsHeading,AD_Column_ID,IsCentrallyMaintained,AD_Field_ID,IsReadOnly,Help,EntityType,Name,IsFieldOnly,IsDisplayed,AD_Field_UU,UpdatedBy,AD_Org_ID,Created,AD_Client_ID,CreatedBy,Updated,IsActive) VALUES ('N',475,40,'N','N',200613,'Y',200639,'N','Node instance name','D','Server Name','N','Y','7b8abf7a-5cb6-4d8e-9ed4-a0191ea16c7f',100,0,TO_TIMESTAMP('2012-10-16 11:39:49','YYYY-MM-DD HH24:MI:SS'),0,100,TO_TIMESTAMP('2012-10-16 11:39:49','YYYY-MM-DD HH24:MI:SS'),'Y')
;
-- Oct 16, 2012 11:39:50 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Help,Description,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Field_Trl_UU ) SELECT l.AD_Language,t.AD_Field_ID, t.Help,t.Description,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=200639 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)
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=80,IsDisplayedGrid='Y' WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=90,IsDisplayedGrid='Y' WHERE AD_Field_ID=6620
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=100,IsDisplayedGrid='Y' WHERE AD_Field_ID=54394
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=110,IsDisplayedGrid='Y' WHERE AD_Field_ID=54395
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=120,IsDisplayedGrid='Y' WHERE AD_Field_ID=54393
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=130,IsDisplayedGrid='Y' WHERE AD_Field_ID=6622
;
-- Oct 16, 2012 11:42:31 AM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNoGrid=140,IsDisplayedGrid='Y' WHERE AD_Field_ID=200638
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=80,IsDisplayed='Y' WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=90,IsDisplayed='Y' WHERE AD_Field_ID=6620
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=100,IsDisplayed='Y' WHERE AD_Field_ID=54394
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=110,IsDisplayed='Y' WHERE AD_Field_ID=54395
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=120,IsDisplayed='Y' WHERE AD_Field_ID=54393
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=130,IsDisplayed='Y' WHERE AD_Field_ID=6622
;
-- Oct 16, 2012 12:01:13 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=140,IsDisplayed='Y' WHERE AD_Field_ID=200638
;
-- Oct 16, 2012 12:03:37 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET IsSameLine='Y',Updated=TO_TIMESTAMP('2012-10-16 12:03:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:04:28 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET XPosition=3,Updated=TO_TIMESTAMP('2012-10-16 12:04:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:05:12 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET XPosition=1,Updated=TO_TIMESTAMP('2012-10-16 12:05:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:05:44 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET IsSameLine='N',Updated=TO_TIMESTAMP('2012-10-16 12:05:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=200639
;
-- Oct 16, 2012 12:06:43 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET IsSameLine='Y', XPosition=4,Updated=TO_TIMESTAMP('2012-10-16 12:06:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=6620
;
-- Oct 16, 2012 12:11:26 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=110, XPosition=1,Updated=TO_TIMESTAMP('2012-10-16 12:11:26','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54394
;
-- Oct 16, 2012 12:11:43 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET SeqNo=100,Updated=TO_TIMESTAMP('2012-10-16 12:11:43','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54395
;
-- Oct 16, 2012 12:12:44 PM IST
-- IDEMPIERE-389 Adding server name on AD_Session
UPDATE AD_Field SET XPosition=4,Updated=TO_TIMESTAMP('2012-10-16 12:12:44','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54394
;
SELECT register_migration_script('936_IDEMPIERE-389_ServerName_Field.sql') FROM dual
;

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

@ -27,6 +27,7 @@ import org.compiere.util.CCache;
import org.compiere.util.Env;
import org.compiere.util.Ini;
import org.compiere.util.TimeUtil;
import org.compiere.util.WebUtil;
/**
* Session Model.
@ -148,7 +149,8 @@ public class MSession extends X_AD_Session
public MSession (Properties ctx, String Remote_Addr, String Remote_Host, String WebSession, String trxName)
{
this (ctx, 0, trxName);
setServerName(Ini.getProperties().getProperty("ServerName"));
setServerName(WebUtil.getServerName());
if (Remote_Addr != null)
setRemote_Addr(Remote_Addr);
if (Remote_Host != null)
@ -173,7 +175,7 @@ public class MSession extends X_AD_Session
try
{
InetAddress lh = InetAddress.getLocalHost();
setServerName(Ini.getProperties().getProperty("ServerName"));
setServerName(WebUtil.getServerName());
setRemote_Addr(lh.getHostAddress());
setRemote_Host(lh.getHostName());
setDescription(Adempiere.MAIN_VERSION + "_"

29
org.adempiere.base/src/org/compiere/util/WebUtil.java
View File

@ -24,8 +24,10 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.InetAddress;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.DecimalFormat;
@ -1250,4 +1252,31 @@ public final class WebUtil
}
return wu.save();
} // updateFields
/**
*
* @return Servername including host name: IP : instance name
*/
public static String getServerName(){
StringBuilder strBuilder = new StringBuilder();
String serverName = Ini.getProperties().getProperty("ServerName");
try {
strBuilder.append(InetAddress.getLocalHost().getHostName());
} catch (UnknownHostException e) {
log.log(Level.WARNING, "Local host or IP not found", e);
}
strBuilder.append(":");
try {
strBuilder.append(InetAddress.getLocalHost().getHostAddress());
} catch (UnknownHostException e) {
log.log(Level.WARNING, "Local host or IP not found", e);
}
strBuilder.append(":");
if(serverName!=null)
strBuilder.append(serverName);
return strBuilder.toString();
}
} // WUtil

49
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADSortTab.java
View File

@ -41,13 +41,13 @@ import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.NamePair;
import org.zkoss.zhtml.Span;
import org.zkoss.zk.au.out.AuFocus;
import org.zkoss.zk.ui.event.DropEvent;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Hlayout;
import org.zkoss.zul.Vbox;
import org.zkoss.zul.event.ListDataEvent;
@ -86,8 +86,8 @@ public class ADSortTab extends Panel implements IADTabpanel
this.gridTab = gridTab;
m_AD_Table_ID = gridTab.getAD_Table_ID();
this.setHeight("100%");
} // VSortTab
this.setVflex("true");
} // ADSortTab
/** Logger */
static CLogger log = CLogger.getCLogger(ADSortTab.class);
@ -254,13 +254,10 @@ public class ADSortTab extends Panel implements IADTabpanel
*/
private void init() throws Exception
{
this.setStyle("height: 100%; width: 100%;");
//
noLabel.setValue("No");
yesLabel.setValue("Yes");
yesList.setHeight("100%");
noList.setHeight("100%");
yesList.setVflex(true);
noList.setVflex(true);
@ -287,10 +284,10 @@ public class ADSortTab extends Panel implements IADTabpanel
yesList.setSeltype("multiple");
noList.setSeltype("multiple");
bAdd.setImage("images/Detail24.png");
bAdd.setImage("images/Next24.png");
bAdd.addEventListener(Events.ON_CLICK, actionListener);
bRemove.setImage("images/Parent24.png");
bRemove.setImage("images/Previous24.png");
bRemove.addEventListener(Events.ON_CLICK, actionListener);
EventListener crossListMouseListener = new DragListener();
@ -306,10 +303,10 @@ public class ADSortTab extends Panel implements IADTabpanel
}
};
bUp.setImage("images/Previous24.png");
bUp.setImage("images/Parent24.png");
bUp.addEventListener(Events.ON_CLICK, actionListener);
bDown.setImage("images/Next24.png");
bDown.setImage("images/Detail24.png");
bDown.addEventListener(Events.ON_CLICK, actionListener);
EventListener yesListMouseMotionListener = new EventListener()
@ -354,29 +351,28 @@ public class ADSortTab extends Panel implements IADTabpanel
listHeader.appendChild(noLabel);
listHeader.setParent(listHead);
Span span = new Span();
span.setParent(this);
span.setStyle("height: 99%; display: inline-block; width: 40%;");
span.appendChild(noList);
Hlayout hlayout = new Hlayout();
hlayout.setVflex("true");
hlayout.setHflex("true");
hlayout.setStyle("margin: auto;");
appendChild(hlayout);
noList.setHflex("1");
noList.setVflex(true);
hlayout.appendChild(noList);
Vbox vbox = new Vbox();
vbox.appendChild(bAdd);
vbox.appendChild(bRemove);
span = new Span();
span.setParent(this);
span.setStyle("height: 99%; display: inline-block; width: 46px");
span.appendChild(vbox);
vbox.setWidth("46px");
hlayout.appendChild(vbox);
span = new Span();
span.setParent(this);
span.setStyle("height: 99%; display: inline-block; width: 40%");
span.appendChild(yesList);
yesList.setVflex(true);
yesList.setHflex("1");
hlayout.appendChild(yesList);
vbox = new Vbox();
vbox.appendChild(bUp);
vbox.appendChild(bDown);
span = new Span();
span.setParent(this);
span.setStyle("height: 99%; display: inline-block; width: 46px");
span.appendChild(vbox);
vbox.setWidth("46px");
hlayout.appendChild(vbox);
} // Init
/* (non-Javadoc)
@ -933,6 +929,7 @@ public class ADSortTab extends Panel implements IADTabpanel
@Override
public void setDetailPaneMode(boolean detailMode, boolean vflex) {
this.setVflex(Boolean.toString(vflex));
}
} //ADSortTab

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -95,6 +95,7 @@ import org.zkoss.zk.ui.Session;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Button;
import org.zkoss.zul.Column;
import org.zkoss.zul.Columns;
@ -1580,7 +1581,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
}
if (dirtyTabpanel != null) {
if (dirtyTabpanel == adTabbox.getSelectedDetailADTabpanel())
onDetailRecord();
Clients.scrollIntoView(dirtyTabpanel);
focusToTabpanel(dirtyTabpanel);
} else {
focusToActivePanel();

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

@ -593,14 +593,14 @@ public class CompositeADTabbox extends AbstractADTabbox
@Override
public boolean dataSave(boolean onSaveEvent) {
IADTabpanel detail = getSelectedDetailADTabpanel();
if (detail != null && detail.getGridTab().needSave(true, true)) {
if (detail != null && !detail.getGridTab().isSortTab() && detail.getGridTab().needSave(true, true)) {
Execution execution = Executions.getCurrent();
if (execution != null) {
execution.setAttribute(getClass().getName()+".dataAction", detail.getUuid());
}
return detail.getGridTab().dataSave(onSaveEvent);
}
return headerTab.getGridTab().dataSave(onSaveEvent);
return headerTab.getGridTab().isSortTab() ? true : headerTab.getGridTab().dataSave(onSaveEvent);
}
@Override
@ -637,7 +637,6 @@ public class CompositeADTabbox extends AbstractADTabbox
if (tabPanel instanceof ADSortTab) {
detailPane.invalidate();
detailPane.updateToolbar(false, true);
onDetailRecord();
}
}