Schalter Lastschrift (Verfahren) für Kunden/Lieferanten

[mfinanz.git] / SL / AR.pm

diff --git a/SL/AR.pm b/SL/AR.pm
index 0aa4ff372dcd8939703f0cdc7b5d40b6bcb60718..0a8987979729ebac3b88b760cc36a7a485e1cb61 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -468,15 +468,14 @@ 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   = !defined $form->{sortdir} ? 'ASC' : $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))) {
-    $sortorder = $form->{sort};
+  if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description))) {
+    $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) ||