From 9d8b8e11b7aa21709d4fa23efe672a6d84bbfd1f Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 23 Jul 2014 12:58:33 -0500 Subject: [PATCH] IDEMPIERE-2072 get number of non business days between 2 dates / forgot the IsActive condition --- org.adempiere.base/src/org/compiere/util/TimeUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/util/TimeUtil.java b/org.adempiere.base/src/org/compiere/util/TimeUtil.java index 1ee35ec51d..68eeeb5e24 100644 --- a/org.adempiere.base/src/org/compiere/util/TimeUtil.java +++ b/org.adempiere.base/src/org/compiere/util/TimeUtil.java @@ -848,7 +848,7 @@ public class TimeUtil endDate = temp; } - final String sql = "SELECT Date1 FROM C_NonBusinessDay WHERE AD_Client_ID=? AND Date1 BETWEEN ? AND ? AND COALESCE(C_Country_ID,0) IN (0, ?)"; + final String sql = "SELECT Date1 FROM C_NonBusinessDay WHERE IsActive='Y' AND AD_Client_ID=? AND Date1 BETWEEN ? AND ? AND COALESCE(C_Country_ID,0) IN (0, ?)"; List nbd = DB.getSQLValueObjectsEx(trxName, sql, clientID, startDate, endDate, MCountry.getDefault(Env.getCtx()).getC_Country_ID()); GregorianCalendar cal = new GregorianCalendar();