From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 29 Apr 2013 14:15:28 +0000 (+0200)
Subject: Steuern nach Steuerschlüssel und Steuersatz ordnen
X-Git-Tag: release-3.1.0beta1~436
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=99d05c2cc969eb4913cac08ae4331c4e6a82726a;p=kivitendo-erp.git

Steuern nach Steuerschlüssel und Steuersatz ordnen

Steuern wurden bisher immer nur nach Steuerschlüssel geordnet. Jetzt
wird eine neue Untersortierung verwendet (Steuersatz).
---

diff --git a/SL/AM.pm b/SL/AM.pm
index 0c3c835b3..c85c47911 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1717,7 +1717,7 @@ sub taxes {
                    (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber,
                    (SELECT description FROM chart WHERE id = chart_id) AS account_description
                  FROM tax t
-                 ORDER BY taxkey|;
+                 ORDER BY taxkey, rate|;
 
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
diff --git a/SL/Form.pm b/SL/Form.pm
index 810891ef9..7b5d257b8 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2106,7 +2106,7 @@ sub _get_taxcharts {
 
   my $where = @where ? ' WHERE ' . join(' AND ', map { "($_)" } @where) : '';
 
-  my $query = qq|SELECT * FROM tax $where ORDER BY taxkey|;
+  my $query = qq|SELECT * FROM tax $where ORDER BY taxkey, rate|;
 
   $self->{$key} = selectall_hashref_query($self, $dbh, $query);