IDEMPIERE-2269 Multi-currency allocation broken in zk

db/ddlutils/oracle/functions/C_Currency_Rate.sql

@@ -61,7 +61,7 @@ BEGIN
             FROM (
                 SELECT C_ConversionType_ID 
                 FROM C_ConversionType 
-                WHERE IsDefault='Y'
+                WHERE IsActive='Y' AND IsDefault='Y'
                     AND AD_Client_ID IN (0,p_Client_ID)
                 ORDER BY AD_Client_ID DESC
             )
@@ -137,7 +137,7 @@ BEGIN
 		CURSOR	CUR_Rate	IS
 			SELECT	MultiplyRate
 			FROM	C_Conversion_Rate
-			WHERE	C_Currency_ID=v_CurrencyFrom AND C_Currency_ID_To=v_CurrencyTo
+			WHERE	IsActive='Y' AND C_Currency_ID=v_CurrencyFrom AND C_Currency_ID_To=v_CurrencyTo
 			  AND	C_ConversionType_ID=v_ConversionType_ID
 			  AND	v_ConvDate BETWEEN ValidFrom AND ValidTo
 			  AND	AD_Client_ID IN (0,p_Client_ID) AND AD_Org_ID IN (0,p_Org_ID)

db/ddlutils/postgresql/functions/C_Currency_Rate.sql

@@ -65,7 +65,7 @@ BEGIN
 		    SELECT C_ConversionType_ID 
 		      INTO v_ConversionType_ID
 		    FROM C_ConversionType 
-		    WHERE IsDefault='Y'
+		    WHERE IsActive='Y' AND IsDefault='Y'
 		      AND AD_Client_ID IN (0,p_Client_ID)
 		    ORDER BY AD_Client_ID DESC
 		    LIMIT 1;
@@ -140,7 +140,7 @@ BEGIN
 	BEGIN
 		FOR c IN SELECT	MultiplyRate
 			FROM	C_Conversion_Rate
-			WHERE	C_Currency_ID=v_CurrencyFrom AND C_Currency_ID_To=v_CurrencyTo
+			WHERE	IsActive='Y' AND C_Currency_ID=v_CurrencyFrom AND C_Currency_ID_To=v_CurrencyTo
 			  AND	C_ConversionType_ID=v_ConversionType_ID
 			  AND	v_ConvDate BETWEEN ValidFrom AND ValidTo
 			  AND	AD_Client_ID IN (0,p_Client_ID) AND AD_Org_ID IN (0,p_Org_ID)

migration/i2.0z/oracle/201410231928_IDEMPIERE-2269.sql

