Merge remote-tracking branch 'origin/master'

This commit is contained in:
Manfred
2022-02-23 16:17:27 +01:00
10 changed files with 495 additions and 85 deletions
+1 -1
View File
@@ -48,7 +48,7 @@ class bisverwendung extends basis_db
public $inkludierte_lehre;
public $zeitaufzeichnungspflichtig;
public $azgrelevant;
public $homeoffice;
public $homeoffice=false;
public $ba1bez;
public $ba2bez;
+1
View File
@@ -1358,6 +1358,7 @@ class mitarbeiter extends benutzer
WHERE
bismelden
AND personalnummer>0
AND tbl_bisverwendung.beginn<='.$this->db_add_param($meldungEnde).'
AND (tbl_bisverwendung.ende is NULL OR tbl_bisverwendung.ende>'.$this->db_add_param($meldungBeginn).')
ORDER BY uid, nachname,vorname
';