X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/1f14e3b993baf8fef33d74cf94ddcf27ba77ec59..52dfa7c31cd6e2aa7b4f9600c25114f9d9e197cd:/SL/CT.pm diff --git a/SL/CT.pm b/SL/CT.pm index 0468c379d..a82620d22 100644 --- a/SL/CT.pm +++ b/SL/CT.pm @@ -682,15 +682,16 @@ sub search { my %allowed_sort_columns = map({ $_, 1 } qw(id customernumber vendornumber name address contact phone fax email taxnumber sic_code business invnumber ordnumber quonumber)); - $sortorder = - $form->{sort} && $allowed_sort_columns{$form->{sort}} ? - $form->{sort} : "name"; + $sortorder = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name"; $form->{sort} = $sortorder; + my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; if ($sortorder eq "address") { - $sortorder = "lower(country), lower(city), lower(street)"; + $sortorder = "lower(country) ${sortdir}, lower(city) ${sortdir}, lower(street) ${sortdir}"; } elsif ($sortorder ne 'id') { - $sortorder = "lower($sortorder)"; + $sortorder = "lower($sortorder) ${sortdir}"; + } else { + $sortorder .= " ${sortdir}"; } if ($form->{"${cv}number"}) {