@@ -0,0 +1,194 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Oct 23, 2014 7:27:09 PM COT
+-- IDEMPIERE-2250 Charge on bank transfer not needed
+DELETE FROM C_Conversion_Rate WHERE C_Conversion_Rate_ID=117
+;
+
+-- Oct 23, 2014 7:27:11 PM COT
+DELETE FROM C_Conversion_Rate WHERE C_Conversion_Rate_ID=120
+;
+
+-- Oct 23, 2014 7:27:14 PM COT
+DELETE FROM C_Conversion_Rate WHERE C_Conversion_Rate_ID=119
+;
+
+CREATE OR REPLACE FUNCTION currencyRate
+(
+	p_CurFrom_ID		IN	NUMBER,
+	p_CurTo_ID		    IN	NUMBER,
+	p_ConvDate		    IN	DATE,
+	p_ConversionType_ID	IN	NUMBER,
+	p_Client_ID		    IN	NUMBER,
+	p_Org_ID			IN	NUMBER
+)
+RETURN NUMBER
+/*************************************************************************
+ * The contents of this file are subject to the Compiere License.  You may
+ * obtain a copy of the License at    http://www.compiere.org/license.html
+ * Software is on an  "AS IS" basis,  WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the License for details. Code: Compiere ERP+CRM
+ * Copyright (C) 1999-2001 Jorg Janke, ComPiere, Inc. All Rights Reserved.
+ *************************************************************************
+ * $Id: C_Currency_Rate.sql,v 1.1 2006/04/21 17:51:58 jjanke Exp $
+ ***
+ * Title:	Return Conversion Rate
+ * Description:
+ *		from CurrencyFrom_ID to CurrencyTo_ID
+ *		Returns NULL, if rate not found
+ * Test
+ *		SELECT C_Currency_Rate(116, 100, null, null) FROM DUAL;     => .647169
+ *		SELECT C_Currency_Rate(116, 100) FROM DUAL;                 => .647169
+ ************************************************************************/
+AS
+	--	Currency From variables
+	cf_IsEuro			CHAR(1);
+	cf_IsEMUMember		CHAR(1);
+	cf_EMUEntryDate	DATE;
+	cf_EMURate		NUMBER;
+	--	Currency To variables
+	ct_IsEuro			CHAR(1);
+	ct_IsEMUMember		CHAR(1);
+	ct_EMUEntryDate	DATE;
+	ct_EMURate		NUMBER;
+	--	Triangle
+	v_CurrencyFrom		NUMBER;
+	v_CurrencyTo		NUMBER;
+	v_CurrencyEuro		NUMBER;
+	--
+	v_ConvDate		    DATE := SysDate;
+	v_ConversionType_ID	NUMBER := 0;
+	v_Rate			    NUMBER;
+BEGIN
+	--	No Conversion
+	IF (p_CurFrom_ID = p_CurTo_ID) THEN
+		RETURN 1;
+	END IF;
+	--	Default Date Parameter
+	IF (p_ConvDate IS NOT NULL) THEN
+		v_ConvDate := p_ConvDate;   --  SysDate
+	END IF;
+    --  Default Conversion Type
+	IF (p_ConversionType_ID IS NULL OR p_ConversionType_ID = 0) THEN
+        BEGIN
+            SELECT C_ConversionType_ID 
+            INTO v_ConversionType_ID
+            FROM (
+                SELECT C_ConversionType_ID 
+                FROM C_ConversionType 
+                WHERE IsActive='Y' AND IsDefault='Y'
+                    AND AD_Client_ID IN (0,p_Client_ID)
+                ORDER BY AD_Client_ID DESC
+            )
+            WHERE ROWNUM=1;
+        EXCEPTION WHEN OTHERS THEN
+            DBMS_OUTPUT.PUT_LINE('Conversion Type Not Found');
+        END;
+    ELSE
+        v_ConversionType_ID := p_ConversionType_ID;
+	END IF;
+
+	--	Get Currency Info
+	SELECT	MAX(TO_CHAR(IsEuro)), MAX(TO_CHAR(IsEMUMember)), MAX(EMUEntryDate), MAX(EMURate)
+	  INTO	cf_IsEuro, cf_IsEMUMember, cf_EMUEntryDate, cf_EMURate
+	FROM		C_Currency
+	  WHERE	C_Currency_ID = p_CurFrom_ID;
+	-- Not Found
+	IF (cf_IsEuro IS NULL) THEN
+		DBMS_OUTPUT.PUT_LINE('From Currency Not Found');
+		RETURN NULL;
+	END IF;
+	SELECT	MAX(TO_CHAR(IsEuro)), MAX(TO_CHAR(IsEMUMember)), MAX(EMUEntryDate), MAX(EMURate)
+	  INTO	ct_IsEuro, ct_IsEMUMember, ct_EMUEntryDate, ct_EMURate
+	FROM		C_Currency
+	  WHERE	C_Currency_ID = p_CurTo_ID;
+	-- Not Found
+	IF (ct_IsEuro IS NULL) THEN
+		DBMS_OUTPUT.PUT_LINE('To Currency Not Found');
+		RETURN NULL;
+	END IF;
+
+	--	Fixed - From Euro to EMU
+	IF (cf_IsEuro = 'Y' AND ct_IsEMUMember ='Y' AND v_ConvDate >= ct_EMUEntryDate) THEN
+		RETURN ct_EMURate;
+	END IF;
+
+	--	Fixed - From EMU to Euro
+	IF (ct_IsEuro = 'Y' AND cf_IsEMUMember ='Y' AND v_ConvDate >= cf_EMUEntryDate) THEN
+		RETURN 1 / cf_EMURate;
+	END IF;
+
+	--	Fixed - From EMU to EMU
+	IF (cf_IsEMUMember = 'Y' AND cf_IsEMUMember ='Y'
+			AND v_ConvDate >= cf_EMUEntryDate AND v_ConvDate >= ct_EMUEntryDate) THEN
+		RETURN ct_EMURate / cf_EMURate;
+	END IF;
+
+	--	Flexible Rates
+	v_CurrencyFrom := p_CurFrom_ID;
+	v_CurrencyTo := p_CurTo_ID;
+
+	-- if EMU Member involved, replace From/To Currency
+	IF ((cf_isEMUMember = 'Y' AND v_ConvDate >= cf_EMUEntryDate)
+	  OR (ct_isEMUMember = 'Y' AND v_ConvDate >= ct_EMUEntryDate)) THEN
+		SELECT	MAX(C_Currency_ID)
+		  INTO	v_CurrencyEuro
+		FROM		C_Currency
+		WHERE	IsEuro = 'Y';
+		-- Conversion Rate not Found
+		IF (v_CurrencyEuro IS NULL) THEN
+			DBMS_OUTPUT.PUT_LINE('Euro Not Found');
+			RETURN NULL;
+		END IF;
+		IF (cf_isEMUMember = 'Y' AND v_ConvDate >= cf_EMUEntryDate) THEN
+			v_CurrencyFrom := v_CurrencyEuro;
+		ELSE
+			v_CurrencyTo := v_CurrencyEuro;
+		END IF;
+	END IF;
+
+	--	Get Rate
+	DECLARE
+		CURSOR	CUR_Rate	IS
+			SELECT	MultiplyRate
+			FROM	C_Conversion_Rate
+			WHERE	IsActive='Y' AND C_Currency_ID=v_CurrencyFrom AND C_Currency_ID_To=v_CurrencyTo
+			  AND	C_ConversionType_ID=v_ConversionType_ID
+			  AND	v_ConvDate BETWEEN ValidFrom AND ValidTo
+			  AND	AD_Client_ID IN (0,p_Client_ID) AND AD_Org_ID IN (0,p_Org_ID)
+			ORDER BY AD_Client_ID DESC, AD_Org_ID DESC, ValidFrom DESC;
+	BEGIN
+		FOR c IN CUR_Rate LOOP
+			v_Rate := c.MultiplyRate;
+			EXIT;	--	only first
+		END LOOP;
+	END;
+	--	Not found
+	IF (v_Rate IS NULL) THEN
+		DBMS_OUTPUT.PUT_LINE('Conversion Rate Not Found');
+		RETURN NULL;
+	END IF;
+
+	--	Currency From was EMU
+	IF (cf_isEMUMember = 'Y' AND v_ConvDate >= cf_EMUEntryDate) THEN
+		RETURN v_Rate / cf_EMURate;
+	END IF;
+
+	--	Currency To was EMU
+	IF (ct_isEMUMember = 'Y' AND v_ConvDate >= ct_EMUEntryDate) THEN
+		RETURN v_Rate * ct_EMURate;
+	END IF;
+
+	RETURN v_Rate;
+
+EXCEPTION WHEN OTHERS THEN
+	DBMS_OUTPUT.PUT_LINE(SQLERRM);
+	RETURN NULL;
+
+END currencyRate;
+/
+
+SELECT register_migration_script('201410231928_IDEMPIERE-2269.sql') FROM dual
+;
+

