X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=fe687ee8652e9a534b3717750f24ea3ca85d31d3;hb=4a648176621310d6b0c099c7f7af2d5a8ecf0890;hp=e3e363191f7a7eb7e7881ee585f8af56f8e01f09;hpb=8e53eafd1ab02a8d310691c245279c732031df3b;p=kivitendo-erp.git

diff --git a/SL/AR.pm b/SL/AR.pm
index e3e363191..fe687ee86 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -83,7 +83,9 @@ sub post_transaction {
 
   $form->{amount} = $form->{netamount};
 
-  $form->{tax} = 0;
+  $form->{tax}       = 0;
+  $form->{netamount} = 0;
+  $form->{total_tax} = 0;
 
   # taxincluded doesn't make sense if there is no amount
 
@@ -101,22 +103,28 @@ sub post_transaction {
     $form->{AR_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
 
     $sth->finish;
-    if (!$form->{"korrektur_$i"}) {
-      if ($form->{taxincluded} *= 1) {
-        $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"};
+    if ($form->{taxincluded} *= 1) {
+      if (!$form->{"korrektur_$i"}) {
+      $tax =
+        $form->{"amount_$i"} -
+        ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
       } else {
+        $tax = $form->{"tax_$i"};
+      }
+      $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"};
-        $form->{"tax_$i"} =
-          $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
       }
+      $form->{"tax_$i"} =
+        $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
+      $form->{netamount} += $form->{"amount_$i"};
     }
+    
     $form->{total_tax} += $form->{"tax_$i"};
   }