X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Freportgenerator.pl;h=50f6eccad0d873c5e259a9d3346e21d1945451f6;hb=b3bcbbe95b29ae60ac00589d944d97c288671da6;hp=112116d697c99e309fad2fed53326757f07ed146;hpb=18da4a96827fd65559a6f64334c3d8a313884f84;p=kivitendo-erp.git

diff --git a/bin/mozilla/reportgenerator.pl b/bin/mozilla/reportgenerator.pl
index 112116d69..50f6eccad 100644
--- a/bin/mozilla/reportgenerator.pl
+++ b/bin/mozilla/reportgenerator.pl
@@ -34,21 +34,21 @@ 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} };
 
   $form->{copies} = max $myconfig{copies} * 1, 1;
 
+  my $allow_font_selection = 1;
+  eval { require PDF::API2; };
+  $allow_font_selection = 0 if ($@);
+
   $form->{title} = $locale->text('PDF export -- options');
   $form->header();
-  print $form->parse_html_template('report_generator/pdf_export_options',
-                                   { 'HIDDEN'         => \@form_values,
-                                     'default_margin' => $form->format_amount(\%myconfig, 1.5),
-                                     'SHOW_PRINTERS'  => scalar @{ $form->{ALL_PRINTERS} },
-                                   });
+  print $form->parse_html_template('report_generator/pdf_export_options', { 'HIDDEN'               => \@form_values,
+                                                                            'ALLOW_FONT_SELECTION' => $allow_font_selection, });
 
   $lxdebug->leave_sub();
 }
@@ -62,8 +62,7 @@ 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();