Skip to content

Commit 10416c3

Browse files
committed
Fehlerkorrektur: Kompatibilität mit MySQL 5.7.12 hergestellt.
1 parent 3ee5c45 commit 10416c3

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
lib/Database.php
2-
.htusers
2+
.htusers
3+
.htaccess
4+
.htpasswd

controller/ErgebnisController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ function getVerlauf($request) {
282282
# Nur immer die letzten 12 Monate anzeigen
283283
$sql .= "and (year(datum)*100)+month(datum) >= ((year(now())*100)+month(now()))-100 ";
284284

285-
$sql .= "group by kontenart_id, year(datum), month(datum) ";
285+
$sql .= "group by kontenart_id, grouping ";
286286
$sql .= "order by grouping";
287287

288288
$rs = mysqli_query($db, $sql);
@@ -308,7 +308,7 @@ function getVerlaufGewinn() {
308308
# Nur immer die letzten 12 Monate anzeigen
309309
$sql .= "and (year(datum)*100)+month(datum) >= ((year(now())*100)+month(now()))-100 ";
310310

311-
$sql .= "group by year(datum), month(datum) ";
311+
$sql .= "group by grouping ";
312312
$sql .= "order by grouping";
313313

314314
$rs = mysqli_query($db, $sql);

sql/query/bilanz_summen.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ from (
4343
group by b.mandant_id
4444
) as soll
4545
left outer join (
46-
select b.mandant_id, k.kontenart_id, sum(b.betrag) as betrag
46+
select b.mandant_id, sum(b.betrag) as betrag
4747
from fi_buchungen b
4848
inner join fi_konto k
4949
on b.mandant_id = k.mandant_id

sql/query/guv_jahr.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
select kontonummer as konto, bezeichnung as kontenname,
2-
case when kontenart_id = 4 then sum(betrag)*-1
3-
else sum(betrag) end as saldo
2+
sum(case when kontenart_id = 4 then betrag*-1
3+
else betrag end) as saldo
44
from (
55

66
select k.kontonummer as kontonummer,

sql/query/guv_monat.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
select kontonummer as konto, bezeichnung as kontenname,
2-
case when kontenart_id = 4 then sum(betrag)*-1
3-
else sum(betrag) end as saldo
2+
sum(case when kontenart_id = 4 then betrag*-1
3+
else betrag end) as saldo
44
from (
55

66
select k.kontonummer as kontonummer,

sql/query/guv_prognose_summen.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ group by (year(b.datum)*100)+month(b.datum)
5858
) as base_view
5959
inner join fi_kontenart as ka
6060
on base_view.kontenart_id = ka.kontenart_id
61-
group by ka.bezeichnung, monat
61+
group by ka.kontenart_id, ka.bezeichnung, monat
6262
having monat is not null
6363
order by monat, ka.bezeichnung

0 commit comments

Comments
 (0)