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

[mfinanz.git] / SL / AP.pm

diff --git a/SL/AP.pm b/SL/AP.pm
index 0d132293f12a63772588e1f0ab093ad0c1debcba..e909890f83760f5672308d2017e14a495cf86a81 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -76,9 +76,6 @@ sub post_transaction {
                            $form->{exchangerate} * -1,
                          2);
     $amount += ($form->{"amount_$i"} * -1);
                            $form->{exchangerate} * -1,
                          2);
     $amount += ($form->{"amount_$i"} * -1);

-
-    # parse tax_$i for later
-    $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"}) * -1;

   }
 
   # this is for ap
   }
 
   # this is for ap


@@ -100,28 +97,22 @@ sub post_transaction {
     $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
 
     $sth->finish;
     $form->{AP_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
 
     $sth->finish;

-    if ($form->{taxincluded} *= 1) {
-      if (!$form->{"korrektur_$i"}) {
+    if (!$form->{"korrektur_$i"}) {
+      if ($form->{taxincluded} *= 1) {

         $tax =
           $form->{"amount_$i"} -
           ($form->{"amount_$i"} / ($form->{"taxrate_$i"} + 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 {
       } 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->{"amount_$i"} * $form->{"taxrate_$i"};

-      } else {
-        $tax = $form->{"tax_$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"} * -1;
   }
     }
     $form->{total_tax} += $form->{"tax_$i"} * -1;
   }