Merge 1fef42f71f7c

This commit is contained in:
Heng Sin Low 2013-06-19 11:00:12 +08:00
commit b5ad2e2e39
9 changed files with 100 additions and 2 deletions

View File

@ -0,0 +1,8 @@
-- Jun 18, 2013 9:32:05 AM COT
-- IDEMPIERE-234 Configure Toolbar by User, by Window, by Tab and configure new buttons and new toolbars
UPDATE AD_Val_Rule SET Code='AD_ToolbarButton.Action=''@Action@'' AND (AD_ToolbarButton.AD_Tab_ID IS NULL OR AD_ToolbarButton.AD_Tab_ID=@AD_Tab_ID@)',Updated=TO_DATE('2013-06-18 09:32:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200011
;
SELECT register_migration_script('201306180932_IDEMPIERE-234.sql') FROM dual
;

View File

@ -0,0 +1,13 @@
-- Jun 18, 2013 12:06:03 PM COT
-- IDEMPIERE-362 Hide things that don't work on iDempiere
UPDATE AD_Field SET SeqNo=110,Updated=TO_DATE('2013-06-18 12:06:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201805
;
-- Jun 18, 2013 12:06:03 PM COT
-- IDEMPIERE-362 Hide things that don't work on iDempiere
UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_DATE('2013-06-18 12:06:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10957
;
SELECT register_migration_script('201306181225_IDEMPIERE-362.sql') FROM dual
;

View File

@ -0,0 +1,20 @@
-- 18/06/2013 03:23:38 PM COT
-- Missing messages on IDEMPIERE-669 and IDEMPIERE-390
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Feedback',200183,'D','1a527fd5-a578-44de-903f-04c133157d8c','Feedback','Y',TO_DATE('2013-06-18 15:23:36','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-06-18 15:23:36','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 18/06/2013 03:23:38 PM COT
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200183 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- 18/06/2013 03:24:07 PM COT
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Delete All',200184,'D','14f35a04-d7d8-4eee-8b68-2b4d2b94f73d','DeleteAll','Y',TO_DATE('2013-06-18 15:24:06','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_DATE('2013-06-18 15:24:06','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 18/06/2013 03:24:07 PM COT
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200184 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
SELECT register_migration_script('201306181524_IDEMPIERE-669_390.sql') FROM dual
;

View File

@ -0,0 +1,8 @@
-- Jun 18, 2013 5:43:29 PM COT
-- IDEMPIERE-162 Let Process Role Access Update honor previous modifications to permissions
UPDATE AD_Process_Para SET IsMandatory='Y', DefaultValue='N',Updated=TO_DATE('2013-06-18 17:43:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200007
;
SELECT register_migration_script('201306181743_IDEMPIERE-162.sql') FROM dual
;

View File

@ -0,0 +1,8 @@
-- Jun 18, 2013 9:32:05 AM COT
-- IDEMPIERE-234 Configure Toolbar by User, by Window, by Tab and configure new buttons and new toolbars
UPDATE AD_Val_Rule SET Code='AD_ToolbarButton.Action=''@Action@'' AND (AD_ToolbarButton.AD_Tab_ID IS NULL OR AD_ToolbarButton.AD_Tab_ID=@AD_Tab_ID@)',Updated=TO_TIMESTAMP('2013-06-18 09:32:05','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=200011
;
SELECT register_migration_script('201306180932_IDEMPIERE-234.sql') FROM dual
;

View File

@ -0,0 +1,13 @@
-- Jun 18, 2013 12:06:03 PM COT
-- IDEMPIERE-362 Hide things that don't work on iDempiere
UPDATE AD_Field SET SeqNo=110,Updated=TO_TIMESTAMP('2013-06-18 12:06:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=201805
;
-- Jun 18, 2013 12:06:03 PM COT
-- IDEMPIERE-362 Hide things that don't work on iDempiere
UPDATE AD_Field SET SeqNo=0, IsDisplayed='N', XPosition=1,Updated=TO_TIMESTAMP('2013-06-18 12:06:03','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=10957
;
SELECT register_migration_script('201306181225_IDEMPIERE-362.sql') FROM dual
;

View File

@ -0,0 +1,20 @@
-- 18/06/2013 03:23:38 PM COT
-- Missing messages on IDEMPIERE-669 and IDEMPIERE-390
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Feedback',200183,'D','1a527fd5-a578-44de-903f-04c133157d8c','Feedback','Y',TO_TIMESTAMP('2013-06-18 15:23:36','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-06-18 15:23:36','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 18/06/2013 03:23:38 PM COT
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200183 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
-- 18/06/2013 03:24:07 PM COT
INSERT INTO AD_Message (MsgType,MsgText,AD_Message_ID,EntityType,AD_Message_UU,Value,IsActive,Updated,CreatedBy,UpdatedBy,AD_Org_ID,Created,AD_Client_ID) VALUES ('I','Delete All',200184,'D','14f35a04-d7d8-4eee-8b68-2b4d2b94f73d','DeleteAll','Y',TO_TIMESTAMP('2013-06-18 15:24:06','YYYY-MM-DD HH24:MI:SS'),100,100,0,TO_TIMESTAMP('2013-06-18 15:24:06','YYYY-MM-DD HH24:MI:SS'),0)
;
-- 18/06/2013 03:24:07 PM COT
INSERT INTO AD_Message_Trl (AD_Language,AD_Message_ID, MsgText,MsgTip, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Message_Trl_UU ) SELECT l.AD_Language,t.AD_Message_ID, t.MsgText,t.MsgTip, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Message t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Message_ID=200184 AND NOT EXISTS (SELECT * FROM AD_Message_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Message_ID=t.AD_Message_ID)
;
SELECT register_migration_script('201306181524_IDEMPIERE-669_390.sql') FROM dual
;

View File

@ -0,0 +1,8 @@
-- Jun 18, 2013 5:43:29 PM COT
-- IDEMPIERE-162 Let Process Role Access Update honor previous modifications to permissions
UPDATE AD_Process_Para SET IsMandatory='Y', DefaultValue='N',Updated=TO_TIMESTAMP('2013-06-18 17:43:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Process_Para_ID=200007
;
SELECT register_migration_script('201306181743_IDEMPIERE-162.sql') FROM dual
;

View File

@ -277,7 +277,7 @@ public final class Msg
//
if (retStr == null || retStr.length() == 0)
{
if (s_log.isLoggable(Level.INFO)) s_log.info("NOT found: " + AD_Message);
s_log.warning("NOT found: " + AD_Message);
return AD_Message;
}
@ -434,7 +434,7 @@ public final class Msg
}
catch (ClassNotFoundException e)
{
if (s_log.isLoggable(Level.FINER))s_log.log(Level.FINER, "Class not found: " + className);
s_log.warning("Class not found: " + className);
}
catch (Exception e)
{