Uebernahme der kompletten Version, so wie sie Philip als "Demo-Version" gezeigt hat...

[kivitendo-erp.git] / SL / AR.pm

diff --git a/SL/AR.pm b/SL/AR.pm
index fe687ee..42f8c1c 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -103,28 +103,23 @@ sub post_transaction {
     $form->{AR_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
 
     $sth->finish;
-    if ($form->{taxincluded} *= 1) {
-      if (!$form->{"korrektur_$i"}) {
-      $tax =
-        $form->{"amount_$i"} -
-        ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 1));
+    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"};
       } 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->{netamount} += $form->{"amount_$i"};
       }
-      $form->{"tax_$i"} =
-        $form->round_amount($form->{"tax_$i"} * $form->{exchangerate}, 2);
-      $form->{netamount} += $form->{"amount_$i"};
     }
-    
     $form->{total_tax} += $form->{"tax_$i"};
   }