projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug. is_date_closed() should be performed before is_date_in_fiscalyears().
[fa-stable.git]
/
includes
/
date_functions.inc
diff --git
a/includes/date_functions.inc
b/includes/date_functions.inc
index af05456353a76e126a61e83c3f89ec49bf97ebcf..7aa16acc738823019b9a29d01ef6d79ced22d9d1 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']);