Sortierung in Berichten über Angebote / Aufträge / Presianfragen auch auf- und abstei...

diff --git a/SL/OE.pm b/SL/OE.pm
index 3dd83b768afc04412a9987dc8c9455428d280a90..faae5d6f7a1ef45057ad8a8349273ce644d414c1 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -148,7 +148,8 @@ sub transactions {
     push(@values, '%' . $form->{transaction_description} . '%');
   }
 
     push(@values, '%' . $form->{transaction_description} . '%');
   }
 

-  my $sortorder = join(', ', ("o.id", $form->sort_columns("transdate", $ordnumber, "name")));
+  my $sortdir   = $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortorder = join(', ', map { "${_} ${sortdir} " } ("o.id", $form->sort_columns("transdate", $ordnumber, "name")));

   my %allowed_sort_columns = (
     "transdate"               => "o.transdate",
     "reqdate"                 => "o.reqdate",
   my %allowed_sort_columns = (
     "transdate"               => "o.transdate",
     "reqdate"                 => "o.reqdate",


@@ -162,7 +163,7 @@ sub transactions {
     "transaction_description" => "o.transaction_description"
   );
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     "transaction_description" => "o.transaction_description"
   );
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {

-    $sortorder = $allowed_sort_columns{$form->{sort}};
+    $sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}";

   }
   $query .= qq| ORDER by | . $sortorder;
 
   }
   $query .= qq| ORDER by | . $sortorder;
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index bc4cc453abd8ed3186146cb766a9ca53e63c1b8a..5c1a9c2462e22c2b5077e4c8fff2a3accea25b9a 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -888,7 +888,9 @@ sub orders {
 
   ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 
 
   ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 

-  $form->{sort} ||= 'transdate';
+  $form->{sort}    ||= 'transdate';
+  $form->{sortdir}   = 1 unless (defined $form->{sortdir});
+  $form->{sortdir}   = $form->{sortdir} ? 1 : 0;

 
   OE->transactions(\%myconfig, \%$form);
 
 
   OE->transactions(\%myconfig, \%$form);
 


@@ -967,7 +969,8 @@ sub orders {
   );
 
   foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia)) {
   );
 
   foreach my $name (qw(id transdate reqdate quonumber ordnumber name employee salesman shipvia)) {

-    $column_defs{$name}->{link} = $href . "&sort=$name";
+    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";

   }
 
   my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr);
   }
 
   my %column_alignment = map { $_ => 'right' } qw(netamount tax amount curr);


@@ -979,7 +982,7 @@ sub orders {
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
   $report->set_export_options('orders', @hidden_variables);
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
   $report->set_export_options('orders', @hidden_variables);

-  $report->set_sort_indicator($form->{sort}, 1);
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});

 
   my @options;
   my ($department) = split m/--/, $form->{department};
 
   my @options;
   my ($department) = split m/--/, $form->{department};