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'; diff --git a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php index 931a09d80..be41e06c7 100644 --- a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php +++ b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php @@ -106,7 +106,7 @@ public.tbl_reihungstest LEFT JOIN public.tbl_studiengang using(studiengang_kz) WHERE - datum>now()-'5 months'::interval + datum>now()-'12 months'::interval ORDER BY datum desc ) data ", diff --git a/include/coodle.class.php b/include/coodle.class.php index 41394dcb5..9f23f88da 100644 --- a/include/coodle.class.php +++ b/include/coodle.class.php @@ -373,7 +373,7 @@ class coodle extends basis_db WHERE (uid =".$this->db_add_param($uid, FHC_STRING, false)." OR ersteller_uid =".$this->db_add_param($uid, FHC_STRING, false).") - AND endedatum >= CURRENT_DATE - interval '20 days';"; + AND endedatum >= CURRENT_DATE - interval '90 days';"; if(!$this->db_query($qry)) { 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; diff --git a/include/person.class.php b/include/person.class.php index 328cc413c..a50417db0 100644 --- a/include/person.class.php +++ b/include/person.class.php @@ -276,7 +276,7 @@ class person extends basis_db $erg += $gewichtung[$i] * $this->svnr{$i}; } - if ($this->svnr{3} != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11 + if ($this->svnr[3] != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11 { $this->errormsg = 'SVNR ist ungueltig'; return false;