X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=e5ee4af82af93e5d3691456d01070bbd09b8fed2;hb=9198a41442e997dc37eb80d3a30eab7136d58208;hp=ad92d4c34a90387e43ab2f66e8ec31d9ceb5ccb4;hpb=0c472ce6b2b803cd57b8361d778fb711dc3549ba;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index ad92d4c34..e5ee4af82 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,26 +495,35 @@ 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},
-    conv_i($form->{v_customer_id}),
+    $form->{v_customer_id},
     $form->{id}
     );
   do_query($form, $dbh, $query, @values);
 
   $query = undef;
   if ( $form->{cp_id} ) {
-    $query =
-      qq|UPDATE contacts SET | .
-      qq|  cp_greeting = ?, | .
-      qq|  cp_title = ?, | .
-      qq|  cp_givenname = ?, | .
-      qq|  cp_name = ?, | .
-      qq|  cp_email = ?, | .
-      qq|  cp_phone1 = ?, | .
-      qq|  cp_phone2 = ? | .
+    $query = qq|UPDATE contacts SET | .
+      qq|cp_greeting = ?, | .
+      qq|cp_title = ?,  | .
+      qq|cp_givenname = ?, | .
+      qq|cp_name = ?, | .
+      qq|cp_email = ?, | .
+      qq|cp_phone1 = ?, | .
+      qq|cp_phone2 = ?, | .
+      qq|cp_abteilung = ?, | .
+      qq|cp_fax = ?, | .
+      qq|cp_mobile1 = ?, | .
+      qq|cp_mobile2 = ?, | .
+      qq|cp_satphone = ?, | .
+      qq|cp_satfax = ?, | .
+      qq|cp_project = ?, | .
+      qq|cp_privatphone = ?, | .
+      qq|cp_privatemail = ?, | .
+      qq|cp_birthday = ? | .
       qq|WHERE cp_id = ?|;
     @values = (
       $form->{cp_greeting},
@@ -528,20 +533,45 @@ sub save_vendor {
       $form->{cp_email},
       $form->{cp_phone1},
       $form->{cp_phone2},
-      $form->{cp_id});
+      $form->{cp_abteilung},
+      $form->{cp_fax},
+      $form->{cp_mobile1},
+      $form->{cp_mobile2},
+      $form->{cp_satphone},
+      $form->{cp_satfax},
+      $form->{cp_project},
+      $form->{cp_privatphone},
+      $form->{cp_privatemail},
+      $form->{cp_birthday},
+      $form->{cp_id}
+      );
   } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
     $query =
-      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname, cp_name, cp_email, cp_phone1, cp_phone2) | .
-      qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?)|;
+      qq|INSERT INTO contacts ( cp_cv_id, cp_greeting, cp_title, cp_givenname,  | .
+      qq|  cp_name, cp_email, cp_phone1, cp_phone2, cp_abteilung, cp_fax, cp_mobile1, | .
+      qq|  cp_mobile2, cp_satphone, cp_satfax, cp_project, cp_privatphone, cp_privatemail, | .
+      qq|  cp_birthday) | .
+      qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = (
-      conv_i($form->{id}),
+      $form->{id},
       $form->{cp_greeting},
       $form->{cp_title},
       $form->{cp_givenname},
       $form->{cp_name},
       $form->{cp_email},
       $form->{cp_phone1},
-      $form->{cp_phone2});
+      $form->{cp_phone2},
+      $form->{cp_abteilung},
+      $form->{cp_fax},
+      $form->{cp_mobile1},
+      $form->{cp_mobile2},
+      $form->{cp_satphone},
+      $form->{cp_satfax},
+      $form->{cp_project},
+      $form->{cp_privatphone},
+      $form->{cp_privatemail},
+      $form->{cp_birthday}
+      );
   }
   do_query($form, $dbh, $query, @values) if ($query);
 
@@ -591,6 +621,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"}) {
@@ -641,6 +672,7 @@ sub search {
     qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
     qq|WHERE $where|;
 
+  my @saved_values = @values;
   # redo for invoices, orders and quotations
   if ($form->{l_invnumber} || $form->{l_ordnumber} || $form->{l_quonumber}) {
     my ($ar, $union, $module);
@@ -664,6 +696,9 @@ sub search {
     }
 
     if ( $form->{l_ordnumber} ) {
+      if ($union eq "UNION") {
+        push(@values, @saved_values);
+      }
       $query .=
         qq| $union | .
         qq|SELECT ct.*, b.description AS business,| .
@@ -678,6 +713,9 @@ sub search {
     }
 
     if ( $form->{l_quonumber} ) {
+      if ($union eq "UNION") {
+        push(@values, @saved_values);
+      }
       $query .=
         qq| $union | .
         qq|SELECT ct.*, b.description AS business, | .
@@ -767,7 +805,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"