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

hg merge release-1.0c (merge release1 into release2)

This commit is contained in:
Carlos Ruiz 2013-12-26 18:29:00 -05:00
parent 9e17fdff49 38ef57f99d
commit 7f55f46569
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migration/i2.0/oracle/201312260552_IDEMPIERE-1644.sql Normal file
View File

@ -0,0 +1,16 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- Dec 26, 2013 12:22:23 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
UPDATE AD_Column SET FieldLength=60,Updated=TO_DATE('2013-12-26 12:22:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56351
;
-- Dec 26, 2013 12:22:34 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
ALTER TABLE AD_PrintFormatItem MODIFY FormatPattern VARCHAR2(60) DEFAULT NULL
;
SELECT register_migration_script('201312260552_IDEMPIERE-1644.sql') FROM dual
;

13
migration/i2.0/postgresql/201312260552_IDEMPIERE-1644.sql Normal file
View File

@ -0,0 +1,13 @@
-- Dec 26, 2013 12:22:23 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
UPDATE AD_Column SET FieldLength=60,Updated=TO_TIMESTAMP('2013-12-26 12:22:23','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=56351
;
-- Dec 26, 2013 12:22:34 PM MYT
-- IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short
INSERT INTO t_alter_column values('ad_printformatitem','FormatPattern','VARCHAR(60)',null,'NULL')
;
SELECT register_migration_script('201312260552_IDEMPIERE-1644.sql') FROM dual
;

2
org.adempiere.base/src/org/compiere/model/MRecentItem.java
View File

@ -280,7 +280,7 @@ public class MRecentItem extends X_AD_RecentItem
String windowName;
MWindow win = MWindow.get(getCtx(), getAD_Window_ID());
MUserDefWin userDef = MUserDefWin.getBestMatch(getCtx(), getAD_Window_ID());
if (userDef != null) {
if (userDef != null && !Util.isEmpty(userDef.getName())) {
windowName = userDef.getName();
} else {
windowName = win.get_Translation("Name");