X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FCT.pm;h=97f57c72c5510a684ef82521d4af00c77f1d2bfc;hb=e28d95b4826728e7490d708b40b2514b2fe88a34;hp=dd9d627b816e9632eb375bee6353adbe18fdb181;hpb=5ac0b1b2cb0b120d0421acd6355a31e376885646;p=kivitendo-erp.git diff --git a/SL/CT.pm b/SL/CT.pm index dd9d627b8..97f57c72c 100644 --- a/SL/CT.pm +++ b/SL/CT.pm @@ -635,16 +635,16 @@ sub search { "salesman" => "e.name" ); + $form->{sort} ||= "name"; my $sortorder; if ( $join_records ) { # in UNION case order by hash key, e.g. salesman - # the UNION created an implicit select around the result - $sortorder = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name"; + # the UNION created an implicit select around the result + $sortorder = $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name"; } else { # in not UNION case order by hash value, e.g. e.name - $sortorder = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $allowed_sort_columns{$form->{sort}} : "ct.name"; - }; - $form->{sort} = $sortorder; + $sortorder = $allowed_sort_columns{$form->{sort}} ? $allowed_sort_columns{$form->{sort}} : "ct.name"; + } my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC'; if ($sortorder !~ /(business|id)/ && !$join_records) { @@ -713,7 +713,7 @@ sub search { qq| WHERE cv.id = a.vendor_id)|; } $form->{l_invnumber} = $form->{l_ordnumber} = $form->{l_quonumber} = ""; - }; + } if ($form->{obsolete} eq "Y") { $where .= qq| AND obsolete|; @@ -812,7 +812,7 @@ sub search { } $query .= qq| ORDER BY $sortorder|; - + $form->{CT} = selectall_hashref_query($form, $dbh, $query, @values); $main::lxdebug->leave_sub();