diff --git a/include/konto.class.php b/include/konto.class.php index d68432fcb..0c3c99070 100644 --- a/include/konto.class.php +++ b/include/konto.class.php @@ -347,6 +347,7 @@ class konto $this->errormsg = 'Person_id muss eine gueltige Zahl sein'; return false; } + if($studiengang_kz!='') $stgwhere = " AND tbl_konto.studiengang_kz='$studiengang_kz' "; else @@ -357,7 +358,7 @@ class konto //Alle Buchungen und 'darunterliegende' holen die noch offen sind $qry = "SELECT tbl_konto.*, anrede, titelpost, titelpre, nachname, vorname, vornamen FROM public.tbl_konto JOIN public.tbl_person USING (person_id) - WHERE buchungsnr in (SELECT buchungsnr FROM public.tbl_konto as konto_a WHERE + WHERE (buchungsnr in (SELECT buchungsnr FROM public.tbl_konto as konto_a WHERE (betrag + (SELECT CASE WHEN sum(betrag) is null THEN 0 ELSE sum(betrag) END FROM public.tbl_konto WHERE buchungsnr_verweis=konto_a.buchungsnr))<>0 @@ -366,13 +367,13 @@ class konto (betrag + (SELECT CASE WHEN sum(betrag) is null THEN 0 ELSE sum(betrag) END FROM public.tbl_konto WHERE buchungsnr_verweis=konto_a.buchungsnr))<>0 - AND person_id='$person_id') $stgwhere ORDER BY buchungsdatum"; + AND person_id='$person_id')) $stgwhere ORDER BY buchungsdatum"; } else $qry = "SELECT tbl_konto.*, anrede, titelpost, titelpre, nachname, vorname, vornamen FROM public.tbl_konto JOIN public.tbl_person USING (person_id) WHERE person_id='".$person_id."' $stgwhere ORDER BY buchungsdatum"; - + //echo $qry; if($result = pg_query($this->conn, $qry)) { while($row = pg_fetch_object($result)) diff --git a/rdf/konto.rdf.php b/rdf/konto.rdf.php index 943cc7b68..053b1bf88 100644 --- a/rdf/konto.rdf.php +++ b/rdf/konto.rdf.php @@ -99,6 +99,7 @@ if(isset($_SERVER['REMOTE_USER'])) if($kontofilterstg=='false') $studiengang_kz=''; } + if($person_id!='') { $konto->getBuchungen($person_id, $filter, $studiengang_kz); diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index 10224d2f4..fa099a0f7 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -52,7 +52,7 @@ function convdate($date) function checkfilter($row, $filter2) { - global $conn, $studiensemester_kurzbz; + global $conn, $studiensemester_kurzbz, $kontofilterstg; if($filter2=='dokumente') { @@ -70,6 +70,9 @@ function checkfilter($row, $filter2) { // Alle Personen die offene Buchungen haben $qry = "SELECT sum(betrag) as summe FROM tbl_konto WHERE person_id='$row->person_id'"; + if($kontofilterstg=='true') + $qry.=" AND studiengang_kz='$row->studiengang_kz'"; + //echo $qry; if($result_filter = pg_query($conn, $qry)) if($row_filter = pg_fetch_object($result_filter)) if($row_filter->summe=='0.00' || $row_filter->summe=='' || $row_filter->summe=='0') diff --git a/vilesci/stammdaten/firma_details.php b/vilesci/stammdaten/firma_details.php index 8e3d81fbe..ddf31de00 100644 --- a/vilesci/stammdaten/firma_details.php +++ b/vilesci/stammdaten/firma_details.php @@ -59,7 +59,7 @@ if($firma->save()) { $reloadstr .= "\n"; } diff --git a/vilesci/stammdaten/firma_frameset.html b/vilesci/stammdaten/firma_frameset.html index 69b76bd86..fdfd4f0c5 100644 --- a/vilesci/stammdaten/firma_frameset.html +++ b/vilesci/stammdaten/firma_frameset.html @@ -8,8 +8,8 @@