From 596393e625f3890d07609999213c09094dec68a8 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 15 Mar 2013 09:33:50 -0500 Subject: [PATCH 1/2] Minor fix to oracle migration script --- .../i1.0a-release/oracle/201303131539_TICKET-1002211.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/migration/i1.0a-release/oracle/201303131539_TICKET-1002211.sql b/migration/i1.0a-release/oracle/201303131539_TICKET-1002211.sql index 3ca7c2d3a1..3ae66561be 100644 --- a/migration/i1.0a-release/oracle/201303131539_TICKET-1002211.sql +++ b/migration/i1.0a-release/oracle/201303131539_TICKET-1002211.sql @@ -1,3 +1,6 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + -- Mar 13, 2013 2:23:27 PM SGT -- Ticket #1002211: Create Help pane for Bizidium INSERT INTO AD_Ref_List (AD_Client_ID,AD_Ref_List_ID,AD_Reference_ID,EntityType,Name,AD_Ref_List_UU,Value,CreatedBy,Created,Updated,UpdatedBy,IsActive,AD_Org_ID) VALUES (0,200135,200064,'D','All','298064ff-6e69-435f-aa0e-d156375339f5','A',100,TO_DATE('2013-03-13 14:23:25','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2013-03-13 14:23:25','YYYY-MM-DD HH24:MI:SS'),100,'Y',0) @@ -556,4 +559,4 @@ UPDATE AD_Field SET ColumnSpan=2,Updated=TO_DATE('2013-03-13 14:40:37','YYYY-MM- ; SELECT register_migration_script('201303131539_TICKET-1002211.sql') FROM dual -; \ No newline at end of file +; From dca7c443e2650c6fc7642912a551fa361fefc6f8 Mon Sep 17 00:00:00 2001 From: Juliana Corredor Date: Fri, 15 Mar 2013 09:57:20 -0500 Subject: [PATCH 2/2] IDEMPIERE-723 java.util.Date cannot be cast to java.sql.Timestamp in Info Product --- .../src/org/adempiere/webui/panel/InfoPAttributePanel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java index 61d76d62db..0e4610e59f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPAttributePanel.java @@ -536,9 +536,9 @@ public class InfoPAttributePanel extends Window implements EventListener } // Guarantee Date - Timestamp ts = (Timestamp)guaranteeDateField.getValue(); - if (ts != null) + if (guaranteeDateField.getValue() != null) { + Timestamp ts = new Timestamp(guaranteeDateField.getValue().getTime()); sb.append(" AND TRUNC(asi.GuaranteeDate)"); int index = guaranteeDateSelection.getSelectedIndex(); // < = > if (index == 0)