From c8a09448b9ee3875f82344a750d5bfb697e3ab16 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 26 Dec 2013 13:55:58 +0800 Subject: [PATCH 1/2] IDEMPIERE-1644 Length 22 for AD_PrintFormatItem.FormatPattern is too short --- .../i2.0/oracle/201312260552_IDEMPIERE-1644.sql | 16 ++++++++++++++++ .../postgresql/201312260552_IDEMPIERE-1644.sql | 13 +++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 migration/i2.0/oracle/201312260552_IDEMPIERE-1644.sql create mode 100644 migration/i2.0/postgresql/201312260552_IDEMPIERE-1644.sql 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 +; + From 38ef57f99de484b37052d2186480f2397f21e863 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 26 Dec 2013 17:31:30 -0500 Subject: [PATCH 2/2] IDEMPIERE-1642 Window Customization with no window name give null on Recent Items / thanks to Nicolas Micoud (nmicoud) --- org.adempiere.base/src/org/compiere/model/MRecentItem.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/MRecentItem.java b/org.adempiere.base/src/org/compiere/model/MRecentItem.java index 394d3ec490..deaa67c253 100644 --- a/org.adempiere.base/src/org/compiere/model/MRecentItem.java +++ b/org.adempiere.base/src/org/compiere/model/MRecentItem.java @@ -29,6 +29,7 @@ import org.compiere.util.CCache; import org.compiere.util.CLogger; import org.compiere.util.DB; import org.compiere.util.Env; +import org.compiere.util.Util; import org.idempiere.distributed.IMessageService; import org.idempiere.distributed.ITopic; import org.osgi.service.event.Event; @@ -278,7 +279,7 @@ public class MRecentItem extends X_AD_RecentItem public String getLabel() { String windowName; MUserDefWin userDef = MUserDefWin.getBestMatch(getCtx(), getAD_Window_ID()); - if (userDef != null) { + if (userDef != null && !Util.isEmpty(userDef.getName())) { windowName = userDef.getName(); } else { MWindow win = new MWindow(getCtx(), getAD_Window_ID(), null);