X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdate_functions.inc;h=6f8379e072877bbf9413f274ca29366da2af68a6;hb=5713335aa831bf146e72d2310128beaaa00b43c9;hp=febf609f7fe5b94ada520345dba9ac52820f41a8;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index febf609f..6f8379e0 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -1,12 +1,21 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 /*
 date validation and parsing functions
 
 These functions refer to the global variable defining the date format
-The date format is defined in config.php called DefaultDateFormat
+The date format is defined in config.php called dateformats
 this can be a string either "d/m/Y" for UK/Australia/New Zealand dates or
-"m/d/Y" for US/Canada format dates
+"m/d/Y" for US/Canada format dates depending on setting in preferences.
 
 */
 
@@ -24,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;
@@ -94,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))
 		{
@@ -120,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);	
 }
@@ -132,32 +141,51 @@ function Now()
 	else
 		return date("H:i");
 }
+//
+//	Retrieve and optionaly set default date for new document.
+//
+function new_doc_date($date=null)
+{
+	if (isset($date) && $date != '')
+		$_SESSION['_default_date'] = $date;
+
+	if (!isset($_SESSION['_default_date']) || !sticky_doc_date())
+		$_SESSION['_default_date'] = Today();
+
+	return $_SESSION['_default_date'];
+}
 
 function is_date_in_fiscalyear($date, $convert=false)
 {
 	global $path_to_root;
-	include_once($path_to_root . "/admin/db/company_db.inc");
-
-	$myrow = get_current_fiscalyear();
-	if ($myrow['closed'] == 1)
-		return 0;
-	if ($convert)
-		$date2 = sql2date($date);
-	else
-		$date2 = $date;
-	$begin = sql2date($myrow['begin']);
-	$end = sql2date($myrow['end']);
-	if (date1_greater_date2($begin, $date2) || date1_greater_date2($date2, $end))
-	{
-		return 0;
-	}
-	return 1;
+	include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
+
+    //Chaitanya
+    if ($convert)
+        $date2 = sql2date($date);
+    else
+        $date2 = $date;
+
+    if ($_SESSION["wa_current_user"]->can_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
+        return is_date_in_fiscalyears($date2, false); 
+
+    $myrow = get_current_fiscalyear();
+    if ($myrow['closed'] == 1)
+        return 0;
+    
+    $begin = sql2date($myrow['begin']);
+    $end = sql2date($myrow['end']);
+    if (date1_greater_date2($begin, $date2) || date1_greater_date2($date2, $end))
+    {
+        return 0;
+    }
+    return 1;
 }
 
 function begin_fiscalyear()
 {
 	global $path_to_root;
-	include_once($path_to_root . "/admin/db/company_db.inc");
+	include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 
 	$myrow = get_current_fiscalyear();
 	return sql2date($myrow['begin']);
@@ -166,7 +194,7 @@ function begin_fiscalyear()
 function end_fiscalyear()
 {
 	global $path_to_root;
-	include_once($path_to_root . "/admin/db/company_db.inc");
+	include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 
 	$myrow = get_current_fiscalyear();
 	return sql2date($myrow['end']);
@@ -178,40 +206,56 @@ 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);
 }
 
-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));
 	}
-	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));
 	}
 	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)
     		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);
     }
@@ -222,12 +266,18 @@ 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)
     		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);
     }
@@ -243,7 +293,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);
     }
@@ -275,7 +325,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
@@ -294,53 +344,18 @@ and converts to a yyyy/mm/dd format */
 		return "";
 
 	$date_ = trim($date_);
-	$date_ = str_replace($sep, "", $date_);
+    $year = $month = $day = 0;
 
-	if (strlen($date_) == 6)
-	{
-		if ($how == 0)
-		{
-			$day = substr($date_,2,2);
-			$month = substr($date_,0,2);
-			$year = substr($date_,4,2);
-		} 
-		elseif ($how == 1)
-		{
-			$day = substr($date_,0,2);
-			$month = substr($date_,2,2);
-			$year = substr($date_,4,2);
-		} 
-		else
-		{
-			$day = substr($date_,4,2);
-			$month = substr($date_,2,2);
-			$year = substr($date_,0,2);
-		}
-	}
-	elseif (strlen($date_) == 8)
-	{
-		if ($how == 0)
-		{
-			$day = substr($date_,2,2);
-			$month = substr($date_,0,2);
-			$year = substr($date_,4,4);
-		} 
-		elseif ($how == 1)
-		{
-			$day = substr($date_,0,2);
-			$month = substr($date_,2,2);
-			$year = substr($date_,4,4);
-		} 
-		else
-		{
-			$day = substr($date_,6,2);
-			$month = substr($date_,4,2);
-			$year = substr($date_,0,4);
-		}
-	}
+    // Split up the date by the separator based on "how" to split it
+    if ($how == 0) // MMDDYYYY
+        list($month, $day, $year) = explode($sep, $date_);
+    elseif ($how == 1) // DDMMYYYY
+        list($day, $month, $year) = explode($sep, $date_);
+    else // $how == 2, YYYYMMDD
+        list($year, $month, $day) = explode($sep, $date_);
 
 //to modify assumption in 2030
-	if ($date_system == 0)
+	if ($date_system == 0 || $date_system == 3)
 	{
 		if ((int)$year < 60)
 		{
@@ -357,9 +372,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); 
-	return $year."/".$month."/".$day;
+
+	return sprintf("%04d-%02d-%02d", $year, $month, $day);
 }// end of function
 
 function date1_greater_date2 ($date1, $date2) 
@@ -369,8 +385,9 @@ function date1_greater_date2 ($date1, $date2)
 
 	$date1 = date2sql($date1);
 	$date2 = date2sql($date2);
-	list($year1, $month1, $day1) = explode("/", $date1);
-	list($year2, $month2, $day2) = explode("/", $date2);
+
+	@list($year1, $month1, $day1) = explode("-", $date1);
+	@list($year2, $month2, $day2) = explode("-", $date2);
 
 	if ($year1 > $year2)
 	{
@@ -394,7 +411,7 @@ function date1_greater_date2 ($date1, $date2)
 }
 
 
-function date_diff ($date1, $date2, $period) 
+function date_diff2 ($date1, $date2, $period) 
 {
 
 /* expects dates in the format specified in $DefaultDateFormat - period can be one of 'd','w','y','m'
@@ -403,8 +420,8 @@ provided that both dates are after 1970. Also only works for dates up to the yea
 
 	$date1 = date2sql($date1);
 	$date2 = date2sql($date2);
-	list($year1, $month1, $day1) = explode("/", $date1);
-	list($year2, $month2, $day2) = explode("/", $date2);
+	list($year1, $month1, $day1) = explode("-", $date1);
+	list($year2, $month2, $day2) = explode("-", $date2);
 
 	$stamp1 = mktime(0,0,0, (int)$month1, (int)$day1, (int)$year1);
 	$stamp2 = mktime(0,0,0, (int)$month2, (int)$day2, (int)$year2);
@@ -434,11 +451,9 @@ function explode_date_to_dmy($date_)
 	$date = date2sql($date_);
 	if ($date == "") 
 	{
-		$disp = user_date_display();
-		echo "<br>Dates must be entered in the format $disp. Sent was $date_<br>";
-		exit;
+		return array(0,0,0);
 	}
-	list($year, $month, $day) = explode("/", $date);
+	list($year, $month, $day) = explode("-", $date);
 	return array($day, $month, $year);
 }