projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 5685: Bank Statement w/Reconcile report includes gl_trans values that are "0...
[fa-stable.git]
/
includes
/
date_functions.inc
diff --git
a/includes/date_functions.inc
b/includes/date_functions.inc
index af05456353a76e126a61e83c3f89ec49bf97ebcf..2538f79d65f3edc24c031ae23f176a5359e10592 100644
(file)
--- a/
includes/date_functions.inc
+++ b/
includes/date_functions.inc
@@
-199,11
+199,12
@@
function is_date_in_fiscalyear($date, $convert=false)
else
$date2 = $date;
else
$date2 = $date;
+ if (is_date_closed($date2))
+ return 0;
+
if (user_check_access('SA_MULTIFISCALYEARS')) // allow all open years for this one
return is_date_in_fiscalyears($date2, false);
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']);
$myrow = get_current_fiscalyear();
$begin = sql2date($myrow['begin']);
$end = sql2date($myrow['end']);
@@
-349,7
+350,8
@@
function sql2date($date_)
global $SysPrefs;
//for MySQL dates are in the format YYYY-mm-dd
global $SysPrefs;
//for MySQL dates are in the format YYYY-mm-dd
-
+ if ($date_ == null)
+ return "";
if (strpos($date_, "/"))
{ // In MySQL it could be either / or -
list($year, $month, $day) = explode("/", $date_);
if (strpos($date_, "/"))
{ // In MySQL it could be either / or -
list($year, $month, $day) = explode("/", $date_);
@@
-382,10
+384,10
@@
and converts to a yyyy/mm/dd format */
$how = user_date_format();
$sep = $SysPrefs->dateseps[user_date_sep()];
$how = user_date_format();
$sep = $SysPrefs->dateseps[user_date_sep()];
+ $date_ = trim($date_);
if ($date_ == null || strlen($date_) == 0)
return "";
if ($date_ == null || strlen($date_) == 0)
return "";
- $date_ = trim($date_);
$year = $month = $day = 0;
// Split up the date by the separator based on "how" to split it
if ($how == 0 || $how == 3) // MMDDYYYY or MmmDDYYYY
$year = $month = $day = 0;
// Split up the date by the separator based on "how" to split it
if ($how == 0 || $how == 3) // MMDDYYYY or MmmDDYYYY
@@
-394,32
+396,34
@@
and converts to a yyyy/mm/dd format */
list($day, $month, $year) = explode($sep, $date_);
else // $how == 2 || $how == 5, YYYYMMDD or YYYYMmmDD
list($year, $month, $day) = explode($sep, $date_);
list($day, $month, $year) = explode($sep, $date_);
else // $how == 2 || $how == 5, YYYYMMDD or YYYYMmmDD
list($year, $month, $day) = explode($sep, $date_);
+
if ($how > 2)
{
global $tmonths;
$month = array_search($month, $tmonths);
if ($how > 2)
{
global $tmonths;
$month = array_search($month, $tmonths);
- }
-//to modify assumption in 2030
- if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3)
- {
- if ((int)$year < 60)
+ }
+ if ($year+$day+$month) {
+ //to modify assumption in 2030
+ if ($SysPrefs->date_system == 0 || $SysPrefs->date_system == 3)
{
{
- $year = "20".$year;
- }
- elseif ((int)$year > 59 && (int)$year < 100)
+ if ((int)$year < 60)
+ {
+ $year = "20".$year;
+ }
+ elseif ((int)$year > 59 && (int)$year < 100)
+ {
+ $year = "19".$year;
+ }
+ }
+ if ((int)$year > 9999)
{
{
-
$year = "19".$year
;
+
return 0
;
}
}
- }
- if ((int)$year > 9999)
- {
- return 0;
+ if ($SysPrefs->date_system == 1)
+ list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);
+ elseif ($SysPrefs->date_system == 2)
+ list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);
}
}
- if ($SysPrefs->date_system == 1)
- list($year, $month, $day) = jalali_to_gregorian($year, $month, $day);
- elseif ($SysPrefs->date_system == 2)
- list($year, $month, $day) = islamic_to_gregorian($year, $month, $day);
-
return sprintf("%04d-%02d-%02d", $year, $month, $day);
}// end of function
return sprintf("%04d-%02d-%02d", $year, $month, $day);
}// end of function