From 23117ca11ffd07afdf8758d074bbf7dbfb710a83 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Wed, 9 May 2007 23:37:57 +0000
Subject: [PATCH] [ 1715596 ] SQLJ Date problem in PostgreSQL

---
 sqlj/src/org/compiere/sqlj/Product.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sqlj/src/org/compiere/sqlj/Product.java b/sqlj/src/org/compiere/sqlj/Product.java
index 834d612e7e..411398656b 100644
--- a/sqlj/src/org/compiere/sqlj/Product.java
+++ b/sqlj/src/org/compiere/sqlj/Product.java
@@ -65,9 +65,23 @@ public class Product
 			String serNo = rs.getString(2);
 			if (serNo != null && serNo.length() > 0)
 				sb.append("#").append(serNo).append(" ");
-			Date guarantee = rs.getDate(3);
+			Date guaranteeDate = null;
+			//either date or timestamp
+			Object guarantee = rs.getObject(3);
 			if (guarantee != null)
-				sb.append(guarantee).append(" ");
+			{
+				if (guarantee instanceof Timestamp)
+				{
+					Timestamp ts = (Timestamp)guarantee;
+					guaranteeDate = new Date(ts.getTime());
+				}
+				else 
+				{
+					guaranteeDate = (Date)guaranteeDate;
+				}
+			}
+			if (guaranteeDate != null)
+				sb.append(guaranteeDate).append(" ");
 		}
 		rs.close();
 		pstmt.close();