From 9f910c04768937bd0447021ba6a0a2fe2921da0e Mon Sep 17 00:00:00 2001 From: Ronny Zimmermann Date: Fri, 12 Jun 2020 18:46:32 +0200 Subject: [PATCH] =?utf8?q?Buchungen=20in=20Konten=20wenn=20nach=20Datum=20?= =?utf8?q?sortiert=20zus=C3=A4tzlich=20nach=20Init-TS=20sortieren.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Siehe Forum: https://forum.kivitendo.ch/1368/buchung-werden-nicht-der-gebuchten-reihenfolge-angezeigt --- SL/CA.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/SL/CA.pm b/SL/CA.pm index 30d471298..019d44f49 100644 --- a/SL/CA.pm +++ b/SL/CA.pm @@ -265,7 +265,7 @@ sub all_transactions { # get all transactions $query = - qq|SELECT a.id, a.reference, a.description, ac.transdate, ac.chart_id, | . + qq|SELECT ac.itime, a.id, a.reference, a.description, ac.transdate, ac.chart_id, | . qq| FALSE AS invoice, ac.amount, 'gl' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § . qq|FROM acc_trans ac, gl a | . @@ -277,7 +277,7 @@ sub all_transactions { qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, c.name, ac.transdate, ac.chart_id, | . + qq|SELECT ac.itime, a.id, a.invnumber, c.name, ac.transdate, ac.chart_id, | . qq| a.invoice, ac.amount, 'ar' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § . qq|FROM acc_trans ac, customer c, ar a | . @@ -290,7 +290,7 @@ sub all_transactions { qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, v.name, ac.transdate, ac.chart_id, | . + qq|SELECT ac.itime, a.id, a.invnumber, v.name, ac.transdate, ac.chart_id, | . qq| a.invoice, ac.amount, 'ap' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § . qq|FROM acc_trans ac, vendor v, ap a | . @@ -326,7 +326,7 @@ sub all_transactions { $query .= qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, c.name, a.transdate, | . + qq|SELECT ac.itime, a.id, a.invnumber, c.name, a.transdate, | . qq| a.invoice, ac.qty * ac.sellprice AS sellprice, 'ar' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo § . qq|FROM ar a | . @@ -341,7 +341,7 @@ sub all_transactions { $project . qq|UNION ALL | . - qq|SELECT a.id, a.invnumber, v.name, a.transdate, | . + qq|SELECT ac.itime, a.id, a.invnumber, v.name, a.transdate, | . qq| a.invoice, ac.qty * ac.sellprice AS sellprice, 'ap' as module, | . qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo § . qq|FROM ap a | . @@ -367,7 +367,8 @@ sub all_transactions { } my $sort = grep({ $form->{sort} eq $_ } qw(transdate reference description)) ? $form->{sort} : 'transdate'; - my $sort2 = ($sort eq 'reference')?'transdate':'reference'; + $sort = ($sort eq 'transdate') ? 'transdate, itime' : $sort; + my $sort2 = ($sort eq 'reference') ? 'transdate, itime' : 'reference'; $query .= qq|ORDER BY $sort , $sort2 |; my $sth = prepare_execute_query($form, $dbh, $query, @values); -- 2.20.1