Added date check against closed fiscal year.

[fa-stable.git] / includes / date_functions.inc

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 963cf361df2fa84c8f3b7cdaa7544e6fa1e86963..de99c14667314eef3d1d0634e1c6d357a9731a4b 100644 (file)
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -18,8 +18,6 @@ this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
 "m/d/Y" for US/Canada format dates depending on setting in preferences.
 
 */
-if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
-       @date_default_timezone_set(@date_default_timezone_get());
 
 function __date($year, $month, $day)
 {
@@ -162,11 +160,11 @@ function is_date_in_fiscalyear($date, $convert=false)
        global $path_to_root;
        include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 
-       if ($_SESSION["wa_current_user"]->can_access('SA_FISCALYEARS')) // allow all open years for this one
+       if (user_check_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
                return is_date_in_fiscalyears($date, false);
-       $myrow = get_current_fiscalyear();
-       if ($myrow['closed'] == 1)
+       if (is_date_closed($date))
                return 0;
+       $myrow = get_current_fiscalyear();
        if ($convert)
                $date2 = sql2date($date);
        else
@@ -180,6 +178,11 @@ function is_date_in_fiscalyear($date, $convert=false)
        return 1;
 }
 
+function is_date_closed($date)
+{
+       return !date1_greater_date2($date, sql2date(get_company_pref('gl_closing_date')));
+}
+
 function begin_fiscalyear()
 {
        global $path_to_root;
@@ -351,13 +354,7 @@ and converts to a yyyy/mm/dd format */
        elseif ($date_system == 2)
                list($year, $month, $day) = islamic_to_gregorian($year, $month, $day); 
 
-       // Pad with 0s if needed
-       if (strlen($month) == 1)
-               $month = "0$month";
-       if (strlen($day) == 1)
-               $day = "0$day";
-
-       return $year."-".$month."-".$day;
+       return sprintf("%04d-%02d-%02d", $year, $month, $day);
 }// end of function
 
 function date1_greater_date2 ($date1, $date2)