migration/i2.0z/postgresql/201410231928_IDEMPIERE-2269.sql

@@ -0,0 +1,195 @@
+-- Oct 23, 2014 7:27:09 PM COT
+-- IDEMPIERE-2250 Charge on bank transfer not needed
+DELETE FROM C_Conversion_Rate WHERE C_Conversion_Rate_ID=117
+;
+
+-- Oct 23, 2014 7:27:11 PM COT
+DELETE FROM C_Conversion_Rate WHERE C_Conversion_Rate_ID=120
+;
+
+-- Oct 23, 2014 7:27:14 PM COT
+DELETE FROM C_Conversion_Rate WHERE C_Conversion_Rate_ID=119
+;
+
+CREATE OR REPLACE FUNCTION currencyRate(
+	p_CurFrom_ID		NUMERIC,
+	p_CurTo_ID		NUMERIC,
+	p_ConvDate		timestamp with time zone,
+	p_ConversionType_ID	NUMERIC,
+	p_Client_ID		NUMERIC,
+	p_Org_ID		NUMERIC
+	) 
+
+RETURNS numeric AS $body$
+	
+/*************************************************************************
+ * The contents of this file are subject to the Compiere License.  You may
+ * obtain a copy of the License at    http://www.compiere.org/license.html 
+ * Software is on an  "AS IS" basis,  WITHOUT WARRANTY OF ANY KIND, either 
+ * express or implied. See the License for details. Code: Compiere ERP+CRM
+ * Copyright (C) 1999-2001 Jorg Janke, ComPiere, Inc. All Rights Reserved.
+ *
+ * converted to postgreSQL by Karsten Thiemann (Schaeffer AG), 
+ * kthiemann@adempiere.org
+ *************************************************************************
+ ***
+ * Title:	Return Conversion Rate
+ * Description:
+ *		from CurrencyFrom_ID to CurrencyTo_ID
+ *		Returns NULL, if rate not found
+ * Test
+ *		SELECT currencyrate(116, 100, null, null, null, null) FROM AD_System;  => .647169
+ ************************************************************************/
+	
+	
+DECLARE
+	--	Currency From variables
+	cf_IsEuro		CHAR(1);
+	cf_IsEMUMember		CHAR(1);
+	cf_EMUEntryDate		timestamp with time zone;
+	cf_EMURate		NUMERIC;
+	--	Currency To variables
+	ct_IsEuro		CHAR(1);
+	ct_IsEMUMember		CHAR(1);
+	ct_EMUEntryDate	DATE;
+	ct_EMURate		NUMERIC;
+	--	Triangle
+	v_CurrencyFrom		NUMERIC;
+	v_CurrencyTo		NUMERIC;
+	v_CurrencyEuro		NUMERIC;
+	--
+	v_ConvDate		timestamp with time zone := now();
+	v_ConversionType_ID	NUMERIC := 0;
+	v_Rate			NUMERIC;
+	c			RECORD;			
+
+BEGIN
+--	No Conversion
+	IF (p_CurFrom_ID = p_CurTo_ID) THEN
+		RETURN 1;
+	END IF;
+	--	Default Date Parameter
+	IF (p_ConvDate IS NOT NULL) THEN
+		v_ConvDate := p_ConvDate;   --  SysDate
+	END IF;
+    --  Default Conversion Type
+	IF (p_ConversionType_ID IS NULL OR p_ConversionType_ID = 0) THEN
+		BEGIN
+		    SELECT C_ConversionType_ID 
+		      INTO v_ConversionType_ID
+		    FROM C_ConversionType 
+		    WHERE IsActive='Y' AND IsDefault='Y'
+		      AND AD_Client_ID IN (0,p_Client_ID)
+		    ORDER BY AD_Client_ID DESC
+		    LIMIT 1;
+		EXCEPTION WHEN OTHERS THEN
+		    RAISE NOTICE 'Conversion Type Not Found';
+		END;
+    	ELSE
+        	v_ConversionType_ID := p_ConversionType_ID;
+	END IF;
+
+	--	Get Currency Info
+	SELECT	MAX(IsEuro), MAX(IsEMUMember), MAX(EMUEntryDate), MAX(EMURate)
+	  INTO	cf_IsEuro, cf_IsEMUMember, cf_EMUEntryDate, cf_EMURate
+	FROM		C_Currency
+	  WHERE	C_Currency_ID = p_CurFrom_ID;
+	-- Not Found
+	IF (cf_IsEuro IS NULL) THEN
+		RAISE NOTICE 'From Currency Not Found';
+		RETURN NULL;
+	END IF;
+	SELECT	MAX(IsEuro), MAX(IsEMUMember), MAX(EMUEntryDate), MAX(EMURate)
+	  INTO	ct_IsEuro, ct_IsEMUMember, ct_EMUEntryDate, ct_EMURate
+	FROM		C_Currency
+	  WHERE	C_Currency_ID = p_CurTo_ID;
+	-- Not Found
+	IF (ct_IsEuro IS NULL) THEN
+		RAISE NOTICE 'To Currency Not Found';
+		RETURN NULL;
+	END IF;
+
+	--	Fixed - From Euro to EMU
+	IF (cf_IsEuro = 'Y' AND ct_IsEMUMember ='Y' AND v_ConvDate >= ct_EMUEntryDate) THEN
+		RETURN ct_EMURate;
+	END IF;
+
+	--	Fixed - From EMU to Euro
+	IF (ct_IsEuro = 'Y' AND cf_IsEMUMember ='Y' AND v_ConvDate >= cf_EMUEntryDate) THEN
+		RETURN 1 / cf_EMURate;
+	END IF;
+
+	--	Fixed - From EMU to EMU
+	IF (cf_IsEMUMember = 'Y' AND cf_IsEMUMember ='Y'
+			AND v_ConvDate >= cf_EMUEntryDate AND v_ConvDate >= ct_EMUEntryDate) THEN
+		RETURN ct_EMURate / cf_EMURate;
+	END IF;
+
+	--	Flexible Rates
+	v_CurrencyFrom := p_CurFrom_ID;
+	v_CurrencyTo := p_CurTo_ID;
+
+	-- if EMU Member involved, replace From/To Currency
+	IF ((cf_isEMUMember = 'Y' AND v_ConvDate >= cf_EMUEntryDate)
+	  OR (ct_isEMUMember = 'Y' AND v_ConvDate >= ct_EMUEntryDate)) THEN
+		SELECT	MAX(C_Currency_ID)
+		  INTO	v_CurrencyEuro
+		FROM		C_Currency
+		WHERE	IsEuro = 'Y';
+		-- Conversion Rate not Found
+		IF (v_CurrencyEuro IS NULL) THEN
+			RAISE NOTICE 'Euro Not Found';
+			RETURN NULL;
+		END IF;
+		IF (cf_isEMUMember = 'Y' AND v_ConvDate >= cf_EMUEntryDate) THEN
+			v_CurrencyFrom := v_CurrencyEuro;
+		ELSE
+			v_CurrencyTo := v_CurrencyEuro;
+		END IF;
+	END IF;
+
+	--	Get Rate
+
+	BEGIN
+		FOR c IN SELECT	MultiplyRate
+			FROM	C_Conversion_Rate
+			WHERE	IsActive='Y' AND C_Currency_ID=v_CurrencyFrom AND C_Currency_ID_To=v_CurrencyTo
+			  AND	C_ConversionType_ID=v_ConversionType_ID
+			  AND	v_ConvDate BETWEEN ValidFrom AND ValidTo
+			  AND	AD_Client_ID IN (0,p_Client_ID) AND AD_Org_ID IN (0,p_Org_ID)
+			ORDER BY AD_Client_ID DESC, AD_Org_ID DESC, ValidFrom DESC
+		LOOP
+			v_Rate := c.MultiplyRate;
+			EXIT;	--	only first
+		END LOOP;
+	END;
+	--	Not found
+	IF (v_Rate IS NULL) THEN
+		RAISE NOTICE 'Conversion Rate Not Found';
+		RETURN NULL;
+	END IF;
+
+	--	Currency From was EMU
+	IF (cf_isEMUMember = 'Y' AND v_ConvDate >= cf_EMUEntryDate) THEN
+		RETURN v_Rate / cf_EMURate;
+	END IF;
+
+	--	Currency To was EMU
+	IF (ct_isEMUMember = 'Y' AND v_ConvDate >= ct_EMUEntryDate) THEN
+		RETURN v_Rate * ct_EMURate;
+	END IF;
+
+	RETURN v_Rate;
+
+EXCEPTION WHEN OTHERS THEN
+	RAISE NOTICE '%', SQLERRM;
+	RETURN NULL;
+
+	
+END;
+
+$body$ LANGUAGE plpgsql STABLE;
+
+SELECT register_migration_script('201410231928_IDEMPIERE-2269.sql') FROM dual
+;
+

