X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=933ec15c9ccadfe521d9178ed72a1f4930823680;hb=115d9bb0740b874e6b68637db5847bac38f00996;hp=b61a07a63145dd0a40299a4c346e70b5528887d5;hpb=9b3455eaa0e7ae850c48c17bcf53735e5d5416da;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index b61a07a63..933ec15c9 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -155,8 +155,9 @@ sub populate_drop_down_boxes {
 
   # get shipto address
   $query =
-    qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
-    qq|FROM shipto WHERE (trans_id = ?) AND (module = 'CT')|;
+    qq|SELECT shipto_id, shiptoname, shiptodepartment_1, shiptostreet, shiptocity
+       FROM shipto
+       WHERE (trans_id = ?) AND (module = 'CT')|;
   $form->{SHIPTO} = selectall_hashref_query($form, $dbh, $query, $form->{id});
 
   # get contacts
@@ -307,6 +308,7 @@ sub save_customer {
     qq|bank_code = ?, | .
     qq|bank = ?, | .
     qq|obsolete = ?, | .
+    qq|direct_debit = ?, | .
     qq|ustid = ?, | .
     qq|username = ?, | .
     qq|salesman_id = ?, | .
@@ -346,6 +348,7 @@ sub save_customer {
     $form->{bank_code},
     $form->{bank},
     $form->{obsolete} ? 't' : 'f',
+    $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
     $form->{username},
     conv_i($form->{salesman_id}),
@@ -512,6 +515,7 @@ sub save_vendor {
     qq|  bank_code = ?, | .
     qq|  bank = ?, | .
     qq|  obsolete = ?, | .
+    qq|  direct_debit = ?, | .
     qq|  ustid = ?, | .
     qq|  payment_id = ?, | .
     qq|  taxzone_id = ?, | .
@@ -549,6 +553,7 @@ sub save_vendor {
     $form->{bank_code},
     $form->{bank},
     $form->{obsolete} ? 't' : 'f',
+    $form->{direct_debit} ? 't' : 'f',
     $form->{ustid},
     conv_i($form->{payment_id}),
     conv_i($form->{taxzone_id}, 0),
@@ -682,11 +687,17 @@ 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;
-  $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 ?";