X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdate_functions.inc;h=64fdfab4b8a28012f9a61e48d5207439e1df85ff;hb=5a96d27422f2eb4b45738ad54894a032e0495cb4;hp=d83c612a50655f674e2dd9ddd5780db8134e08a3;hpb=152cb6a4ff983a4433a8457cf09c9573e513acd0;p=fa-stable.git diff --git a/includes/date_functions.inc b/includes/date_functions.inc index d83c612a..64fdfab4 100644 --- a/includes/date_functions.inc +++ b/includes/date_functions.inc @@ -162,8 +162,8 @@ 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_FISCALYEAR)) // allow all open years for this one - return is_date_in_fixcalyears($date, false); + if ($_SESSION["wa_current_user"]->can_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) return 0; @@ -351,13 +351,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)