X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=c0bcbe94476acb565053bbd7268ac01479270b92;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=af05456353a76e126a61e83c3f89ec49bf97ebcf;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index af054563..c0bcbe94 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -199,11 +199,12 @@ function is_date_in_fiscalyear($date, $convert=false)
 	else
 		$date2 = $date;
 
+	if (is_date_closed($date2))
+		return 0;
+
 	if (user_check_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
 		return is_date_in_fiscalyears($date2, false);
 
-	if (is_date_closed($date2))
-		return 0;
 	$myrow = get_current_fiscalyear();
 	$begin = sql2date($myrow['begin']);
 	$end = sql2date($myrow['end']);
@@ -382,10 +383,10 @@ and converts to a yyyy/mm/dd format */
 	$how = user_date_format();
 	$sep = $SysPrefs->dateseps[user_date_sep()];
 
+	$date_ = trim($date_);
 	if ($date_ == null || strlen($date_) == 0)
 		return "";
 
-	$date_ = trim($date_);
     $year = $month = $day = 0;
     // Split up the date by the separator based on "how" to split it
     if ($how == 0 || $how == 3) // MMDDYYYY or MmmDDYYYY