X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=591f580b720f96caf805e8e2c06b9714bbce5050;hb=8004e6a1b3d81cf3ba148d4f2b2eaca980cc467f;hp=c7a88d2df81c26044b7fe66f1e93624e65c16711;hpb=b74b299f5b0d77f0134c66078bbbcd0e7c93aeaf;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index c7a88d2df..591f580b7 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -475,11 +475,9 @@ sub delete_account {
     do_query($form, $dbh, $query, $form->{id});
   }
 
-  foreach my $table (qw(partstax customertax vendortax tax)) {
-    $query = qq|DELETE FROM $table
-                WHERE chart_id = ?|;
-    do_query($form, $dbh, $query, $form->{id});
-  }
+  $query = qq|DELETE FROM tax
+              WHERE chart_id = ?|;
+  do_query($form, $dbh, $query, $form->{id});
 
   # delete chart of account record
   $query = qq|DELETE FROM chart
@@ -1779,7 +1777,9 @@ sub get_tax {
                    taxkey,
                    taxdescription,
                    round(rate * 100, 2) AS rate,
-                   chart_id
+                   chart_id,
+                   (id IN (SELECT tax_id
+                           FROM acc_trans)) AS tax_already_used
                  FROM tax
                  WHERE id = ? |;