Could not enter a year before other years (removed readonly begin)

[fa-stable.git] / admin / db / fiscalyears_db.inc

diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc
index b2f62413045d903703db9f67ecc5d7b1b0bb6a6d..669e8c3c91f7fbb00572b45b8d7f72a124a9f4bb 100644 (file)
--- a/admin/db/fiscalyears_db.inc
+++ b/admin/db/fiscalyears_db.inc
@@ -81,23 +81,26 @@ function is_date_in_fiscalyears($date, $closed=true)
        return db_fetch($result) !== false;
 }
 
-function check_begin_date($date="", $check=true)
+function check_begin_end_date($date1, $date2)
+{
+       $sql = "SELECT MAX(end), MIN(begin) FROM ".TB_PREF."fiscal_year";
+       $result = db_query($sql, "could not retrieve last fiscal years");
+       $row = db_fetch_row($result);
+       if ($row[0] === null)
+               return true;
+       $max = add_days(sql2date($row[0]), 1);
+       $min = add_days(sql2date($row[1]), -1);
+       return ($max === $date1 || $min === $date2);
+}
+
+function next_begin_date()
 {
        $sql = "SELECT MAX(end) FROM ".TB_PREF."fiscal_year";
-       if ($date !== "")
-       {
-               $bdate = date2sql($date);
-               $sql .= " WHERE begin < '$bdate'";
-       }
        $result = db_query($sql, "could not retrieve last fiscal years");
        $row = db_fetch_row($result);
        if ($row[0] === null)
                return false;
-       $max = add_days(sql2date($row[0]), 1);
-       if ($check)
-               return ($max === $date);
-       else 
-               return $max;
+       return add_days(sql2date($row[0]), 1);
 }
 
 function check_years_before($date, $closed=false)