org.adempiere.base/src/org/globalqss/process/CashFlow.java

@@ -85,6 +85,7 @@ public class CashFlow  extends SvrProcess {
 		dateFrom.set(Calendar.HOUR_OF_DAY, 0);
 		dateFrom.set(Calendar.MINUTE, 0);
 		dateFrom.set(Calendar.SECOND, 0);
+		dateFrom.set(Calendar.MILLISECOND, 0);
 		p_dateFrom = new Timestamp(dateFrom.getTimeInMillis());
 		p_dateFrom.setNanos(0);
 		

org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java

@@ -20,6 +20,8 @@ import static org.compiere.model.SystemIDs.COLUMN_C_INVOICE_C_BPARTNER_ID;
 import static org.compiere.model.SystemIDs.COLUMN_C_INVOICE_C_CURRENCY_ID;
 import static org.compiere.model.SystemIDs.COLUMN_C_PERIOD_AD_ORG_ID;
 
+import java.sql.Timestamp;
+import java.util.Calendar;
 import java.util.Vector;
 import java.util.logging.Level;
 
@@ -336,7 +338,13 @@ public class WAllocation extends Allocation
 		statusBar.setVflex("min");
 		
 		//  Date set to Login Date
-		dateField.setValue(Env.getContextAsDate(Env.getCtx(), "#Date"));
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(Env.getContextAsDate(Env.getCtx(), "#Date"));
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		dateField.setValue(new Timestamp(cal.getTimeInMillis()));
 		dateField.addValueChangeListener(this);