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

merge release2

This commit is contained in:
Carlos Ruiz 2013-11-07 11:16:15 -05:00
parent 5a8a5e05cd 3575597cf6
commit 0c936fe980
5 changed files with 95 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
migration/i2.0/oracle/201311061521_IDEMPIERE-1184.sql Normal file
View File

@ -0,0 +1,15 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Nov 6, 2013 3:18:14 PM COT
-- IDEMPIERE-1184 Register browser information available on AD_Session
UPDATE AD_Column SET AD_Reference_ID=14,Updated=TO_DATE('2013-11-06 15:18:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54349
;
-- Nov 6, 2013 3:18:29 PM COT
UPDATE AD_Field SET NumLines=8,Updated=TO_DATE('2013-11-06 15:18:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54393
;
SELECT register_migration_script('201311061521_IDEMPIERE-1184.sql') FROM dual
;

35
migration/i2.0/oracle/201311061531_IDEMPIERE-1362.sql Normal file
View File

@ -0,0 +1,35 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Nov 6, 2013 3:30:58 PM COT
-- IDEMPIERE-1362 Implement support to register/unregister available dashboard content
UPDATE AD_Element SET Name='Show on Login', PrintName='Show on Login',Updated=TO_DATE('2013-11-06 15:30:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202569
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Column SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Element_ID=202569
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Process_Para SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL, AD_Element_ID=202569 WHERE UPPER(ColumnName)='ISSHOWINLOGIN' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Process_Para SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Element_ID=202569 AND IsCentrallyMaintained='Y'
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_InfoColumn SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Element_ID=202569 AND IsCentrallyMaintained='Y'
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Field SET Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=202569) AND IsCentrallyMaintained='Y'
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_PrintFormatItem SET PrintName='Show on Login', Name='Show on Login' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=202569)
;
SELECT register_migration_script('201311061531_IDEMPIERE-1362.sql') FROM dual
;

12
migration/i2.0/postgresql/201311061521_IDEMPIERE-1184.sql Normal file
View File

@ -0,0 +1,12 @@
-- Nov 6, 2013 3:18:14 PM COT
-- IDEMPIERE-1184 Register browser information available on AD_Session
UPDATE AD_Column SET AD_Reference_ID=14,Updated=TO_TIMESTAMP('2013-11-06 15:18:14','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=54349
;
-- Nov 6, 2013 3:18:29 PM COT
UPDATE AD_Field SET NumLines=8,Updated=TO_TIMESTAMP('2013-11-06 15:18:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=54393
;
SELECT register_migration_script('201311061521_IDEMPIERE-1184.sql') FROM dual
;

32
migration/i2.0/postgresql/201311061531_IDEMPIERE-1362.sql Normal file
View File

@ -0,0 +1,32 @@
-- Nov 6, 2013 3:30:58 PM COT
-- IDEMPIERE-1362 Implement support to register/unregister available dashboard content
UPDATE AD_Element SET Name='Show on Login', PrintName='Show on Login',Updated=TO_TIMESTAMP('2013-11-06 15:30:58','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=202569
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Column SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Element_ID=202569
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Process_Para SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL, AD_Element_ID=202569 WHERE UPPER(ColumnName)='ISSHOWINLOGIN' AND IsCentrallyMaintained='Y' AND AD_Element_ID IS NULL
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Process_Para SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Element_ID=202569 AND IsCentrallyMaintained='Y'
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_InfoColumn SET ColumnName='IsShowinLogin', Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Element_ID=202569 AND IsCentrallyMaintained='Y'
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_Field SET Name='Show on Login', Description=NULL, Help=NULL WHERE AD_Column_ID IN (SELECT AD_Column_ID FROM AD_Column WHERE AD_Element_ID=202569) AND IsCentrallyMaintained='Y'
;
-- Nov 6, 2013 3:30:59 PM COT
UPDATE AD_PrintFormatItem SET PrintName='Show on Login', Name='Show on Login' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=AD_PrintFormatItem.AD_Column_ID AND c.AD_Element_ID=202569)
;
SELECT register_migration_script('201311061531_IDEMPIERE-1362.sql') FROM dual
;

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

@ -512,7 +512,7 @@ public class ImportAccount extends SvrProcess
.append("FROM I_ElementValue i") .append("FROM I_ElementValue i")
.append(" INNER JOIN AD_Column c ON (i.AD_Column_ID=c.AD_Column_ID)") .append(" INNER JOIN AD_Column c ON (i.AD_Column_ID=c.AD_Column_ID)")
.append(" INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) ") .append(" INNER JOIN AD_Table t ON (c.AD_Table_ID=t.AD_Table_ID) ")
.append("WHERE i.I_IsImported='Y' AND Processing='Y'") .append("WHERE i.I_IsImported='Y' AND i.Processing='Y'")
.append(" AND i.C_ElementValue_ID IS NOT NULL AND C_Element_ID=?"); .append(" AND i.C_ElementValue_ID IS NOT NULL AND C_Element_ID=?");
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;