Merge remote-tracking branch 'origin/master'

2026-07-25 16:44:28 +00:00 · 2018-05-16 15:44:24 +02:00
parent eafa89ce10 58950d581d
commit 24d4c316e4
25 changed files with 656 additions and 76 deletions
@@ -21,7 +21,9 @@ class Geschaeftsjahr_model extends DB_Model
 		$query = 'SELECT *
 					FROM public.tbl_geschaeftsjahr
 					WHERE start <= now()
-					AND ende >= now()';
+					AND ende >= now()
+					ORDER BY start DESC
+					LIMIT 1';

 		return $this->execQuery($query);
 	}