From b55bb9f8ece66743c84ecaae11a3486f36966bc8 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 9 Apr 2007 14:02:01 +0000
Subject: [PATCH] * remove derby and fyracle from trunk

---
 base/src/org/compiere/model/MCash.java     | 26 +++++++---------------
 base/src/org/compiere/model/MCashLine.java |  2 +-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/base/src/org/compiere/model/MCash.java b/base/src/org/compiere/model/MCash.java
index 75f8712a60..4f4b7fbe03 100644
--- a/base/src/org/compiere/model/MCash.java
+++ b/base/src/org/compiere/model/MCash.java
@@ -47,24 +47,14 @@ public class MCash extends X_C_Cash implements DocAction
 		MCash retValue = null;
 		//	Existing Journal
 		String sql;
-		if(DB.isFyracle()){
-			 sql = "SELECT * FROM C_Cash c "
-				+ "WHERE c.AD_Org_ID=?"						//	#1
-				//FYRACLE PATCH
-				+ " AND cast(c.StatementDate as date)=?"			//	#2
-				+ " AND c.Processed='N'"
-				+ " AND EXISTS (SELECT * FROM C_CashBook cb "
-					+ "WHERE c.C_CashBook_ID=cb.C_CashBook_ID AND cb.AD_Org_ID=c.AD_Org_ID"
-					+ " AND cb.C_Currency_ID=?)";			//	#3		
-		}else{
-		    sql = "SELECT * FROM C_Cash c "
-			+ "WHERE c.AD_Org_ID=?"						//	#1
-			+ " AND TRUNC(c.StatementDate)=?"			//	#2
-			+ " AND c.Processed='N'"
-			+ " AND EXISTS (SELECT * FROM C_CashBook cb "
-				+ "WHERE c.C_CashBook_ID=cb.C_CashBook_ID AND cb.AD_Org_ID=c.AD_Org_ID"
-				+ " AND cb.C_Currency_ID=?)";			//	#3
-		}
+	    sql = "SELECT * FROM C_Cash c "
+		+ "WHERE c.AD_Org_ID=?"						//	#1
+		+ " AND TRUNC(c.StatementDate)=?"			//	#2
+		+ " AND c.Processed='N'"
+		+ " AND EXISTS (SELECT * FROM C_CashBook cb "
+			+ "WHERE c.C_CashBook_ID=cb.C_CashBook_ID AND cb.AD_Org_ID=c.AD_Org_ID"
+			+ " AND cb.C_Currency_ID=?)";			//	#3
+		
 		PreparedStatement pstmt = null;
 		try
 		{
diff --git a/base/src/org/compiere/model/MCashLine.java b/base/src/org/compiere/model/MCashLine.java
index edaa3f10b9..1da8e26ee1 100644
--- a/base/src/org/compiere/model/MCashLine.java
+++ b/base/src/org/compiere/model/MCashLine.java
@@ -366,7 +366,7 @@ public class MCashLine extends X_C_CashLine
 	{
 		String sql = "UPDATE C_Cash c"
 			+ " SET StatementDifference="
-			//FYRACLE replace null with 0 there is no difference with this
+			//replace null with 0 there is no difference with this
 				+ "(SELECT COALESCE(SUM(currencyConvert(cl.Amount, cl.C_Currency_ID, cb.C_Currency_ID, c.DateAcct, 0, c.AD_Client_ID, c.AD_Org_ID)),0) "
 				+ "FROM C_CashLine cl, C_CashBook cb "
 				+ "WHERE cb.C_CashBook_ID=c.C_CashBook_ID"