From: Stephan Köhler <s.koehler@linet-services.de>
Date: Fri, 13 Jan 2006 15:50:56 +0000 (+0000)
Subject: Merge von 774 aus unstable: Bugfix - Nachtrag zu R740 - Bugfix 179
X-Git-Tag: release-2.2.0~36
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=309ed4d7ccfecee812ca88928786096b4f4a8a53;p=kivitendo-erp.git

Merge von 774 aus unstable: Bugfix - Nachtrag zu R740 - Bugfix 179
Fehler im Buchungsjournal, Steuern wurden separat angezeigt, gefixed und jetzt auch sortierung moeglich
---

diff --git a/SL/GL.pm b/SL/GL.pm
index 11cbe3646..8ec98c8e5 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -350,8 +350,10 @@ sub all_transactions {
      map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
    
      if ($form->{sort}) {
-         $sortorder = $form->{sort} . ',' . $sortorder;
-     }
+         $sortorder = $form->{sort} . ",";
+     } else {
+        $sortorder = "";
+      }
   
   my $query =
     qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
@@ -382,7 +384,7 @@ sub all_transactions {
 		 AND ac.chart_id = c.id
 		 AND a.vendor_id = ct.id
 		 AND a.id = ac.trans_id
-	         ORDER BY $sortorder, oid|;
+	         ORDER BY $sortorder transdate, trans_id, taxkey DESC, sorttax DESC,oid|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
   my $trans_id = "";