Erlaube die Uebergabe von weiteren Parametern direkt an die HTML-Vorlage unter Umgehu...

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

diff --git a/SL/AR.pm b/SL/AR.pm
index a6b0f42..42f8c1c 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -74,13 +74,18 @@ sub post_transaction {
                           2);
 
     $form->{netamount} += $form->{"amount_$i"};
+
+    # parse tax_$i for later
+    $form->{"tax_$i"} = $form->parse_amount($myconfig, $form->{"tax_$i"});
   }
 
   # this is for ar
 
   $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
 
@@ -112,6 +117,7 @@ sub post_transaction {
         $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->{total_tax} += $form->{"tax_$i"};
@@ -443,7 +449,7 @@ sub ar_transactions {
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{l_employee};
   my $sortorder = join ', ', $form->sort_columns(@a);
-  $sortorder = $form->{sort} unless $sortorder;
+  $sortorder = $form->{sort} if $form->{sort};
 
   $query .= "WHERE $where
              ORDER by $sortorder";