X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=b0e04403277095ecb6fc02a0a8c418ef440f4d75;hb=5e49b259ece6c5e4aa80e9c775a894972a139547;hp=0d132293f12a63772588e1f0ab093ad0c1debcba;hpb=7d45de0525425d2712699d01ff125dbad6bddeb1;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index 0d132293f..b0e044032 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -88,13 +88,15 @@ sub post_transaction {
   $form->{taxincluded} = 0 if ($form->{amount} == 0);
 
   for $i (1 .. $form->{rowcount}) {
-    ($form->{"taxkey_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+   ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
 
-    $query =
-      qq| SELECT c.accno, t.rate FROM chart c, tax t where c.id=t.chart_id AND t.taxkey=$form->{"taxkey_$i"}|;
+    $query = qq|SELECT c.accno, t.taxkey, t.rate
+            FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
+            WHERE t.id=$form->{"tax_id_$i"}
+            ORDER BY c.accno|;
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
-    ($form->{AP_amounts}{"tax_$i"}, $form->{"taxrate_$i"}) =
+    ($form->{AP_amounts}{"tax_$i"}, $form->{"taxkey_$i"}, $form->{"taxrate_$i"}) =
       $sth->fetchrow_array;
     $form->{AP_amounts}{"tax_$i"}{taxkey}    = $form->{"taxkey_$i"};
     $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};