From aa9a2668a8d0b0a5f3cf4012bc6b3f14d6049d76 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 26 Jan 2011 12:45:05 +0000 Subject: [PATCH] Added check for closed date. --- includes/date_functions.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/date_functions.inc b/includes/date_functions.inc index a027f89d..de99c146 100644 --- a/includes/date_functions.inc +++ b/includes/date_functions.inc @@ -160,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 @@ -178,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; -- 2.30.2