X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=795b96e25ccf1d9107859c8bbb8b84537d599159;hb=e8ebca8f2b08eeb3bfd3da04ca946dfa8cc1fb3f;hp=96ecb31bcdcf2967a2e90c6cb4173410f1da88bb;hpb=14175bfc95a7ffb1303494f7915931c9096a6898;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 96ecb31b..795b96e2 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -194,26 +194,29 @@ function is_date_in_fiscalyear($date, $convert=false)
 	global $path_to_root;
 	include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 
-    //Chaitanya
-    if ($convert)
-        $date2 = sql2date($date);
-    else
-        $date2 = $date;
-
-    if ($_SESSION["wa_current_user"]->can_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
-        return is_date_in_fiscalyears($date2, false); 
-
-    $myrow = get_current_fiscalyear();
-    if ($myrow['closed'] == 1)
-        return 0;
-    
-    $begin = sql2date($myrow['begin']);
-    $end = sql2date($myrow['end']);
-    if (date1_greater_date2($begin, $date2) || date1_greater_date2($date2, $end))
-    {
-        return 0;
-    }
-    return 1;
+	if ($convert)
+		$date2 = sql2date($date);
+	else
+		$date2 = $date;
+
+	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']);
+	if (date1_greater_date2($begin, $date2) || date1_greater_date2($date2, $end))
+	{
+		return 0;
+	}
+	return 1;
+}
+
+function is_date_closed($date)
+{
+	return !date1_greater_date2($date, sql2date(get_company_pref('gl_closing_date')));
 }
 
 function begin_fiscalyear()