Merge von 634,636 aus unstable: Bugfix

-Steuerbetraege wurden beim Drucken ohne Nachkommstelle angezeig
-Ein ueberfluessiges ' entfernt.

diff --git a/SL/Form.pm b/SL/Form.pm
index 0573ed9..867f946 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2209,7 +2209,7 @@ sub audittrail {
        $query = qq|INSERT INTO audittrail (trans_id, tablename, reference,
                    formname, action, employee_id, transdate) VALUES (
                    $audittrail->{id}, '$audittrail->{tablename}', |
-                   .$dbh->quote($audittrail->{reference}).qq|',
+                   .$dbh->quote($audittrail->{reference}).qq|,
                    '$audittrail->{formname}', '$audittrail->{action}',
                    $employee_id, '$audittrail->{transdate}')|;
       } else {

diff --git a/SL/IS.pm b/SL/IS.pm
index 540c874..8664b99 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -269,7 +269,7 @@ sub invoice_details {
 
       $tax += $taxamount = $form->round_amount($taxaccounts{$item}, 2);
 
-      push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount));
+      push(@{ $form->{tax} }, $form->format_amount($myconfig, $taxamount, 2));
       push(@{ $form->{taxdescription} }, $form->{"${item}_description"});
       push(@{ $form->{taxrate} },
            $form->format_amount($myconfig, $form->{"${item}_rate"} * 100));