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

Fix für Bug 845.

diff --git a/SL/WH.pm b/SL/WH.pm
index 70bf7db1f18e8bb657534c4e7e7f2c4440602da8..59fdfc5ce3679d93337604b1032f2f572bd0b6ed 100644 (file)
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -301,11 +301,14 @@ sub get_warehouse_journal {
   $filter{na} = '-' unless $filter{na};
 
   # make order, search in $filter and $form
-  $form->{sort}   = $filter{sort}             unless $form->{sort};
-  $form->{order}  = ($form->{sort} = 'itime') unless $form->{sort};
-  $form->{sort}   = 'itime'                   if     $form->{sort} eq "date";
-  $form->{order}  = $filter{order}            unless $form->{order};
-  $form->{sort}  .= (($form->{order}) ? " DESC" : " ASC");
+  my $sort_col   = $form->{sort};
+  my $sort_order = $form->{order};
+
+  $sort_col      = $filter{sort}         unless $sort_col;
+  $sort_order    = ($sort_col = 'itime') unless $sort_col;
+  $sort_col      = 'itime'               if     $sort_col eq 'date';
+  $sort_order    = $filter{order}        unless $sort_order;
+  my $sort_spec  = "${sort_col} " . ($sort_order ? " DESC" : " ASC");
 
   my $where_clause = join(" AND ", @filter_ary) . " AND " if (@filter_ary);
 
@@ -400,7 +403,7 @@ sub get_warehouse_journal {
     WHERE $where_clause i1.qty > 0 AND
           i1.trans_id IN ( SELECT i.trans_id FROM inventory i GROUP BY i.trans_id HAVING COUNT(i.trans_id) = 1 )
     GROUP BY $group_clause
-    ORDER BY r_$form->{sort}|;
+    ORDER BY r_${sort_spec}|;
 
   my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars, @filter_vars, @filter_vars);
 
@@ -521,12 +524,15 @@ sub get_warehouse_report {
   map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
 
   # make order, search in $filter and $form
-  $form->{sort}  =  $filter{sort}  unless $form->{sort};
-  $form->{sort}  =  "parts_id"     unless $form->{sort};
-  $form->{order} =  $filter{order} unless $form->{order};
-  $form->{sort}  =~ s/ASC|DESC//; # kill stuff left in from previous queries
-  my $orderby    =  $form->{sort};
-  $form->{sort} .=  (($form->{order}) ? " DESC" : " ASC");
+  my $sort_col    =  $form->{sort};
+  my $sort_order  = $form->{order};
+
+  $sort_col       =  $filter{sort}  unless $sort_col;
+  $sort_col       =  "parts_id"     unless $sort_col;
+  $sort_order     =  $filter{order} unless $sort_order;
+  $sort_col       =~ s/ASC|DESC//; # kill stuff left in from previous queries
+  my $orderby     =  $sort_col;
+  my $sort_spec   =  "${sort_col} " . ($sort_order ? " DESC" : " ASC");
 
   my $where_clause = join " AND ", ("1=1", @filter_ary);
 
@@ -571,7 +577,7 @@ sub get_warehouse_report {
       $joins
       WHERE $where_clause
       GROUP BY $group_clause $group_by
-      ORDER BY $form->{sort}|;
+      ORDER BY $sort_spec|;
 
   my $sth = prepare_execute_query($form, $dbh, $query, @filter_vars);
 

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 070748b1ae50842460fb0c218d972636a5b5676e..884933b9f51d12fa21b1d2be70b76b6f00250a27 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1420,7 +1420,7 @@ sub ap_transactions {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('ap_transactions', @hidden_variables);
+  $report->set_export_options('ap_transactions', @hidden_variables, qw(sort sortdir));
 
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 
@@ -1440,7 +1440,7 @@ sub ap_transactions {
                        'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
                        'output_format'        => 'HTML',
                        'title'                => $form->{title},
-                       'attachment_basename'  => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
+                       'attachment_basename'  => $locale->text('vendor_invoice_list') . strftime('_%Y%m%d', localtime time),
     );
   $report->set_options_from_form();
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index b8aa128a9c1c8e55c9d34e25847e3bd971394bea..43d324bf4c41958ecb73ce80e79aa0375befdb5f 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1507,7 +1507,7 @@ sub ar_transactions {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('ar_transactions', @hidden_variables);
+  $report->set_export_options('ar_transactions', @hidden_variables, qw(sort sortdir));
 
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 75c10a3401b3a80cf748c616af58e4851b269361..02ac29e1c6550759201373517c28e642cbbaa2bb 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -206,7 +206,7 @@ sub list_names {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('list_names', @hidden_variables);
+  $report->set_export_options('list_names', @hidden_variables, qw(sort sortdir));
 
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 07830aabcfcf17d8c35d6f4f6ed00512f84b03f3..f9485c554299bb2d7d2c066922bfc25bcd27aa7b 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -310,7 +310,7 @@ sub show_dunning {
 
   $report->set_options('std_column_visibility' => 1,
                        'title'                 => $form->{title});
-  $report->set_export_options('show_dunning', @filter_field_list);
+  $report->set_export_options('show_dunning', @filter_field_list, qw(sort sortdir));
 
   my %column_defs         =  (
     'checkbox'            => { 'text' => '', 'visible' => 'HTML' },

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 29eff0ec8050bcdc4e4b7b4d498382510e3bb1f4..23989b302179ac78814592c829d0e1d59ce865f5 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -460,7 +460,7 @@ sub orders {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('orders', @hidden_variables);
+  $report->set_export_options('orders', @hidden_variables, qw(sort sortdir));
 
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 

diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl
index 437d6bf5287b45b16aca7626221ffd52c4bf588c..202a9d8068dbae13358ae7f9954bc0ad3b4a7f78 100644 (file)
--- a/bin/mozilla/fu.pl
+++ b/bin/mozilla/fu.pl
@@ -259,7 +259,7 @@ sub report {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('report', @report_params);
+  $report->set_export_options('report', @report_params, qw(sort sortdir));
 
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 3887720decf369e29f46474bf0618d1b0bfe3de6..a2816e8f0035319fed436ec687eeacc417a15fe4 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -499,7 +499,7 @@ sub generate_report {
 
   foreach my $name (qw(id transdate reference source description debit_accno credit_accno debit_tax_accno credit_tax_accno)) {
     my $sortname                = $name =~ m/accno/ ? 'accno' : $name;
-    my $sortdir                 = $sortname eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    my $sortdir                 = $sortname eq $form->{sort} ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $callback . "&sort=$sortname&sortdir=$sortdir";
   }
 
@@ -516,7 +516,7 @@ 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 sortdir));
 
   $report->set_sort_indicator($form->{sort} eq 'accno' ? 'debit_accno' : $form->{sort}, $form->{sortdir});
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index c49089552f36e378bc6574d2cb6bd235a8fdecdb..1969608251094155a92b867eef5400e2745062ec 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -972,7 +972,7 @@ sub orders {
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
-  $report->set_export_options('orders', @hidden_variables);
+  $report->set_export_options('orders', @hidden_variables, qw(sort sortdir));
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 
   my @options;

diff --git a/bin/mozilla/projects.pl b/bin/mozilla/projects.pl
index a658742716583c15fbc629e855888959173631ae..a9740b1fa4dbb22bcdc169aacb6eee2b1c3421bb 100644 (file)
--- a/bin/mozilla/projects.pl
+++ b/bin/mozilla/projects.pl
@@ -132,7 +132,7 @@ sub project_report {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('project_report', @hidden_vars);
+  $report->set_export_options('project_report', @hidden_vars, 'sort');
 
   $report->set_sort_indicator($form->{sort}, 1);
 

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 94410658633faa041218f5c00f87c424b3a44a6b..98a0aba59df785af62f71c19de569d69731049b3 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -2308,7 +2308,7 @@ sub list_payments {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('list_payments', @hidden_variables);
+  $report->set_export_options('list_payments', @hidden_variables, qw(sort sortdir));
 
   $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 

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);

diff --git a/locale/de/all b/locale/de/all
index e936f00e105025c78c2a995bcc0435a6ec2499ad..47a8fbae58e5d4bba823d3850475b4a846ae65f3 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1680,6 +1680,7 @@ $self->{texts} = {
   'You\'ve already chosen the following limitations:' => 'Sie haben bereits die folgenden Einschränkungen vorgenommen:',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.',
   'Your TODO list'              => 'Ihre Aufgabenliste',
+  'Your download does not exist anymore. Please re-run the DATEV export assistant.' => 'Ihr Download existiert nicht mehr. Bitte starten Sie den DATEV-Exportassistenten erneut.',
   'Zeitpunkt'                   => 'Zeitpunkt',
   'Zeitraum'                    => 'Zeitraum',
   'Zero amount posting!'        => 'Buchung ohne Wert',
@@ -1812,7 +1813,10 @@ $self->{texts} = {
   'used'                        => 'Verbraucht',
   'valid from'                  => 'Gültig ab',
   'vendor'                      => 'Lieferant',
+  'vendor_invoice_list'         => 'kreditorenbuchungsliste',
   'vendor_list'                 => 'lieferantenliste',
+  'warehouse_journal_list'      => 'lagerbuchungsliste',
+  'warehouse_report_list'       => 'lagerbestandsliste',
   'wrongformat'                 => 'Falsches Format',
   'yes'                         => 'ja',
 };

diff --git a/locale/de/ap b/locale/de/ap
index 2e8492eebc050acaeaf7fc311f07caec63b93687..d450bc70350b57e1b8879299a5b72ee4270dfef0 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -271,7 +271,6 @@ $self->{texts} = {
   'customer'                    => 'Kunde',
   'history'                     => 'Historie',
   'invoice'                     => 'Rechnung',
-  'invoice_list'                => 'debitorenbuchungsliste',
   'mark as paid'                => 'als bezahlt markieren',
   'no'                          => 'nein',
   'packing_list'                => 'Versandliste',
@@ -284,6 +283,7 @@ $self->{texts} = {
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',
   'vendor'                      => 'Lieferant',
+  'vendor_invoice_list'         => 'kreditorenbuchungsliste',
   'wrongformat'                 => 'Falsches Format',
   'yes'                         => 'ja',
 };

diff --git a/locale/de/datev b/locale/de/datev
index 147912b68ddb562827c5d9c3ea3f52b1c37b2827..3af715bcdd49c8aebba73bd86492a2dd757975ac 100644 (file)
--- a/locale/de/datev
+++ b/locale/de/datev
@@ -165,6 +165,7 @@ $self->{texts} = {
   'Warehouse management'        => 'Lagerverwaltung/Bestandsveränderung',
   'You do not have the permissions to access this function.' => 'Sie verfügen nicht über die notwendigen Rechte, um auf diese Funktion zuzugreifen.',
   'Your PostgreSQL installationen uses UTF-8 as its encoding. Therefore you have to configure Lx-Office to use UTF-8 as well.' => 'Ihre PostgreSQL-Installation benutzt UTF-8 als Zeichensatz. Sie müssen deshalb Lx-Office so konfigurieren, dass es ebenfalls UTF-8 als Zeichensatz benutzt.',
+  'Your download does not exist anymore. Please re-run the DATEV export assistant.' => 'Ihr Download existiert nicht mehr. Bitte starten Sie den DATEV-Exportassistenten erneut.',
   'Zeitraum'                    => 'Zeitraum',
   '[email]'                     => '[email]',
   'bin_list'                    => 'Lagerliste',

diff --git a/locale/de/wh b/locale/de/wh
index a0001ae0e16169b22671789e967bec73ed13eb0a..76fb757c3a67db8f451073fa17e872ed9bc4ffa8 100644 (file)
--- a/locale/de/wh
+++ b/locale/de/wh
@@ -219,6 +219,8 @@ $self->{texts} = {
   'transfer'                    => 'Umlagerung',
   'used'                        => 'Verbraucht',
   'vendor'                      => 'Lieferant',
+  'warehouse_journal_list'      => 'lagerbuchungsliste',
+  'warehouse_report_list'       => 'lagerbestandsliste',
   'yes'                         => 'ja',
 };