ReportGenerator: Spaltentitel in der HTML-Ausgabe ausrichtbar gemacht (Attribut ...

[kivitendo-erp.git] / SL / CT.pm

diff --git a/SL/CT.pm b/SL/CT.pm
index 96b6b9c..a82620d 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -470,11 +470,7 @@ sub save_vendor {
 
   my $query;
 
-  if ( $form->{id} ) {
-    $query = qq|DELETE FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|;
-    do_query($form, $dbh, $query, $form->{id});
-
-  } else {
+  if (!$form->{id}) {
     $query = qq|SELECT nextval('id')|;
     ($form->{id}) = selectrow_query($form, $dbh, $query);
 
@@ -684,13 +680,19 @@ sub search {
   my @values;
 
   my %allowed_sort_columns =
-    map({ $_, 1 } qw(id customernumber name address contact phone fax email
+    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;
-  $sortorder = "country,city,street" if ($sortorder eq "address");
+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+
+  if ($sortorder eq "address") {
+    $sortorder  = "lower(country) ${sortdir}, lower(city) ${sortdir}, lower(street) ${sortdir}";
+  } elsif ($sortorder ne 'id') {
+    $sortorder  = "lower($sortorder) ${sortdir}";
+  } else {
+    $sortorder .= " ${sortdir}";
+  }
 
   if ($form->{"${cv}number"}) {
     $where .= " AND ct.${cv}number ILIKE ?";