Merged changes up to version 2.3.4 into unstable.

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

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 64fdfab4b8a28012f9a61e48d5207439e1df85ff..343e56ad3540aa746c64012ccef5a655f7971b82 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,15 +160,17 @@ 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
-               return is_date_in_fiscalyears($date, false);
-       $myrow = get_current_fiscalyear();
-       if ($myrow['closed'] == 1)
-               return 0;
        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))
@@ -180,6 +180,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;
@@ -209,30 +214,46 @@ function begin_month($date)
        return __date($year, $month, 1);
 }
 
-function end_month($date)
+function days_in_month($month, $year)
 {
        global $date_system;
-    list($day, $month, $year) = explode_date_to_dmy($date);
+
        if ($date_system == 1)
        {
-               list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
                $days_in_month = array(31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, ((((((($year - (($year > 0) ? 474 : 473)) % 2820) + 474) + 38) * 682) % 2816) < 682 ? 30 : 29));
        }
        elseif ($date_system == 2)
        {
-               list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
                $days_in_month = array(30, 29, 30, 29, 30, 29, 30, 29, 30, 29, 30, (((((11 * $year) + 14) % 30) < 11) ? 30 : 29));
        }
        else // gregorian date
                $days_in_month = array(31, ((!($year % 4 ) && (($year % 100) || !($year % 400)))?29:28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-       return __date($year, $month, $days_in_month[$month - 1]);
+
+       return $days_in_month[$month - 1];
+}
+
+function end_month($date)
+{
+       global $date_system;
+
+    list($day, $month, $year) = explode_date_to_dmy($date);
+       if ($date_system == 1)
+       {
+               list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
+       }
+       elseif ($date_system == 2)
+       {
+               list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
+       }
+
+       return __date($year, $month, days_in_month($month, $year));
 }
 
 function add_days($date, $days) // accepts negative values as well
 {
        global $date_system;
     list($day, $month, $year) = explode_date_to_dmy($date);
-       $timet = Mktime(0,0,0, $month, $day + $days, $year);
+       $timet = mktime(0,0,0, $month, $day + $days, $year);
     if ($date_system == 1 || $date_system == 2)
     {
        if ($date_system == 1)
@@ -248,7 +269,13 @@ function add_months($date, $months) // accepts negative values as well
 {
        global $date_system;
     list($day, $month, $year) = explode_date_to_dmy($date);
-       $timet = Mktime(0,0,0, $month + $months, $day, $year);
+
+       $months += $year*12+$month;
+       $month = ($months-1)%12+1;
+       $year = ($months-$month)/12;
+
+       $timet = mktime(0,0,0, $month, min($day, days_in_month($month, $year)), $year);
+
     if ($date_system == 1 || $date_system == 2)
     {
        if ($date_system == 1)