X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=51c4507a495bb07df4e7b9db8b2f11f2f3e46539;hb=740a0719dcc7d9dbe1001664a23e5791e4c859e7;hp=d9a7ac704508930d5521299ccb2d1a36587037fd;hpb=93a4e424476aae2551b2d070133cd42d5d2f3d52;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index d9a7ac704..51c4507a4 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -101,10 +101,6 @@ sub populate_drop_down_boxes {
   $query = qq|SELECT id, description FROM business ORDER BY id|;
   $form->{all_business} = selectall_hashref_query($form, $dbh, $query);
 
-  # get tax zones
-  $query = qq|SELECT id, description FROM tax_zones|;
-  $form->{TAXZONE} = selectall_hashref_query($form, $dbh, $query);
-
   # get shipto address
   $query =
     qq|SELECT shipto_id, shiptoname, shiptodepartment_1 | .
@@ -303,7 +299,7 @@ sub save_customer {
     conv_i($form->{salesman_id}),
     conv_i($form->{language_id}),
     conv_i($form->{payment_id}),
-    conv_i($form->{taxzone_id}),
+    conv_i($form->{taxzone_id}, 0),
     $form->{user_password},
     $form->{c_vendor_id},
     conv_i($form->{klass}),
@@ -499,7 +495,7 @@ sub save_vendor {
     $form->{obsolete} ? 't' : 'f',
     $form->{ustid},
     conv_i($form->{payment_id}),
-    conv_i($form->{taxzone_id}),
+    conv_i($form->{taxzone_id}, 0),
     conv_i( $form->{language_id}),
     $form->{username},
     $form->{user_password},
@@ -591,6 +587,7 @@ sub search {
   $sortorder =
     $form->{sort} && $allowed_sort_columns{$form->{sort}} ?
     $form->{sort} : "name";
+  $form->{sort} = $sortorder;
   $sortorder = "country,city,street" if ($sortorder eq "address");
 
   if ($form->{"${cv}number"}) {
@@ -624,6 +621,17 @@ sub search {
     $form->{l_invnumber} = $form->{l_ordnumber} = $form->{l_quonumber} = "";
   }
 
+  if ($form->{obsolete} eq "Y") {
+    $where .= qq| AND obsolete|;
+  } elsif ($form->{obsolete} eq "N") {
+    $where .= qq| AND NOT obsolete|;
+  }
+
+  if ($form->{business_id}) {
+    $where .= qq| AND (business_id = ?)|;
+    push(@values, conv_i($form->{business_id}));
+  }
+
   my $query =
     qq|SELECT ct.*, b.description AS business | .
     qq|FROM $cv ct | .