X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCT.pm;h=b52c8794acafa55317b3c4bb674b4eab08d223c9;hb=96e32f352f3937bdd2deb279a55d94871396d9c0;hp=2e8a017b9f6c378e1da09537711c0e89f2084267;hpb=5104dee447f25733832ed4e4a58c4847b2c2ea66;p=kivitendo-erp.git

diff --git a/SL/CT.pm b/SL/CT.pm
index 2e8a017b9..b52c8794a 100644
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # backend code for customers and vendors
@@ -37,662 +38,15 @@
 
 package CT;
 
-use Data::Dumper;
-
 use SL::Common;
 use SL::CVar;
 use SL::DBUtils;
-use SL::FU;
-use SL::Notes;
-use SL::TransNumber;
+use SL::DB;
+use SL::Util qw(trim);
+use Text::ParseWords;
 
 use strict;
 
-sub get_tuple {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-
-  my $cv = $form->{db} eq "customer" ? "customer" : "vendor";
-
-  my $dbh   = $form->dbconnect($myconfig);
-  my $query =
-    qq|SELECT ct.*, b.id AS business, cp.* | .
-    qq|FROM $cv ct | .
-    qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
-    qq|LEFT JOIN contacts cp ON (ct.id = cp.cp_cv_id) | .
-    qq|WHERE (ct.id = ?) | .
-    qq|ORDER BY cp.cp_id LIMIT 1|;
-  my $sth = prepare_execute_query($form, $dbh, $query, $form->{id});
-
-  my $ref = $sth->fetchrow_hashref("NAME_lc");
-
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-
-  # remove any trailing whitespace
-  $form->{curr} =~ s/\s*$//;
-
-  $sth->finish;
-  if ( $form->{salesman_id} ) {
-    my $query =
-      qq|SELECT ct.name AS salesman | .
-      qq|FROM $cv ct | .
-      qq|WHERE ct.id = ?|;
-    ($form->{salesman}) =
-      selectrow_query($form, $dbh, $query, $form->{salesman_id});
-  }
-
-  my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
-  $query =
-    qq|SELECT n.*, n.itime::DATE AS created_on,
-         e.name AS created_by_name, e.login AS created_by_login
-       FROM notes n
-       LEFT JOIN employee e ON (n.created_by = e.id)
-       WHERE (n.trans_id = ?) AND (n.trans_module = 'ct')|;
-  $form->{NOTES} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
-
-  $query =
-    qq|SELECT fu.follow_up_date, fu.done AS follow_up_done, e.name AS created_for_name, e.name AS created_for_login
-       FROM follow_ups fu
-       LEFT JOIN employee e ON (fu.created_for_user = e.id)
-       WHERE (fu.note_id = ?)
-         AND NOT COALESCE(fu.done, FALSE)
-         AND (   (fu.created_by = ?)
-              OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?)))|;
-  $sth = prepare_query($form, $dbh, $query);
-
-  foreach my $note (@{ $form->{NOTES} }) {
-    do_statement($form, $sth, $query, conv_i($note->{id}), conv_i($note->{created_by}), conv_i($employee_id));
-    $ref = $sth->fetchrow_hashref();
-
-    map { $note->{$_} = $ref->{$_} } keys %{ $ref } if ($ref);
-  }
-
-  $sth->finish();
-
-  if ($form->{edit_note_id}) {
-    $query =
-      qq|SELECT n.id AS NOTE_id, n.subject AS NOTE_subject, n.body AS NOTE_body,
-           fu.id AS FU_id, fu.follow_up_date AS FU_date, fu.done AS FU_done, fu.created_for_user AS FU_created_for_user
-         FROM notes n
-         LEFT JOIN follow_ups fu ON ((n.id = fu.note_id) AND NOT COALESCE(fu.done, FALSE))
-         WHERE n.id = ?|;
-    $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{edit_note_id}));
-
-    if ($ref) {
-      foreach my $key (keys %{ $ref }) {
-        my $new_key       =  $key;
-        $new_key          =~ s/^([^_]+)/\U$1\E/;
-        $form->{$new_key} =  $ref->{$key};
-      }
-    }
-  }
-
-  # check if it is orphaned
-  my $arap      = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
-  my $num_args  = 2;
-  my $makemodel = '';
-  if ($form->{db} eq 'vendor') {
-    $makemodel = qq| UNION SELECT 1 FROM makemodel mm WHERE mm.make = ?|;
-    $num_args++;
-  }
-
-  $query =
-    qq|SELECT a.id | .
-    qq|FROM $arap a | .
-    qq|JOIN $cv ct ON (a.${cv}_id = ct.id) | .
-    qq|WHERE ct.id = ? | .
-    qq|UNION | .
-    qq|SELECT a.id | .
-    qq|FROM oe a | .
-    qq|JOIN $cv ct ON (a.${cv}_id = ct.id) | .
-    qq|WHERE ct.id = ?|
-    . $makemodel;
-  my ($dummy) = selectrow_query($form, $dbh, $query, (conv_i($form->{id})) x $num_args);
-
-  $form->{status} = "orphaned" unless ($dummy);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub populate_drop_down_boxes {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form, $provided_dbh) = @_;
-  my $query;
-
-  my $dbh = $provided_dbh ? $provided_dbh : $form->dbconnect($myconfig);
-
-  # get business types
-  $query = qq|SELECT id, description FROM business ORDER BY id|;
-  $form->{all_business} = selectall_hashref_query($form, $dbh, $query);
-
-  # get shipto address
-  $query =
-    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
-  $query  = qq|SELECT cp_id, cp_name, cp_givenname FROM contacts WHERE cp_cv_id = ? ORDER BY cp_name|;
-  $form->{CONTACTS} = selectall_hashref_query($form, $dbh, $query, $form->{id});
-
-  # get languages
-  $query = qq|SELECT id, description FROM language ORDER BY id|;
-  $form->{languages} = selectall_hashref_query($form, $dbh, $query);
-
-  # get payment terms
-  $query = qq|SELECT id, description FROM payment_terms ORDER BY sortkey|;
-  $form->{payment_terms} = selectall_hashref_query($form, $dbh, $query);
-
-  $dbh->disconnect() unless ($provided_dbh);
-
-  $main::lxdebug->leave_sub();
-}
-
-sub query_titles_and_greetings {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-  my ( %tmp,  $ref, $query );
-
-  my $dbh = $form->dbconnect($myconfig);
-
-  $query =
-    qq|SELECT DISTINCT(greeting) | .
-    qq|FROM customer | .
-    qq|WHERE greeting ~ '[a-zA-Z]' | .
-    qq|UNION | .
-    qq|SELECT DISTINCT(greeting) | .
-    qq|FROM vendor | .
-    qq|WHERE greeting ~ '[a-zA-Z]' | .
-    qq|ORDER BY greeting|;
-
-  map({ $tmp{$_} = 1; } selectall_array_query($form, $dbh, $query));
-  $form->{COMPANY_GREETINGS} = [ sort(keys(%tmp)) ];
-
-  $query =
-    qq|SELECT DISTINCT(cp_title) | .
-    qq|FROM contacts | .
-    qq|WHERE cp_title ~ '[a-zA-Z]'|;
-  $form->{TITLES} = [ selectall_array_query($form, $dbh, $query) ];
-
-  $query =
-    qq|SELECT DISTINCT(cp_abteilung) | .
-    qq|FROM contacts | .
-    qq|WHERE cp_abteilung ~ '[a-zA-Z]'|;
-  $form->{DEPARTMENT} = [ selectall_array_query($form, $dbh, $query) ];
-
-  $dbh->disconnect();
-  $main::lxdebug->leave_sub();
-}
-
-sub save_customer {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-
-  # set pricegroup to default
-  $form->{klass} = 0 unless ($form->{klass});
-
-  # connect to database
-  my $dbh = $form->get_standard_dbh;
-
-  map( {
-    $form->{"cp_${_}"} = $form->{"selected_cp_${_}"}
-    if ( $form->{"selected_cp_${_}"} );
-       } qw(title greeting abteilung) );
-  $form->{"greeting"} = $form->{"selected_company_greeting"}
-  if ( $form->{"selected_company_greeting"} );
-
-  # assign value discount, terms, creditlimit
-  $form->{discount} = $form->parse_amount( $myconfig, $form->{discount} );
-  $form->{discount} /= 100;
-  $form->{creditlimit} = $form->parse_amount( $myconfig, $form->{creditlimit} );
-
-  my ( $query, $sth, $f_id );
-
-  if ( $form->{id} ) {
-    $query = qq|SELECT id FROM customer WHERE customernumber = ?|;
-    ($f_id) = selectrow_query($form, $dbh, $query, $form->{customernumber});
-
-    if (($f_id ne $form->{id}) && ($f_id ne "")) {
-      $main::lxdebug->leave_sub();
-      return 3;
-    }
-
-  } else {
-    my $customernumber      = SL::TransNumber->new(type        => 'customer',
-                                                   dbh         => $dbh,
-                                                   number      => $form->{customernumber},
-                                                   business_id => $form->{business},
-                                                   save        => 1);
-    $form->{customernumber} = $customernumber->create_unique unless $customernumber->is_unique;
-
-    $query = qq|SELECT nextval('id')|;
-    ($form->{id}) = selectrow_query($form, $dbh, $query);
-
-    $query = qq|INSERT INTO customer (id, name) VALUES (?, '')|;
-    do_query($form, $dbh, $query, $form->{id});
-  }
-
-  $query = qq|UPDATE customer SET | .
-    qq|customernumber = ?, | .
-    qq|name = ?, | .
-    qq|greeting = ?, | .
-    qq|department_1 = ?, | .
-    qq|department_2 = ?, | .
-    qq|street = ?, | .
-    qq|zipcode = ?, | .
-    qq|city = ?, | .
-    qq|country = ?, | .
-    qq|homepage = ?, | .
-    qq|contact = ?, | .
-    qq|phone = ?, | .
-    qq|fax = ?, | .
-    qq|email = ?, | .
-    qq|cc = ?, | .
-    qq|bcc = ?, | .
-    qq|notes = ?, | .
-    qq|discount = ?, | .
-    qq|creditlimit = ?, | .
-    qq|terms = ?, | .
-    qq|business_id = ?, | .
-    qq|taxnumber = ?, | .
-    qq|language = ?, | .
-    qq|account_number = ?, | .
-    qq|bank_code = ?, | .
-    qq|bank = ?, | .
-    qq|iban = ?, | .
-    qq|bic = ?, | .
-    qq|obsolete = ?, | .
-    qq|direct_debit = ?, | .
-    qq|ustid = ?, | .
-    qq|username = ?, | .
-    qq|salesman_id = ?, | .
-    qq|language_id = ?, | .
-    qq|payment_id = ?, | .
-    qq|taxzone_id = ?, | .
-    qq|user_password = ?, | .
-    qq|c_vendor_id = ?, | .
-    qq|klass = ?, | .
-    qq|curr = ? | .
-    qq|WHERE id = ?|;
-  my @values = (
-    $form->{customernumber},
-    $form->{name},
-    $form->{greeting},
-    $form->{department_1},
-    $form->{department_2},
-    $form->{street},
-    $form->{zipcode},
-    $form->{city},
-    $form->{country},
-    $form->{homepage},
-    $form->{contact},
-    $form->{phone},
-    $form->{fax},
-    $form->{email},
-    $form->{cc},
-    $form->{bcc},
-    $form->{notes},
-    $form->{discount},
-    $form->{creditlimit},
-    conv_i($form->{terms}),
-    conv_i($form->{business}),
-    $form->{taxnumber},
-    $form->{language},
-    $form->{account_number},
-    $form->{bank_code},
-    $form->{bank},
-    $form->{iban},
-    $form->{bic},
-    $form->{obsolete} ? 't' : 'f',
-    $form->{direct_debit} ? 't' : 'f',
-    $form->{ustid},
-    $form->{username},
-    conv_i($form->{salesman_id}),
-    conv_i($form->{language_id}),
-    conv_i($form->{payment_id}),
-    conv_i($form->{taxzone_id}, 0),
-    $form->{user_password},
-    $form->{c_vendor_id},
-    conv_i($form->{klass}),
-    substr($form->{currency}, 0, 3),
-    $form->{id}
-    );
-  do_query( $form, $dbh, $query, @values );
-
-  $query = undef;
-  if ( $form->{cp_id} ) {
-    $query = qq|UPDATE contacts SET | .
-      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|cp_gender = ? | .
-      qq|WHERE cp_id = ?|;
-    @values = (
-      $form->{cp_title},
-      $form->{cp_givenname},
-      $form->{cp_name},
-      $form->{cp_email},
-      $form->{cp_phone1},
-      $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},
-      $form->{cp_gender} eq 'f' ? 'f' : 'm',
-      $form->{cp_id}
-      );
-  } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
-    $query =
-      qq|INSERT INTO contacts ( cp_cv_id, 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, cp_gender) | .
-      qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
-    @values = (
-      $form->{id},
-      $form->{cp_title},
-      $form->{cp_givenname},
-      $form->{cp_name},
-      $form->{cp_email},
-      $form->{cp_phone1},
-      $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},
-      $form->{cp_gender} eq 'f' ? 'f' : 'm',
-      );
-  }
-  do_query( $form, $dbh, $query, @values ) if ($query);
-
-  # add shipto
-  $form->add_shipto( $dbh, $form->{id}, "CT" );
-
-  $self->_save_note('dbh' => $dbh);
-  $self->_delete_selected_notes('dbh' => $dbh);
-
-  CVar->save_custom_variables('dbh'       => $dbh,
-                              'module'    => 'CT',
-                              'trans_id'  => $form->{id},
-                              'variables' => $form,
-                              'always_valid' => 1);
-  CVar->save_custom_variables('dbh'       => $dbh,
-                              'module'    => 'Contacts',
-                              'trans_id'  => $form->{cp_id},
-                              'variables' => $form,
-                              'name_prefix'  => 'cp',
-                              'always_valid' => 1);
-
-  my $rc = $dbh->commit();
-
-  $main::lxdebug->leave_sub();
-  return $rc;
-}
-
-sub save_vendor {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-
-  $form->{taxzone_id} *= 1;
-  # connect to database
-  my $dbh = $form->get_standard_dbh;
-
-  map( {
-    $form->{"cp_${_}"} = $form->{"selected_cp_${_}"}
-    if ( $form->{"selected_cp_${_}"} );
-       } qw(title greeting abteilung) );
-  $form->{"greeting"} = $form->{"selected_company_greeting"}
-  if ( $form->{"selected_company_greeting"} );
-
-  $form->{discount} = $form->parse_amount( $myconfig, $form->{discount} );
-  $form->{discount} /= 100;
-  $form->{creditlimit} = $form->parse_amount( $myconfig, $form->{creditlimit} );
-
-  my $query;
-
-  if (!$form->{id}) {
-    $query = qq|SELECT nextval('id')|;
-    ($form->{id}) = selectrow_query($form, $dbh, $query);
-
-    $query = qq|INSERT INTO vendor (id, name) VALUES (?, '')|;
-    do_query($form, $dbh, $query, $form->{id});
-
-    my $vendornumber      = SL::TransNumber->new(type   => 'vendor',
-                                                 dbh    => $dbh,
-                                                 number => $form->{vendornumber},
-                                                 save   => 1);
-    $form->{vendornumber} = $vendornumber->create_unique unless $vendornumber->is_unique;
-  }
-
-  $query =
-    qq|UPDATE vendor SET | .
-    qq|  vendornumber = ?, | .
-    qq|  name = ?, | .
-    qq|  greeting = ?, | .
-    qq|  department_1 = ?, | .
-    qq|  department_2 = ?, | .
-    qq|  street = ?, | .
-    qq|  zipcode = ?, | .
-    qq|  city = ?, | .
-    qq|  country = ?, | .
-    qq|  homepage = ?, | .
-    qq|  contact = ?, | .
-    qq|  phone = ?, | .
-    qq|  fax = ?, | .
-    qq|  email = ?, | .
-    qq|  cc = ?, | .
-    qq|  bcc = ?, | .
-    qq|  notes = ?, | .
-    qq|  terms = ?, | .
-    qq|  discount = ?, | .
-    qq|  creditlimit = ?, | .
-    qq|  business_id = ?, | .
-    qq|  taxnumber = ?, | .
-    qq|  language = ?, | .
-    qq|  account_number = ?, | .
-    qq|  bank_code = ?, | .
-    qq|  bank = ?, | .
-    qq|  iban = ?, | .
-    qq|  bic = ?, | .
-    qq|  obsolete = ?, | .
-    qq|  direct_debit = ?, | .
-    qq|  ustid = ?, | .
-    qq|  payment_id = ?, | .
-    qq|  taxzone_id = ?, | .
-    qq|  language_id = ?, | .
-    qq|  username = ?, | .
-    qq|  user_password = ?, | .
-    qq|  v_customer_id = ?, | .
-    qq|  curr = ? | .
-    qq|WHERE id = ?|;
-  my @values = (
-    $form->{vendornumber},
-    $form->{name},
-    $form->{greeting},
-    $form->{department_1},
-    $form->{department_2},
-    $form->{street},
-    $form->{zipcode},
-    $form->{city},
-    $form->{country},
-    $form->{homepage},
-    $form->{contact},
-    $form->{phone},
-    $form->{fax},
-    $form->{email},
-    $form->{cc},
-    $form->{bcc},
-    $form->{notes},
-    conv_i($form->{terms}),
-    $form->{discount},
-    $form->{creditlimit},
-    conv_i($form->{business}),
-    $form->{taxnumber},
-    $form->{language},
-    $form->{account_number},
-    $form->{bank_code},
-    $form->{bank},
-    $form->{iban},
-    $form->{bic},
-    $form->{obsolete} ? 't' : 'f',
-    $form->{direct_debit} ? 't' : 'f',
-    $form->{ustid},
-    conv_i($form->{payment_id}),
-    conv_i($form->{taxzone_id}, 0),
-    conv_i( $form->{language_id}),
-    $form->{username},
-    $form->{user_password},
-    $form->{v_customer_id},
-    substr($form->{currency}, 0, 3),
-    $form->{id}
-    );
-  do_query($form, $dbh, $query, @values);
-
-  $query = undef;
-  if ( $form->{cp_id} ) {
-    $query = qq|UPDATE contacts SET | .
-      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|cp_gender = ? | .
-      qq|WHERE cp_id = ?|;
-    @values = (
-      $form->{cp_title},
-      $form->{cp_givenname},
-      $form->{cp_name},
-      $form->{cp_email},
-      $form->{cp_phone1},
-      $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},
-      $form->{cp_gender} eq 'f' ? 'f' : 'm',
-      $form->{cp_id}
-      );
-  } elsif ( $form->{cp_name} || $form->{cp_givenname} ) {
-    $query =
-      qq|INSERT INTO contacts ( cp_cv_id, 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, cp_gender) | .
-      qq|VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
-    @values = (
-      $form->{id},
-      $form->{cp_title},
-      $form->{cp_givenname},
-      $form->{cp_name},
-      $form->{cp_email},
-      $form->{cp_phone1},
-      $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},
-      $form->{cp_gender}
-      );
-  }
-  do_query($form, $dbh, $query, @values) if ($query);
-
-  # add shipto
-  $form->add_shipto( $dbh, $form->{id}, "CT" );
-
-  $self->_save_note('dbh' => $dbh);
-  $self->_delete_selected_notes('dbh' => $dbh);
-
-  CVar->save_custom_variables('dbh'       => $dbh,
-                              'module'    => 'CT',
-                              'trans_id'  => $form->{id},
-                              'variables' => $form,
-                              'always_valid' => 1);
-  CVar->save_custom_variables('dbh'       => $dbh,
-                              'module'    => 'Contacts',
-                              'trans_id'  => $form->{cp_id},
-                              'variables' => $form,
-                              'name_prefix'  => 'cp',
-                              'always_valid' => 1);
-
-  my $rc = $dbh->commit();
-
-  $main::lxdebug->leave_sub();
-  return $rc;
-}
-
-sub delete {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  # delete vendor
-  my $cv = $form->{db} eq "customer" ? "customer" : "vendor";
-  my $query = qq|DELETE FROM $cv WHERE id = ?|;
-  do_query($form, $dbh, $query, $form->{id});
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
 sub search {
   $main::lxdebug->enter_sub();
 
@@ -702,20 +56,53 @@ sub search {
   my $dbh = $form->dbconnect($myconfig);
 
   my $cv = $form->{db} eq "customer" ? "customer" : "vendor";
+  my $join_records = $form->{l_invnumber} || $form->{l_ordnumber} || $form->{l_quonumber};
 
   my $where = "1 = 1";
   my @values;
 
-  my %allowed_sort_columns =
-    map { $_, 1 } qw(
-      id customernumber vendornumber name contact phone fax email street
-      taxnumber business invnumber ordnumber quonumber zipcode city
+  my %allowed_sort_columns = (
+      "id"                 => "ct.id",
+      "customernumber"     => "ct.customernumber",
+      "vendornumber"       => "ct.vendornumber",
+      "name"               => "ct.name",
+      "contact"            => "ct.contact",
+      "phone"              => "ct.phone",
+      "fax"                => "ct.fax",
+      "email"              => "ct.email",
+      "street"             => "ct.street",
+      "taxnumber"          => "ct.taxnumber",
+      "business"           => "b.description",
+      "invnumber"          => "ct.invnumber",
+      "ordnumber"          => "ct.ordnumber",
+      "quonumber"          => "ct.quonumber",
+      "zipcode"            => "ct.zipcode",
+      "city"               => "ct.city",
+      "country"            => "ct.country",
+      "gln"                => "ct.gln",
+      "discount"           => "ct.discount",
+      "insertdate"         => "ct.itime",
+      "salesman"           => "e.name",
+      "payment"            => "pt.description",
+      "pricegroup"         => "pg.pricegroup",
+      "ustid"              => "ct.ustid",
+      "creditlimit"        => "ct.creditlimit",
+      "commercial_court"   => "ct.commercial_court",
     );
-  my $sortorder    = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name";
-  $form->{sort} = $sortorder;
+
+  $form->{sort} ||= "name";
+  my $sortorder;
+  if ( $join_records ) {
+    # in UNION case order by hash key, e.g. salesman
+    # the UNION created an implicit select around the result
+    $sortorder = $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name";
+  } else {
+    # in not UNION case order by hash value, e.g. e.name
+    $sortorder = $allowed_sort_columns{$form->{sort}} ?  $allowed_sort_columns{$form->{sort}} : "ct.name";
+  }
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
 
-  if ($sortorder !~ /(business|id)/ && 1 >= scalar grep { $form->{$_} } qw(l_ordnumber l_quonumber l_invnumber )) {
+  if ($sortorder !~ /(business|creditlimit|id|discount|itime)/ && !$join_records) {
     $sortorder  = "lower($sortorder) ${sortdir}";
   } else {
     $sortorder .= " ${sortdir}";
@@ -723,32 +110,80 @@ sub search {
 
   if ($form->{"${cv}number"}) {
     $where .= " AND ct.${cv}number ILIKE ?";
-    push(@values, '%' . $form->{"${cv}number"} . '%');
+    push(@values, like($form->{"${cv}number"}));
   }
 
   foreach my $key (qw(name contact email)) {
     if ($form->{$key}) {
       $where .= " AND ct.$key ILIKE ?";
-      push(@values, '%' . $form->{$key} . '%');
+      push(@values, like($form->{$key}));
     }
   }
 
   if ($form->{cp_name}) {
     $where .= " AND ct.id IN (SELECT cp_cv_id FROM contacts WHERE lower(cp_name) LIKE lower(?))";
-    push @values, '%' . $form->{cp_name} . '%';
+    push @values, like($form->{cp_name});
+  }
+
+  if ($form->{addr_street}) {
+    $where .= qq| AND ((ct.street ILIKE ?) | .
+              qq|      OR | .
+              qq|      (ct.id IN ( | .
+              qq|         SELECT sc.trans_id FROM shipto sc | .
+              qq|         WHERE (sc.module = 'CT') | .
+              qq|           AND (sc.shiptostreet ILIKE ?) | .
+              qq|      ))) |;
+    push @values, (like($form->{addr_street})) x 2;
+  }
+
+  if ($form->{addr_zipcode}) {
+    $where .= qq| AND ((ct.zipcode ILIKE ?) | .
+              qq|      OR | .
+              qq|      (ct.id IN ( | .
+              qq|         SELECT sc.trans_id FROM shipto sc | .
+              qq|         WHERE (sc.module = 'CT') | .
+              qq|           AND (sc.shiptozipcode ILIKE ?) | .
+              qq|      ))) |;
+    push @values, (like($form->{addr_zipcode})) x 2;
   }
 
   if ($form->{addr_city}) {
     $where .= " AND ((lower(ct.city) LIKE lower(?))
                      OR
                      (ct.id IN (
-                        SELECT trans_id
-                        FROM shipto
-                        WHERE (module = 'CT')
-                          AND (lower(shiptocity) LIKE lower(?))
+                        SELECT sc.trans_id
+                        FROM shipto sc
+                        WHERE (sc.module = 'CT')
+                          AND (lower(sc.shiptocity) LIKE lower(?))
+                      ))
+                     )";
+    push @values, (like($form->{addr_city})) x 2;
+  }
+
+  if ($form->{addr_country}) {
+    $where .= " AND ((lower(ct.country) LIKE lower(?))
+                     OR
+                     (ct.id IN (
+                        SELECT so.trans_id
+                        FROM shipto so
+                        WHERE (so.module = 'CT')
+                          AND (lower(so.shiptocountry) LIKE lower(?))
+                      ))
+                     )";
+    push @values, (like($form->{addr_country})) x 2;
+  }
+
+  if ($form->{addr_gln}) {
+    $where .= " AND ((lower(ct.gln) LIKE lower(?))
+                     OR
+                     (ct.id IN (
+                        SELECT so.trans_id
+                        FROM shipto so
+                        WHERE (so.module = 'CT')
+                          AND (lower(so.shiptogln) LIKE lower(?))
                       ))
                      )";
-    push @values, ('%' . $form->{addr_city} . '%') x 2;
+    push @values, (like($form->{addr_gln})) x 2;
   }
 
   if ( $form->{status} eq 'orphaned' ) {
@@ -771,21 +206,65 @@ sub search {
   }
 
   if ($form->{obsolete} eq "Y") {
-    $where .= qq| AND obsolete|;
+    $where .= qq| AND ct.obsolete|;
   } elsif ($form->{obsolete} eq "N") {
-    $where .= qq| AND NOT obsolete|;
+    $where .= qq| AND NOT ct.obsolete|;
   }
 
   if ($form->{business_id}) {
-    $where .= qq| AND (business_id = ?)|;
+    $where .= qq| AND (ct.business_id = ?)|;
     push(@values, conv_i($form->{business_id}));
   }
 
-  # Nur Kunden finden, bei denen ich selber der Verkäufer bin
-  # Gilt nicht für Lieferanten
-  if ($cv eq 'customer' &&   !$main::auth->assert('customer_vendor_all_edit', 1)) {
-    $where .= qq| AND ct.salesman_id = (select id from employee where login= ?)|;
-    push(@values, $form->{login});
+  if ($form->{salesman_id}) {
+    $where .= qq| AND (ct.salesman_id = ?)|;
+    push(@values, conv_i($form->{salesman_id}));
+  }
+
+  if($form->{insertdatefrom}) {
+    $where .= qq| AND (ct.itime::DATE >= ?)|;
+    push@values, conv_date($form->{insertdatefrom});
+  }
+
+  if($form->{insertdateto}) {
+    $where .= qq| AND (ct.itime::DATE <= ?)|;
+    push @values, conv_date($form->{insertdateto});
+  }
+
+  if ($form->{all}) {
+    my @tokens = parse_line('\s+', 0, $form->{all});
+      $where .= qq| AND (
+          ct.${cv}number ILIKE ? OR
+          ct.name        ILIKE ?
+          )| for @tokens;
+    push @values, ("%$_%")x2 for @tokens;
+  }
+
+  if (($form->{create_zugferd_invoices} // '') ne '') {
+    $where .= qq| AND (ct.create_zugferd_invoices = ?)|;
+    push @values, $form->{create_zugferd_invoices};
+  }
+
+  if ($form->{all_phonenumbers}) {
+    my $search_term = trim($form->{all_phonenumbers});
+    $search_term    =~ s{\p{WSpace}+}{}g;
+    $search_term    = join ' *', split(//, $search_term);
+
+    $where .= qq| AND (ct.phone ~* ? OR
+                       ct.fax   ~* ? OR
+                       ct.id    IN
+                         (SELECT cp_cv_id FROM contacts
+                          WHERE cp_phone1      ~* ? OR
+                                cp_phone2      ~* ? OR
+                                cp_fax         ~* ? OR
+                                cp_mobile1     ~* ? OR
+                                cp_mobile2     ~* ? OR
+                                cp_satphone    ~* ? OR
+                                cp_satfax      ~* ? OR
+                                cp_privatphone ~* ?
+                         )
+    )|;
+    push @values, ($search_term)x10;
   }
 
   my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'CT',
@@ -797,74 +276,90 @@ sub search {
     push @values, @cvar_values;
   }
 
-  if ($form->{addr_street}) {
-    $where .= qq| AND (street ILIKE ?)|;
-    push @values, '%' . $form->{addr_street} . '%';
-  }
+  my $pg_select = $form->{l_pricegroup} ? qq|, pg.pricegroup as pricegroup | : '';
+  my $pg_join   = $form->{l_pricegroup} ? qq|LEFT JOIN pricegroup pg ON (ct.pricegroup_id = pg.id) | : '';
 
-  if ($form->{addr_zipcode}) {
-    $where .= qq| AND (zipcode ILIKE ?)|;
-    push @values, $form->{addr_zipcode} . '%';
+  my $main_cp_select = '';
+  if ($form->{l_main_contact_person}) {
+    $main_cp_select =  qq/, (SELECT concat(cp.cp_givenname, ' ', cp.cp_name, ' | ', cp.cp_email, ' | ', cp.cp_phone1)
+                              FROM contacts cp WHERE ct.id=cp.cp_cv_id AND cp.cp_main LIMIT 1)
+                              AS main_contact_person /;
   }
-
   my $query =
-    qq|SELECT ct.*, b.description AS business | .
+    qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
+    qq|  pt.description as payment | .
+    $pg_select .
+    $main_cp_select .
+    (qq|, NULL AS invnumber, NULL AS ordnumber, NULL AS quonumber, NULL AS invid, NULL AS module, NULL AS formtype, NULL AS closed | x!! $join_records) .
     qq|FROM $cv ct | .
     qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
+    qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
+    qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+    $pg_join .
     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);
-    $query = "";
+  if ($join_records) {
+    my $union = "UNION";
 
     if ($form->{l_invnumber}) {
       my $ar = $cv eq 'customer' ? 'ar' : 'ap';
       my $module = $ar eq 'ar' ? 'is' : 'ir';
-
-      $query =
-        qq|SELECT ct.*, b.description AS business, | .
-        qq|  a.invnumber, a.ordnumber, a.quonumber, a.id AS invid, | .
+      push(@values, @saved_values);
+      $query .=
+        qq| UNION | .
+        qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
+        qq|  pt.description as payment | .
+        $pg_select .
+        $main_cp_select .
+        qq|, a.invnumber, a.ordnumber, a.quonumber, a.id AS invid, | .
         qq|  '$module' AS module, 'invoice' AS formtype, | .
         qq|  (a.amount = a.paid) AS closed | .
         qq|FROM $cv ct | .
         qq|JOIN $ar a ON (a.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
+        qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
+        qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+        $pg_join .
         qq|WHERE $where AND (a.invoice = '1')|;
-
-      $union = qq|UNION|;
     }
 
     if ( $form->{l_ordnumber} ) {
-      if ($union eq "UNION") {
-        push(@values, @saved_values);
-      }
+      push(@values, @saved_values);
       $query .=
-        qq| $union | .
-        qq|SELECT ct.*, b.description AS business,| .
-        qq|  ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
+        qq| UNION | .
+        qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
+        qq|  pt.description as payment | .
+        $pg_select .
+        $main_cp_select .
+        qq|, ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
         qq|  'oe' AS module, 'order' AS formtype, o.closed | .
         qq|FROM $cv ct | .
         qq|JOIN oe o ON (o.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
+        qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
+        qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+        $pg_join .
         qq|WHERE $where AND (o.quotation = '0')|;
-
-      $union = qq|UNION|;
     }
 
     if ( $form->{l_quonumber} ) {
-      if ($union eq "UNION") {
-        push(@values, @saved_values);
-      }
+      push(@values, @saved_values);
       $query .=
-        qq| $union | .
-        qq|SELECT ct.*, b.description AS business, | .
-        qq|  ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
+        qq| UNION | .
+        qq|SELECT ct.*, ct.itime::DATE AS insertdate, b.description AS business, e.name as salesman, | .
+        qq|  pt.description as payment | .
+        $pg_select .
+        $main_cp_select .
+        qq|, ' ' AS invnumber, o.ordnumber, o.quonumber, o.id AS invid, | .
         qq|  'oe' AS module, 'quotation' AS formtype, o.closed | .
         qq|FROM $cv ct | .
         qq|JOIN oe o ON (o.${cv}_id = ct.id) | .
         qq|LEFT JOIN business b ON (ct.business_id = b.id) | .
+        qq|LEFT JOIN employee e ON (ct.salesman_id = e.id) | .
+        qq|LEFT JOIN payment_terms pt ON (ct.payment_id = pt.id) | .
+        $pg_join .
         qq|WHERE $where AND (o.quotation = '1')|;
     }
   }
@@ -883,7 +378,7 @@ sub get_contact {
 
   die 'Missing argument: cp_id' unless $::form->{cp_id};
 
-  my $dbh   = $form->dbconnect($myconfig);
+  my $dbh   = SL::DB->client->dbh;
   my $query =
     qq|SELECT * FROM contacts c | .
     qq|WHERE cp_id = ? ORDER BY cp_id limit 1|;
@@ -901,199 +396,6 @@ sub get_contact {
   ($form->{cp_used}) = selectfirst_array_query($form, $dbh, $query, ($form->{cp_id})x2);
 
   $sth->finish;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_shipto {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-  my $dbh   = $form->dbconnect($myconfig);
-  my $query = qq|SELECT * FROM shipto WHERE shipto_id = ?|;
-  my $sth = prepare_execute_query($form, $dbh, $query, $form->{shipto_id});
-
-  my $ref = $sth->fetchrow_hashref("NAME_lc");
-
-  map { $form->{$_} = $ref->{$_} } keys %$ref;
-
-  $query = qq|SELECT COUNT(shipto_id) AS used FROM (
-    SELECT shipto_id FROM oe UNION
-    SELECT shipto_id FROM ar UNION
-    SELECT shipto_id FROM delivery_orders
-  ) AS stid WHERE shipto_id = ? OR ? = 0|;
-  ($form->{shiptoused}) = selectfirst_array_query($form, $dbh, $query, ($form->{shipto_id})x2);
-
-  $sth->finish;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_delivery {
-  $main::lxdebug->enter_sub();
-
-  my ( $self, $myconfig, $form ) = @_;
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $arap = $form->{db} eq "vendor" ? "ap" : "ar";
-  my $db = $form->{db} eq "customer" ? "customer" : "vendor";
-  my $qty_sign = $form->{db} eq 'vendor' ? ' * -1 AS qty' : '';
-
-  my $where = " WHERE 1=1 ";
-  my @values;
-
-  if ($form->{shipto_id} && ($arap eq "ar")) {
-    $where .= "AND ${arap}.shipto_id = ?";
-    push(@values, $form->{shipto_id});
-  } else {
-    $where .= "AND ${arap}.${db}_id = ?";
-    push(@values, $form->{id});
-  }
-
-  if ($form->{from}) {
-    $where .= "AND ${arap}.transdate >= ?";
-    push(@values, conv_date($form->{from}));
-  }
-  if ($form->{to}) {
-    $where .= "AND ${arap}.transdate <= ?";
-    push(@values, conv_date($form->{to}));
-  }
-  my $query =
-    qq|SELECT s.shiptoname, i.qty $qty_sign, | .
-    qq|  ${arap}.id, ${arap}.transdate, ${arap}.invnumber, ${arap}.ordnumber, | .
-    qq|  i.description, i.unit, i.sellprice, | .
-    qq|  oe.id AS oe_id, invoice | .
-    qq|FROM $arap | .
-    qq|LEFT JOIN shipto s ON | .
-    ($arap eq "ar"
-     ? qq|(ar.shipto_id = s.shipto_id) |
-     : qq|(ap.id = s.trans_id) |) .
-    qq|LEFT JOIN invoice i ON (${arap}.id = i.trans_id) | .
-    qq|LEFT join parts p ON (p.id = i.parts_id) | .
-    qq|LEFT JOIN oe ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '') | .
-    $where .
-    qq|ORDER BY ${arap}.transdate DESC LIMIT 15|;
-
-  $form->{DELIVERY} = selectall_hashref_query($form, $dbh, $query, @values);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub _save_note {
-  $main::lxdebug->enter_sub();
-
-  my $self   = shift;
-  my %params = @_;
-
-  my $form   = $main::form;
-
-  Common::check_params(\%params, 'dbh');
-
-  if (!$form->{NOTE_subject}) {
-    $main::lxdebug->leave_sub();
-    return;
-  }
-
-  my $dbh = $params{dbh};
-
-  my %follow_up;
-  my %note = (
-    'id'           => $form->{NOTE_id},
-    'subject'      => $form->{NOTE_subject},
-    'body'         => $form->{NOTE_body},
-    'trans_id'     => $form->{id},
-    'trans_module' => 'ct',
-  );
-
-  $note{id} = Notes->save(%note);
-
-  if ($form->{FU_date}) {
-    %follow_up = (
-      'id'               => $form->{FU_id},
-      'note_id'          => $note{id},
-      'follow_up_date'   => $form->{FU_date},
-      'created_for_user' => $form->{FU_created_for_user},
-      'done'             => $form->{FU_done} ? 1 : 0,
-      'subject'          => $form->{NOTE_subject},
-      'body'             => $form->{NOTE_body},
-      'LINKS'            => [
-        {
-          'trans_id'     => $form->{id},
-          'trans_type'   => $form->{db} eq 'customer' ? 'customer' : 'vendor',
-          'trans_info'   => $form->{name},
-        },
-      ],
-    );
-
-    $follow_up{id} = FU->save(%follow_up);
-
-  } elsif ($form->{FU_id}) {
-    do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|, conv_i($form->{FU_id}));
-    do_query($form, $dbh, qq|DELETE FROM follow_ups      WHERE id = ?|,           conv_i($form->{FU_id}));
-  }
-
-  delete @{$form}{grep { /^NOTE_|^FU_/ } keys %{ $form }};
-
-  $main::lxdebug->leave_sub();
-}
-
-sub _delete_selected_notes {
-  $main::lxdebug->enter_sub();
-
-  my $self   = shift;
-  my %params = @_;
-
-  Common::check_params(\%params, 'dbh');
-
-  my $form = $main::form;
-  my $dbh  = $params{dbh};
-
-  foreach my $i (1 .. $form->{NOTES_rowcount}) {
-    next unless ($form->{"NOTE_delete_$i"} && $form->{"NOTE_id_$i"});
-
-    Notes->delete('dbh' => $params{dbh},
-                  'id'  => $form->{"NOTE_id_$i"});
-  }
-
-  $main::lxdebug->leave_sub();
-}
-
-# TODO: remove in 2.7.0 stable
-sub delete_shipto {
-  $main::lxdebug->enter_sub();
-
-  my $self      = shift;
-  my $shipto_id = shift;
-
-  my $form      = $main::form;
-  my %myconfig  = %main::myconfig;
-  my $dbh       = $form->get_standard_dbh(\%myconfig);
-
-  do_query($form, $dbh, qq|UPDATE shipto SET trans_id = NULL WHERE shipto_id = ?|, $shipto_id);
-
-  $dbh->commit();
-
-  $main::lxdebug->leave_sub();
-}
-
-# TODO: remove in 2.7.0 stable
-sub delete_contact {
-  $main::lxdebug->enter_sub();
-
-  my $self      = shift;
-  my $cp_id     = shift;
-
-  my $form      = $main::form;
-  my %myconfig  = %main::myconfig;
-  my $dbh       = $form->get_standard_dbh(\%myconfig);
-
-  do_query($form, $dbh, qq|UPDATE contacts SET cp_cv_id = NULL WHERE cp_id = ?|, $cp_id);
-
-  $dbh->commit();
 
   $main::lxdebug->leave_sub();
 }
@@ -1114,7 +416,8 @@ sub get_bank_info {
   my $table        = $params{vc} eq 'customer' ? 'customer' : 'vendor';
   my @ids          = ref $params{id} eq 'ARRAY' ? @{ $params{id} } : ($params{id});
   my $placeholders = join ", ", ('?') x scalar @ids;
-  my $query        = qq|SELECT id, name, account_number, bank, bank_code, iban, bic
+  my $c_mandate    = $params{vc} eq 'customer' ? ', mandator_id, mandate_date_of_signature' : '';
+  my $query        = qq|SELECT id, name, account_number, bank, bank_code, iban, bic ${c_mandate}
                         FROM ${table}
                         WHERE id IN (${placeholders})|;
 
@@ -1131,82 +434,6 @@ sub get_bank_info {
   return $result;
 }
 
-sub parse_excel_file {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-  my $locale = $main::locale;
-
-  $form->{formname}   = 'sales_quotation';
-  $form->{type}   = 'sales_quotation';
-  $form->{format} = 'excel';
-  $form->{media}  = 'screen';
-  $form->{quonumber} = 1;
-
-
-  # $form->{"notes"} will be overridden by the customer's/vendor's "notes" field. So save it here.
-  $form->{ $form->{"formname"} . "notes" } = $form->{"notes"};
-
-  my $inv                  = "quo";
-  my $due                  = "req";
-  $form->{"${inv}date"} = $form->{transdate};
-  $form->{label}        = $locale->text('Quotation');
-  my $numberfld            = "sqnumber";
-  my $order                = 1;
-
-  # assign number
-  $form->{what_done} = $form->{formname};
-
-  map({ delete($form->{$_}); } grep(/^cp_/, keys(%{ $form })));
-
-  my $output_dateformat = $myconfig->{"dateformat"};
-  my $output_numberformat = $myconfig->{"numberformat"};
-  my $output_longdates = 1;
-
-  # map login user variables
-  map { $form->{"login_$_"} = $myconfig->{$_} } ("name", "email", "fax", "tel", "company");
-
-  # format item dates
-  for my $field (qw(transdate_oe deliverydate_oe)) {
-    map {
-      $form->{$field}[$_] = $locale->date($myconfig, $form->{$field}[$_], 1);
-    } 0 .. $#{ $form->{$field} };
-  }
-
-  if ($form->{shipto_id}) {
-    $form->get_shipto($myconfig);
-  }
-
-  $form->{notes} =~ s/^\s+//g;
-
-  $form->{templates} = $myconfig->{templates};
-
-  delete $form->{printer_command};
-
-  $form->get_employee_info($myconfig);
-
-  my ($cvar_date_fields, $cvar_number_fields) = CVar->get_field_format_list('module' => 'CT', 'prefix' => 'vc_');
-
-  if (scalar @{ $cvar_date_fields }) {
-    format_dates($output_dateformat, $output_longdates, @{ $cvar_date_fields });
-  }
-
-  while (my ($precision, $field_list) = each %{ $cvar_number_fields }) {
-    reformat_numbers($output_numberformat, $precision, @{ $field_list });
-  }
-
-  $form->{excel} = 1;
-  my $extension            = 'xls';
-
-  $form->{IN}         = "$form->{formname}.${extension}";
-
-  delete $form->{OUT};
-
-  $form->parse_template($myconfig);
-
-  $main::lxdebug->leave_sub();
-}
-
 sub search_contacts {
   $::lxdebug->enter_sub;
 
@@ -1214,7 +441,6 @@ sub search_contacts {
   my %params    = @_;
 
   my $dbh       = $params{dbh} || $::form->get_standard_dbh;
-  my $vc        = $params{db} eq 'customer' ? 'customer' : 'vendor';
 
   my %sortspecs = (
     'cp_name'   => 'cp_name, cp_givenname',
@@ -1222,7 +448,7 @@ sub search_contacts {
     'vcnumber'  => 'vcnumber, cp_name, cp_givenname',
     );
 
-  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email vcname vcnumber);
+  my %sortcols  = map { $_ => 1 } qw(cp_name cp_givenname cp_phone1 cp_phone2 cp_mobile1 cp_email cp_street cp_zipcode cp_city cp_position vcname vcnumber);
 
   my $order_by  = $sortcols{$::form->{sort}} ? $::form->{sort} : 'cp_name';
   $::form->{sort} = $order_by;
@@ -1241,7 +467,7 @@ sub search_contacts {
       'cp.cp_name      ILIKE ?',
       'cp.cp_givenname ILIKE ?',
       'cp.cp_email     ILIKE ?';
-    push @values, ('%' . $params{search_term} . '%') x 3;
+    push @values, (like($params{search_term})) x 3;
 
     if (($params{search_term} =~ m/\d/) && ($params{search_term} !~ m/[^\d \(\)+\-]/)) {
       my $number =  $params{search_term};
@@ -1254,6 +480,15 @@ sub search_contacts {
     push @where_tokens, map { "($_)" } join ' OR ', @tokens;
   }
 
+  my ($cvar_where, @cvar_values) = CVar->build_filter_query('module'         => 'Contacts',
+                                                            'trans_id_field' => 'cp.cp_id',
+                                                            'filter'         => $params{filter});
+
+  if ($cvar_where) {
+    push @where_tokens, $cvar_where;
+    push @values, @cvar_values;
+  }
+
   if (my $filter = $params{filter}) {
     for (qw(name title givenname email project abteilung)) {
       next unless $filter->{"cp_$_"};