X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/6f2050063ffa5417ab4495af84625385c766bc2d..03ea97647e3fbdea4323f4f2136bdfa87cb15c1b:/bin/mozilla/rp.pl

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index c23abeb59..8004e920a 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1419,8 +1419,8 @@ sub generate_trial_balance {
   $report->set_options('output_format'        => 'HTML',
                        'title'                => $form->{title},
                        'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
-                       'html_template'        => 'report_generator/html_report_susa',
-                       'pdf_template'         => 'report_generator/html_report_susa',
+                       'html_template'        => 'rp/html_report_susa',
+                       'pdf_template'         => 'rp/html_report_susa',
     );
   $report->set_options_from_form();
 
@@ -1984,19 +1984,6 @@ sub print_form {
 
   $auth->assert('general_ledger');
 
-  my %replacements =
-    (
-     "ä" => "ae", "ö" => "oe", "ü" => "ue",
-     "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
-     "ß" => "ss",
-     " " => "_"
-    );
-
-  foreach my $key (keys %replacements) {
-    my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
-    $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
-  }
-
   $form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
 
   $form->{templates} = "$myconfig{templates}";
@@ -2075,8 +2062,8 @@ sub print_form {
             $form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
         } (c0, c30, c60, c90, "");
 
-        $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix";
-        map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements));
+        $form->{attachment_filename} =  $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix");
+        $form->{attachment_filename} =~ s/\s+/_/g;
 
         $form->parse_template(\%myconfig, $userspath);