X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdate_functions.inc;h=de99c14667314eef3d1d0634e1c6d357a9731a4b;hb=175a48c5bd73abe16e77fa2cb48ba522f00d1501;hp=64fdfab4b8a28012f9a61e48d5207439e1df85ff;hpb=17aa33a74912114ac4e0f00d830ae149a1e85e50;p=fa-stable.git diff --git a/includes/date_functions.inc b/includes/date_functions.inc index 64fdfab4..de99c146 100644 --- 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_MULTIFISCALYEARS')) // 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;