blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-17 03:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/Anrechnungen_NEU

Browse Source
This commit is contained in:
Andreas Österreicher
2021-09-03 11:08:29 +02:00
parent 58ce5a9132 0099aaadb0
commit 4b94dfbda7
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/organisation/Geschaeftsjahr_model.php
+2 -2
View File
@@ -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';
application/views/organisation/reihungstest/ReihungstestUebersichtData.php
+1 -1
View File
@@ -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
",
include/coodle.class.php
+1 -1
View File
@@ -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))
{
include/konto.class.php
+1 -1
View File
@@ -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;
include/person.class.php
+1 -1
View File
@@ -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;