X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Freportgenerator.pl;h=8186977c9f3e87b378c8c69befa52088cf04edec;hb=7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd;hp=772fe68ef489edde6210c69e53905c1d63b13545;hpb=723b79bdf889207b36f5ab0edcfd4a6d81c6f8b6;p=kivitendo-erp.git

diff --git a/bin/mozilla/reportgenerator.pl b/bin/mozilla/reportgenerator.pl
index 772fe68ef..8186977c9 100644
--- a/bin/mozilla/reportgenerator.pl
+++ b/bin/mozilla/reportgenerator.pl
@@ -34,8 +34,7 @@ sub report_generator_export_as_pdf {
     return;
   }
 
-  my @form_values;
-  map { push @form_values, { 'key' => $_, 'value' => $form->{$_} } } keys %{ $form };
+  my @form_values = $form->flatten_variables(grep { ($_ ne 'login') && ($_ ne 'password') } keys %{ $form });
 
   $form->get_lists('printers' => 'ALL_PRINTERS');
   map { $_->{selected} = $myconfig{default_printer_id} == $_->{id} } @{ $form->{ALL_PRINTERS} };
@@ -44,7 +43,7 @@ sub report_generator_export_as_pdf {
 
   $form->{title} = $locale->text('PDF export -- options');
   $form->header();
-  print $form->parse_html_template2('report_generator/pdf_export_options', { 'HIDDEN' => \@form_values });
+  print $form->parse_html_template('report_generator/pdf_export_options', { 'HIDDEN' => \@form_values });
 
   $lxdebug->leave_sub();
 }
@@ -58,12 +57,11 @@ sub report_generator_export_as_csv {
     return;
   }
 
-  my @form_values;
-  map { push @form_values, { 'key' => $_, 'value' => $form->{$_} } } keys %{ $form };
+  my @form_values = $form->flatten_variables(grep { ($_ ne 'login') && ($_ ne 'password') } keys %{ $form });
 
   $form->{title} = $locale->text('CSV export -- options');
   $form->header();
-  print $form->parse_html_template2('report_generator/csv_export_options', { 'HIDDEN' => \@form_values });
+  print $form->parse_html_template('report_generator/csv_export_options', { 'HIDDEN' => \@form_values });
 
   $lxdebug->leave_sub();
 }