From 64555c0ca13dc2afaf50327cacdeba35cb67438d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Mon, 30 Aug 2021 20:35:15 +0200 Subject: [PATCH 1/2] Mahnspanne kann auch leer sein --- include/konto.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/konto.class.php b/include/konto.class.php index 8d5129ec7..c23209a06 100644 --- a/include/konto.class.php +++ b/include/konto.class.php @@ -164,7 +164,7 @@ class konto extends basis_db return false; } - if(!is_numeric($this->mahnspanne)) + if($this->mahnspanne!='' && !is_numeric($this->mahnspanne)) { $this->errormsg = "Die Mahnspanne muss eine gueltige Zahl sein"; return false; From 6034da43d8325b4bd0c433ebdf3486b6a1bbd519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 31 Aug 2021 07:56:59 +0200 Subject: [PATCH 2/2] Fixed loading of current Geschaeftsjahr if it is the last day of the year --- application/models/organisation/Geschaeftsjahr_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/organisation/Geschaeftsjahr_model.php b/application/models/organisation/Geschaeftsjahr_model.php index 9c856f40e..4f0d03b73 100644 --- a/application/models/organisation/Geschaeftsjahr_model.php +++ b/application/models/organisation/Geschaeftsjahr_model.php @@ -20,8 +20,8 @@ class Geschaeftsjahr_model extends DB_Model { $query = 'SELECT * FROM public.tbl_geschaeftsjahr - WHERE start <= now() - AND ende >= now() + WHERE start <= CURRENT_DATE + AND ende >= CURRENT_DATE ORDER BY start DESC LIMIT 1';