From 7208f992db27892be25cdb9c988f95430f6d8627 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stephan=20K=C3=B6hler?= Date: Sat, 26 Nov 2005 15:11:28 +0000 Subject: [PATCH] Merge von 634,636 aus unstable: Bugfix -Steuerbetraege wurden beim Drucken ohne Nachkommstelle angezeig -Ein ueberfluessiges ' entfernt. --- SL/Form.pm | 2 +- SL/IS.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SL/Form.pm b/SL/Form.pm index 0573ed9d0..867f946c6 100644 --- 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 540c874e5..8664b994e 100644 --- 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)); -- 2.20.1