diff --git a/migration/i2.0/oracle/201312260552_IDEMPIERE-1644.sql b/migration/i2.0/oracle/201312260552_IDEMPIERE-1644.sql new file mode 100644 index 0000000000..696522af5b --- /dev/null +++ b/migration/i2.0/oracle/201312260552_IDEMPIERE-1644.sql @@ -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 +; + diff --git a/migration/i2.0/postgresql/201312260552_IDEMPIERE-1644.sql b/migration/i2.0/postgresql/201312260552_IDEMPIERE-1644.sql new file mode 100644 index 0000000000..c4fcbead22 --- /dev/null +++ b/migration/i2.0/postgresql/201312260552_IDEMPIERE-1644.sql @@ -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 +; + diff --git a/org.adempiere.base/src/org/compiere/model/MRecentItem.java b/org.adempiere.base/src/org/compiere/model/MRecentItem.java index d2f435506e..34433af0e8 100644 --- a/org.adempiere.base/src/org/compiere/model/MRecentItem.java +++ b/org.adempiere.base/src/org/compiere/model/MRecentItem.java @@ -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");