Sortierung in Berichten über Ausgangsrechnungen/Debitorenbuchungen auch auf- und...

diff --git a/SL/AR.pm b/SL/AR.pm
index 0aa4ff372dcd8939703f0cdc7b5d40b6bcb60718..d9a42ce362a3038d49a1cccf5284670b5d99a3fb 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -468,15 +468,16 @@ sub ar_transactions {
 
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{l_employee};
 
   my @a = (transdate, invnumber, name);
   push @a, "employee" if $form->{l_employee};

-  my $sortorder = join(', ', @a);
+  my $sortdir   = $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortorder = join(', ', map { "$_ $sortdir" } @a);

 
   if (grep({ $_ eq $form->{sort} }
            qw(id transdate duedate invnumber ordnumber name
               datepaid employee shippingpoint shipvia))) {
 
   if (grep({ $_ eq $form->{sort} }
            qw(id transdate duedate invnumber ordnumber name
               datepaid employee shippingpoint shipvia))) {

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

   }
 
   }
 

-  $query .= " WHERE $where ORDER by $sortorder";
+  $query .= " WHERE $where ORDER BY $sortorder";

 
   my $sth = $dbh->prepare($query);
   $sth->execute(@values) ||
 
   my $sth = $dbh->prepare($query);
   $sth->execute(@values) ||

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 0498e117dfd05bc9f68e88b2ff103c29612c0ca0..e0571633dc5c39b34e009331a796623d8df35ca2 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1457,7 +1457,7 @@ sub ar_transactions {
   $form->{customer} = $form->unescape($form->{customer});
   ($form->{customer}, $form->{customer_id}) = split(/--/, $form->{customer});
 
   $form->{customer} = $form->unescape($form->{customer});
   ($form->{customer}, $form->{customer_id}) = split(/--/, $form->{customer});
 

-  $form->{sort} ||= 'transdate';
+  report_generator_set_default_sort('transdate', 1);

 
   AR->ar_transactions(\%myconfig, \%$form);
 
 
   AR->ar_transactions(\%myconfig, \%$form);
 


@@ -1500,9 +1500,9 @@ sub ar_transactions {
     'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
   );
 
     'marge_percent'           => { 'text' => $locale->text('Ertrag prozentual'), },
   );
 

-  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid
-                       employee shippingpoint shipvia)) {
-    $column_defs{$name}->{link} = $href . "&sort=$name";
+  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia)) {
+    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 paid due);
   }
 
   my %column_alignment = map { $_ => 'right' } qw(netamount tax amount paid due);


@@ -1515,7 +1515,7 @@ sub ar_transactions {
 
   $report->set_export_options('ar_transactions', @hidden_variables);
 
 
   $report->set_export_options('ar_transactions', @hidden_variables);
 

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

 
   my @options;
   if ($form->{customer}) {
 
   my @options;
   if ($form->{customer}) {