Debugcode entfernt.

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

diff --git a/SL/CT.pm b/SL/CT.pm
index 91fe2c0..dfbbee6 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -299,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}),
@@ -495,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},
@@ -587,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"}) {
@@ -763,7 +764,7 @@ sub get_delivery {
   my $query =
     qq|SELECT s.shiptoname, i.qty, | .
     qq|  ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  invoice.description, invoice.unit | .
+    qq|  i.description, i.unit, i.sellprice | .
     qq|FROM $arap | .
     qq|LEFT JOIN shipto s ON | .
     ($arap eq "ar"