X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAP.pm;h=e4ff230c2e8af13b449bb70581c3745d3a9d4ee8;hb=89c9ff022d3f13e27ba6bda085df15707fcfb0eb;hp=fce222dc073386019fec8e86982b99c564bfee3e;hpb=ad73be9c179367f2e85c2297297581ca092738f1;p=kivitendo-erp.git

diff --git a/SL/AP.pm b/SL/AP.pm
index fce222dc0..e4ff230c2 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -108,26 +108,14 @@ sub post_transaction {
 
     my ($tax, $diff);
     if ($form->{taxincluded} *= 1) {
-      if (!$form->{"korrektur_$i"}) {
-        $tax =
-          $form->{"amount_$i"} -
-          ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
-      } else {
-        $tax = $form->{"tax_$i"};
-      }
+      $tax = $form->{"amount_$i"} - ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
       $amount = $form->{"amount_$i"} - $tax;
       $form->{"amount_$i"} = $form->round_amount($amount, 2);
       $diff += $amount - $form->{"amount_$i"};
       $form->{"tax_$i"} = $form->round_amount($tax, 2);
       $form->{netamount} += $form->{"amount_$i"};
     } else {
-      if (!$form->{"korrektur_$i"}) {
-        $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
-      } else {
-        $tax = $form->{"tax_$i"};
-      }
-      $form->{"tax_$i"} =
-        $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
+      $form->{"tax_$i"} = $form->{"amount_$i"} * $form->{"taxrate_$i"};
       $form->{netamount} += $form->{"amount_$i"};
     }
     $form->{total_tax} += $form->{"tax_$i"} * -1;
@@ -372,7 +360,7 @@ sub post_transaction {
 sub delete_transaction {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $spool) = @_;
+  my ($self, $myconfig, $form) = @_;
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
@@ -781,7 +769,7 @@ sub storno {
   }
 
   for my $row (@$rowref) {
-    delete @$row{qw(itime mtime link)};
+    delete @$row{qw(itime mtime link acc_trans_id)};
     $query = sprintf 'INSERT INTO acc_trans (%s) VALUES (%s)', join(', ', keys %$row), join(', ', map '?', values %$row);
     $row->{trans_id}   = $new_id;
     $row->{amount}    *= -1;