X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdate_functions.inc;h=de99c14667314eef3d1d0634e1c6d357a9731a4b;hb=175a48c5bd73abe16e77fa2cb48ba522f00d1501;hp=8fc1447a4c74cba52bed6e8ba8f81071569b43e4;hpb=ab76c9f299dbfa859fd18cde67215bbf2c86e55d;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index 8fc1447a..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)
 {
@@ -35,7 +33,7 @@ function __date($year, $month, $day)
 		$month = "0".$month;
 	if ($how == 0)
 		return $month.$sep.$day.$sep.$year;
-	else if ($how == 1)
+	elseif ($how == 1)
 		return $day.$sep.$month.$sep.$year;
 	else
 		return $year.$sep.$month.$sep.$day;
@@ -105,7 +103,7 @@ function is_date($date_)
 		global $date_system;
 		if ($date_system == 1)
 			list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);  
-		else if ($date_system == 2)	
+		elseif ($date_system == 2)	
 			list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);  
 		if (checkdate((int)$month, (int)$day, (int)$year))
 		{
@@ -131,7 +129,7 @@ function Today()
 	$day = date("j");
 	if ($date_system == 1)
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-	else if ($date_system == 2)	
+	elseif ($date_system == 2)	
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	return __date($year, $month, $day);	
 }
@@ -162,9 +160,11 @@ function is_date_in_fiscalyear($date, $convert=false)
 	global $path_to_root;
 	include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 
-	$myrow = get_current_fiscalyear();
-	if ($myrow['closed'] == 1)
+	if (user_check_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
+		return is_date_in_fiscalyears($date, false);
+	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;
@@ -202,7 +207,7 @@ function begin_month($date)
     list($day, $month, $year) = explode_date_to_dmy($date);
     if ($date_system == 1)
     	list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-    else if ($date_system == 2)	
+    elseif ($date_system == 2)	
     	list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
    	return __date($year, $month, 1);
 }
@@ -216,7 +221,7 @@ function end_month($date)
 		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));
 	}
-	else if ($date_system == 2)
+	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));
@@ -235,7 +240,7 @@ function add_days($date, $days) // accepts negative values as well
     {
     	if ($date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	else if ($date_system == 2) 	
+    	elseif ($date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -251,7 +256,7 @@ function add_months($date, $months) // accepts negative values as well
     {
     	if ($date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	else if ($date_system == 2) 	
+    	elseif ($date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -267,7 +272,7 @@ function add_years($date, $years) // accepts negative values as well
     {
     	if ($date_system == 1)
     		list($year, $month, $day) = gregorian_to_jalali(date("Y", $timet), date("n", $timet), date("j", $timet));
-    	else if ($date_system == 2) 	
+    	elseif ($date_system == 2) 	
     		list($year, $month, $day) = gregorian_to_islamic(date("Y", $timet), date("n", $timet), date("j", $timet));
     	return __date($year, $month, $day);
     }
@@ -299,7 +304,7 @@ function sql2date($date_)
 	}
 	if ($date_system == 1)
 		list($year, $month, $day) = gregorian_to_jalali($year, $month, $day);
-	else if ($date_system == 2)
+	elseif ($date_system == 2)
 		list($year, $month, $day) = gregorian_to_islamic($year, $month, $day);
 	return __date($year, $month, $day);	
 } // end function sql2date
@@ -346,16 +351,10 @@ and converts to a yyyy/mm/dd format */
 	}
 	if ($date_system == 1)
 		list($year, $month, $day) = jalali_to_gregorian($year, $month, $day); 
-	else if ($date_system == 2)
+	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)