Merge von 780 aus unstable: Bugfix Splitbuchungen

Kleiner Bug bei Splittbuchungen

diff --git a/SL/AP.pm b/SL/AP.pm
index 8be0c8f..2a486c8 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -142,14 +142,7 @@ sub post_transaction {
 
   # amount for total AP
   $form->{payables} = $form->{invtotal};
-  print(STDERR $form->{payables},
-        " Payables\n",
-        $form->{invtotal},
-        " Invtotal\n",
-        $form->{netamount},
-        " Netamount\n",
-        $form->{total_tax},
-        " Total_Tax\n\n");
+
   my ($query, $sth);
 
   # if we have an id delete old records

diff --git a/SL/AR.pm b/SL/AR.pm
index e3e3631..aeb6430 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -113,8 +113,8 @@ sub post_transaction {
         $form->{netamount} += $form->{"amount_$i"};
       } else {
         $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"};