diff --git a/db/ddlutils/oracle/functions/C_PaymentTerm_Discount.sql b/db/ddlutils/oracle/functions/C_PaymentTerm_Discount.sql
index ae2cf83052..7654cb9741 100644
--- a/db/ddlutils/oracle/functions/C_PaymentTerm_Discount.sql
+++ b/db/ddlutils/oracle/functions/C_PaymentTerm_Discount.sql
@@ -46,13 +46,8 @@ BEGIN
 
 		--	Next Business Day
 		IF (p.IsNextBusinessDay='Y') THEN
-			--	Not fully correct - only does weekends (7=Saturday, 1=Sunday)
-			SELECT 	DECODE(TO_CHAR(Discount1Date,'D'), '7',2, '1',1, 0),
-					DECODE(TO_CHAR(Discount2Date,'D'), '7',2, '1',1, 0)
-			  INTO	Add1Date, Add2Date
-			FROM 	DUAL;
-			Discount1Date := Discount1Date+Add1Date;
-			Discount2Date := Discount2Date+Add2Date;
+			Discount1Date := nextBusinessDay(Discount1Date, p.AD_Client_ID);
+			Discount2Date := nextBusinessDay(Discount2Date, p.AD_Client_ID);
 		END IF;
 
 		--	Discount 1
diff --git a/db/ddlutils/oracle/functions/nextBusinessDay.sql b/db/ddlutils/oracle/functions/nextBusinessDay.sql
new file mode 100644
index 0000000000..bc9e3117f9
--- /dev/null
+++ b/db/ddlutils/oracle/functions/nextBusinessDay.sql
@@ -0,0 +1,55 @@
+create or replace
+function nextBusinessDay
+(
+	p_Date		in	date,
+	p_AD_Client_ID	in	number
+)
+return date
+/**
+*This file is part of Adempiere ERP Bazaar
+*http://www.adempiere.org
+*
+*Copyright (C) 2007 Teo Sarca
+*
+*This program is free software; you can redistribute it and/or
+*modify it under the terms of the GNU General Public License
+*as published by the Free Software Foundation; either version 2
+*of the License, or (at your option) any later version.
+*
+*This program is distributed in the hope that it will be useful,
+*but WITHOUT ANY WARRANTY; without even the implied warranty of
+*MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*GNU General Public License for more details.
+*
+*You should have received a copy of the GNU General Public License
+*along with this program; if not, write to the Free Software
+*Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.of
+*/
+as
+	v_nextDate		date		:= TRUNC(p_Date);
+	v_offset		number	:= 0;
+	v_Saturday		number	:= TO_CHAR(TO_DATE('2000-01-01', 'YYYY-MM-DD'), 'D');
+	v_Sunday		number	:= (case when v_Saturday = 7 then 1 else v_Saturday + 1 end);
+	v_isHoliday		boolean	:= true;
+	
+	cursor nonBusinessDays(pp_Date date) is
+		select nbd.Date1 from C_NonBusinessDay nbd
+		where AD_Client_ID=p_AD_Client_ID and IsActive ='Y' and Date1>=pp_Date
+		order by Date1;
+begin
+	v_isHoliday := true;
+	loop
+		SELECT DECODE(TO_CHAR(v_nextDate,'D'), v_Saturday, 2, v_Sunday, 1, 0) INTO v_offset FROM DUAL;
+		v_nextDate := TRUNC(v_nextDate + v_offset);
+		v_isHoliday := false;
+		for nbd in nonBusinessDays(v_nextDate) loop
+			exit when v_nextDate <> TRUNC(nbd.Date1);
+			v_nextDate := v_nextDate + 1;
+			v_isHoliday := true;
+		end loop;
+		exit when v_isHoliday=false;
+	end loop;
+	--
+	return v_nextDate;
+end nextBusinessDay;
+/