Beim PDF- und CSV-Export der verschiedenen Berichte die vorherige Sortierreihenfolge...

[mfinanz.git] / bin / mozilla / wh.pl

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 477ab0bceca9021e05652975b04a3dd92890d58b..d1d406da6259c13fc84770431a8ac7559fc317f4 100644 (file)
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -645,13 +645,13 @@ sub generate_journal {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('generate_journal', @hidden_variables);
+  $report->set_export_options('generate_journal', @hidden_variables, qw(sort order));
 
   $report->set_sort_indicator($form->{sort}, $form->{order});
 
   $report->set_options('output_format'        => 'HTML',
                        'title'                => $form->{title},
-                       'attachment_basename'  => strftime('warehouse_journal_%Y%m%d', localtime time));
+                       'attachment_basename'  => strftime($locale->text('warehouse_journal_list') . '_%Y%m%d', localtime time));
   $report->set_options_from_form();
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);
@@ -767,13 +767,13 @@ sub generate_report {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('generate_report', @hidden_variables);
+  $report->set_export_options('generate_report', @hidden_variables, qw(sort order));
 
   $report->set_sort_indicator($sort_col, $form->{order});
 
   $report->set_options('output_format'        => 'HTML',
                        'title'                => $form->{title},
-                       'attachment_basename'  => strftime('warehouse_report_%Y%m%d', localtime time));
+                       'attachment_basename'  => strftime($locale->text('warehouse_report_list') . '_%Y%m%d', localtime time));
   $report->set_options_from_form();
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);