Kosmetik

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

diff --git a/SL/CT.pm b/SL/CT.pm
index ad92d4c34a90387e43ab2f66e8ec31d9ceb5ccb4..51c4507a495bb07df4e7b9db8b2f11f2f3e46539 100644 (file)
--- 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"}) {