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

diff --git a/includes/date_functions.inc b/includes/date_functions.inc
index a027f89d..6f8379e0 100644
--- a/includes/date_functions.inc
+++ b/includes/date_functions.inc
@@ -160,22 +160,26 @@ 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;
-	$begin = sql2date($myrow['begin']);
-	$end = sql2date($myrow['end']);
-	if (date1_greater_date2($begin, $date2) || date1_greater_date2($date2, $end))
-	{
-		return 0;
-	}
-	return 1;
+    //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()
@@ -207,30 +211,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)
@@ -246,7 +266,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)