X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=33b0c83329fbd605887c1a28048cb8d04b1d554e;hb=f3490e85153f60ce199993585fc11613185c3896;hp=8223a6ef7a5811994dc1792d58642180f4f275ee;hpb=245b032241e70470b1d392b5fe055a2dfd6333c6;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 8223a6ef7..33b0c8332 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -45,43 +45,48 @@
 # $locale->text('Vendor deleted!')
 # $locale->text('Cannot delete vendor!')
 
-use CGI::Ajax;
 use POSIX qw(strftime);
 
 use SL::CT;
 use SL::CVar;
+use SL::DB::Business;
+use SL::DB::Default;
 use SL::ReportGenerator;
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/reportgenerator.pl";
 
+use strict;
 1;
 
 # end of main
 
 sub add {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
 
-  $form->{title} = "Add";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $form->{callback} =
-    "$form->{script}?action=add&db=$form->{db}"
-    unless $form->{callback};
+  $form->{title}    = "Add";
+  $form->{callback} = "$form->{script}?action=add&db=$form->{db}" unless $form->{callback};
 
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
 
   &form_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub search {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $auth->assert('customer_vendor_edit');
+  my $form     = $main::form;
+  my $locale   = $main::locale;
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
@@ -101,16 +106,22 @@ sub search {
   $form->header();
   print $form->parse_html_template('ct/search');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub list_names {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
+  report_generator_set_default_sort('name', 1);
+
   CT->search(\%myconfig, \%$form);
 
   my $cvar_configs = CVar->get_configs('module' => 'CT');
@@ -122,49 +133,73 @@ sub list_names {
     push @options, $locale->text('Orphaned');
   }
 
-  push @options, $locale->text('Name') . " : $form->{name}"                    if $form->{name};
-  push @options, $locale->text('Contact') . " : $form->{contact}"              if $form->{contact};
-  push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"};
-  push @options, $locale->text('E-mail') . " : $form->{email}"                 if $form->{email};
+  push @options, $locale->text('Name') . " : $form->{name}"                                    if $form->{name};
+  push @options, $locale->text('Contact') . " : $form->{contact}"                              if $form->{contact};
+  push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}|                 if $form->{"$form->{db}number"};
+  push @options, $locale->text('E-mail') . " : $form->{email}"                                 if $form->{email};
+  push @options, $locale->text('Contact person (surname)')           . " : $form->{cp_name}"   if $form->{cp_name};
+  push @options, $locale->text('Billing/shipping address (city)')    . " : $form->{addr_city}" if $form->{addr_city};
+  push @options, $locale->text('Billing/shipping address (zipcode)') . " : $form->{zipcode}"   if $form->{addr_zipcode};
+  push @options, $locale->text('Billing/shipping address (street)')  . " : $form->{street}"    if $form->{addr_street};
+
+  if ($form->{business_id}) {
+    my $business = SL::DB::Manager::Business->find_by(id => $form->{business_id});
+    if ($business) {
+      my $label = $form->{IS_CUSTOMER} ? $::locale->text('Customer type') : $::locale->text('Vendor type');
+      push @options, $label . " : " . $business->description;
+    }
+  }
 
   my @columns = (
-    'id',        'name',  "$form->{db}number", 'address',  'contact',  'phone',
-    'fax',       'email', 'taxnumber',         'sic_code', 'business', 'invnumber',
-    'ordnumber', 'quonumber'
+    'id',        'name',      "$form->{db}number",   'contact',  'phone',
+    'fax',       'email',     'taxnumber',           'street',   'zipcode' , 'city',
+    'business',  'invnumber', 'ordnumber',           'quonumber'
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
+  my @searchable_custom_variables  = grep { $_->{searchable} }  @{ $cvar_configs };
   my %column_defs_cvars            = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
 
   push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
 
   my %column_defs = (
     'id'                => { 'text' => $locale->text('ID'), },
-    "$form->{db}number" => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Customer Number') : $locale->text('Vendor Number'), },
-    'name'              => { 'text' => $locale->text('Name'), },
-    'address'           => { 'text' => $locale->text('Address'), },
+    "$form->{db}number" => { 'text' => $locale->text('Number'), },
+    'name'              => { 'text' => $form->{IS_CUSTOMER} ? $::locale->text('Customer Name') : $::locale->text('Vendor Name'), },
     'contact'           => { 'text' => $locale->text('Contact'), },
     'phone'             => { 'text' => $locale->text('Phone'), },
     'fax'               => { 'text' => $locale->text('Fax'), },
     'email'             => { 'text' => $locale->text('E-mail'), },
     'cc'                => { 'text' => $locale->text('Cc'), },
     'taxnumber'         => { 'text' => $locale->text('Tax Number'), },
-    'sic_code'          => { 'text' => $locale->text('SIC'), },
     'business'          => { 'text' => $locale->text('Type of Business'), },
     'invnumber'         => { 'text' => $locale->text('Invoice'), },
     'ordnumber'         => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Sales Order') : $locale->text('Purchase Order'), },
     'quonumber'         => { 'text' => $form->{IS_CUSTOMER} ? $locale->text('Quotation')   : $locale->text('Request for Quotation'), },
+    'street'            => { 'text' => $locale->text('Street'), },
+    'zipcode'           => { 'text' => $locale->text('Zipcode'), },
+    'city'              => { 'text' => $locale->text('City'), },
     %column_defs_cvars,
   );
 
   map { $column_defs{$_}->{visible} = $form->{"l_$_"} eq 'Y' } @columns;
 
-  my @hidden_variables  = (qw(db status obsolete), map { "l_$_" } @columns);
+  my @hidden_variables  = ( qw(
+      db status obsolete name contact email cp_name addr_street addr_zipcode
+      addr_city business_id
+    ), "$form->{db}number",
+    map({ "cvar_$_->{name}" } @searchable_custom_variables),
+    map({ "l_$_" } @columns),
+  );
+
   my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables);
-  my $callback          = build_std_url('action=list_names', grep { $form->{$_} } @hidden_variables);
-  $form->{callback}     = "$callback&sort=" . E($form->{sort});
+  my $callback          = build_std_url('action=list_names', grep { $form->{$_} } @hidden_nondefault);
+  $form->{callback}     = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});
 
-  map { $column_defs{$_}->{link} = "${callback}&sort=${_}" } @columns;
+  foreach (@columns) {
+    my $sortdir              = $form->{sort} eq $_ ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$_}->{link} = "${callback}&sort=${_}&sortdir=${sortdir}";
+  }
 
   my ($ordertype, $quotationtype, $attachment_basename);
   if ($form->{IS_CUSTOMER}) {
@@ -189,13 +224,14 @@ sub list_names {
                        'attachment_basename'   => $attachment_basename . strftime('_%Y%m%d', localtime time),
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
 
-  $report->set_export_options('list_names', @hidden_variables);
+  $report->set_export_options('list_names', @hidden_variables, qw(sort sortdir));
 
-  $report->set_sort_indicator($form->{sort}, 1);
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});
 
   CVar->add_custom_variables_to_report('module'         => 'CT',
                                        'trans_id_field' => 'id',
@@ -228,67 +264,87 @@ sub list_names {
 
   $report->generate_with_headers();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub edit {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $auth->assert('customer_vendor_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   # show history button
   $form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
   #/show hhistory button
-  
+
   CT->get_tuple(\%myconfig, \%$form);
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
 
-  # format " into &quot;
-  map { $form->{$_} =~ s/\"/&quot;/g } keys %$form;
-
   $form->{title} = "Edit";
 
   # format discount
   $form->{discount} *= 100;
+  # format uri
+  $form->{homepage} = 'http://' . $form->{homepage} unless $form->{homepage} =~ m|^https?://|;
 
   &form_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
+}
+
+sub _shipto_label {
+  my $s = shift(@_);
+  join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' '
+}
+
+sub _contacts_label {
+  join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname};
 }
 
 sub form_header {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $auth->assert('customer_vendor_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $form->get_lists("employees" => "ALL_EMPLOYEES",
-                   "taxzones"  => "ALL_TAXZONES");
+  $form->get_lists(employees => "ALL_EMPLOYEES",
+                   taxzones  => "ALL_TAXZONES");
   $form->get_pricegroup(\%myconfig, { all => 1 });
 
+  $form->get_lists(customers => { key => "ALL_SALESMAN_CUSTOMERS", business_is_salesman => 1 }) if $::lx_office_conf{features}->{vertreter};
+
   $form->{ALL_SALESMEN}   = $form->{ALL_EMPLOYEES};
   $form->{taxincluded}    = ($form->{taxincluded}) ? "checked" : "";
-  $form->{is_admin}       = $myconfig{role} eq 'admin';
   $form->{is_customer}    = $form->{db}     eq 'customer';
   $form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };
-  $form->{shipto_label}   = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
-  $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
+  $form->{shipto_label}   = \&_shipto_label;
+  $form->{contacts_label} = \&_contacts_label;
   $form->{taxzone_id}     = 0                                                               if !$form->{id};
   $form->{jsscript}       = 1;
   $form->{fokus}          = "ct.greeting";
-  $form->{AJAX}           = [ new CGI::Ajax( map {; "get_$_" => "$form->{script}?action=get_$_" } qw(shipto contact delivery) ) ];
-
-  unshift @{ $form->{SHIPTO} },   +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' };
-  unshift @{ $form->{CONTACTS} }, +{ cp_id     => '0', cp_name => $locale->text('New contact') };
+  $form->{SHIPTO_ALL}     = [ +{ shipto_id => '0', shiptoname => $::locale->text('All') }, @{ $form->{SHIPTO} } ];
 
-  $form->{title} = $form->{title_save} 
+  $form->{title} = $form->{title_save}
                 || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
 
   CT->query_titles_and_greetings(\%myconfig, \%$form);
-  map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT);
+  map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(COMPANY_GREETINGS);
 
   $form->{NOTES} ||= [ ];
 
+  if (!$form->{'language_id'}) {
+    my $l_id = SL::DB::Default->get->{'language_id'};
+    if ($l_id) {
+      $form->{'default_language_id'} = $l_id;
+    }
+  }
+
   $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
 
   CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
@@ -296,89 +352,124 @@ sub form_header {
   $form->header;
   print $form->parse_html_template('ct/form_header');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub form_footer {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $auth->assert('customer_vendor_edit');
+  my $form     = $main::form;
 
   print $form->parse_html_template('ct/form_footer', { is_orphaned => $form->{status} eq 'orphaned',
                                                        is_customer => $form->{db}     eq 'customer' });
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
+}
+
+sub _do_save {
+  $main::auth->assert('customer_vendor_edit & ' .
+                      '(general_ledger         | invoice_edit         | vendor_invoice_edit | ' .
+                      ' request_quotation_edit | sales_quotation_edit | sales_order_edit    | purchase_order_edit)');
+
+  $::form->isblank("name", $::locale->text("Name missing!"));
+
+  if ($::form->{new_salesman_id} && $::lx_office_conf{features}->{vertreter}) {
+    $::form->{salesman_id} = $::form->{new_salesman_id};
+    delete $::form->{new_salesman_id};
+  }
+
+  my $res = $::form->{db} eq 'customer' ? CT->save_customer(\%::myconfig, $::form) : CT->save_vendor(\%::myconfig, $::form);
+
+  if (3 == $res) {
+    if ($::form->{"db"} eq "customer") {
+      $::form->error($::locale->text('This customer number is already in use.'));
+    } else {
+      $::form->error($::locale->text('This vendor number is already in use.'));
+    }
+  }
 }
 
 sub add_transaction {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit & ' .
+                '(general_ledger         | invoice_edit         | vendor_invoice_edit | ' .
+                ' request_quotation_edit | sales_quotation_edit | sales_order_edit    | purchase_order_edit)');
 
-  $auth->assert('customer_vendor_edit & general_ledger');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
 #  # saving the history
 #  if(!exists $form->{addition}) {
-#  	$form->{addition} = "ADD TRANSACTION";
-#  	$form->save_history($form->dbconnect(\%myconfig));
+#    $form->{addition} = "ADD TRANSACTION";
+#    $form->save_history;
 #  }
 #  # /saving the history
-  
-  $form->isblank("name", $locale->text("Name missing!"));
-  if ($form->{"db"} eq "customer") {
-    CT->save_customer(\%myconfig, \%$form);
-  } else {
-    CT->save_vendor(\%myconfig, \%$form);
-  }
+
+  _do_save();
 
   $form->{callback} = $form->escape($form->{callback}, 1);
-  $name = $form->escape("$form->{name}", 1);
+  my $name = $form->escape("$form->{name}", 1);
 
   $form->{callback} =
     "$form->{script}?action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}";
   $form->redirect;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_ap_transaction {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit & general_ledger');
 
-  $auth->assert('customer_vendor_edit & general_ledger');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{script} = "ap.pl";
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_ar_transaction {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit & general_ledger');
 
-  $auth->assert('customer_vendor_edit & general_ledger');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{script} = "ar.pl";
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_invoice {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   if ($form->{db} eq 'customer') {
-    $auth->assert('customer_vendor_edit & invoice_edit');
+    $main::auth->assert('customer_vendor_edit & invoice_edit');
   } else {
-    $auth->assert('customer_vendor_edit & vendor_invoice_edit');
+    $main::auth->assert('customer_vendor_edit & vendor_invoice_edit');
   }
 
   $form->{script} = ($form->{db} eq 'customer') ? "is.pl" : "ir.pl";
@@ -386,54 +477,67 @@ sub save_and_invoice {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|invnumber_| . $form->{invnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_rfq {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit & request_quotation_edit');
 
-  $auth->assert('customer_vendor_edit & request_quotation_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{script} = "oe.pl";
   $form->{type}   = "request_quotation";
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_quotation {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit & sales_quotation_edit');
+  $main::auth->assert('customer_vendor_edit & sales_quotation_edit');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{script} = "oe.pl";
   $form->{type}   = "sales_quotation";
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_order {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $auth->assert('customer_vendor_edit & sales_order_edit');
+  if ($form->{db} eq 'customer') {
+    $main::auth->assert('customer_vendor_edit & sales_order_edit');
+  } else {
+    $main::auth->assert('customer_vendor_edit & purchase_order_edit');
+  }
 
   $form->{script} = "oe.pl";
   $form->{type}   =
@@ -441,157 +545,222 @@ sub save_and_order {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_close {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
 
-  $msg = ucfirst $form->{db};
-  $imsg .= " saved!";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my $msg = ucfirst $form->{db};
+  $msg .= " saved!";
+
+  _do_save();
 
-  $form->isblank("name", $locale->text("Name missing!"));
-  if ($form->{"db"} eq "customer") {
-    $rc = CT->save_customer(\%myconfig, \%$form);
-  } else {
-    $rc = CT->save_vendor(\%myconfig, \%$form);
-  }
-  if ($rc == 3) {
-    $form->error($locale->text('customernumber not unique!'));
-  }
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
     $form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->save_history;
   }
   # /saving the history
   $form->redirect($locale->text($msg));
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
 
-  $msg = ucfirst $form->{db};
-  $imsg .= " saved!";
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $form->isblank("name", $locale->text("Name missing!"));
+  my $msg = ucfirst $form->{db};
+  $msg .= " saved!";
 
-  my $res;
-  if ($form->{"db"} eq "customer") {
-    $res = CT->save_customer(\%myconfig, \%$form);
-  } else {
-    $res = CT->save_vendor(\%myconfig, \%$form);
-  }
+  _do_save();
 
-  if (3 == $res) {
-    if ($form->{"db"} eq "customer") {
-      $form->error($locale->text('This customer number is already in use.'));
-    } else {
-      $form->error($locale->text('This vendor number is already in use.'));
-    }
-  }
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   &edit;
-  exit;
-  $lxdebug->leave_sub();
+
+  $main::lxdebug->leave_sub();
+  ::end_of_request();
 }
 
 sub delete {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $auth->assert('customer_vendor_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
   CT->delete(\%myconfig, \%$form);
 
-  $msg = ucfirst $form->{db};
+  my $msg = ucfirst $form->{db};
   $msg .= " deleted!";
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = ($form->{"db"} eq "customer" ? qq|customernumber_| . $form->{customernumber} : qq|vendornumber_| . $form->{vendornumber});
-  	$form->{addition} = "DELETED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history;
   }
-  # /saving the history 
+  # /saving the history
   $form->redirect($locale->text($msg));
 
-  $msg = "Cannot delete $form->{db}";
-  $form->error($locale->text($msg));
-
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub display {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
+
+  my $form     = $main::form;
 
   &form_header();
   &form_footer();
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub update {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $auth->assert('customer_vendor_edit');
+  my $form     = $main::form;
 
   &display();
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub get_contact {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
 
-  CT->get_contact(\%myconfig, \%$form);
-  print $cgi->header(), join '__pjx__', map $form->{"cp_$_"}, 
-    qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday);
-  $lxdebug->leave_sub();
+  CT->populate_drop_down_boxes(\%::myconfig, $::form);
+  CT->query_titles_and_greetings(\%::myconfig, $::form);
+  CT->get_contact(\%::myconfig, $::form) if $::form->{cp_id};
 
+  $::form->{contacts_label} = \&_contacts_label;
+
+  print $::form->ajax_response_header(), $::form->parse_html_template('ct/_contact');
+
+  $main::lxdebug->leave_sub();
 }
 
 sub get_shipto {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
 
-  CT->get_shipto(\%myconfig, \%$form);
-  print $cgi->header(),  join '__pjx__', map $form->{"shipto$_"},
-    qw(name department_1 department_2 street zipcode city country contact phone fax email used);
-  $lxdebug->leave_sub();
+  CT->populate_drop_down_boxes(\%::myconfig, $::form);
+  CT->get_shipto(\%::myconfig, $::form) if $::form->{shipto_id};
 
+  $::form->{shipto_label} = \&_shipto_label;
+
+  print $::form->ajax_response_header(), $::form->parse_html_template('ct/_shipto');
+
+  $main::lxdebug->leave_sub();
 }
 
 sub get_delivery {
-  $lxdebug->enter_sub();
+  $::lxdebug->enter_sub;
+
+  $::auth->assert('customer_vendor_edit');
+  $::auth->assert('sales_all_edit');
+
+  CT->get_delivery(\%::myconfig, $::form );
+
+  print $::form->ajax_response_header,
+        $::form->parse_html_template('ct/get_delivery', {
+          is_customer =>  $::form->{db} eq 'customer',
+        });
+
+  $::lxdebug->leave_sub;
+}
+
+sub delete_shipto {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  CT->get_shipto(\%myconfig, \%$form);
+
+  unless ($form->{shiptoused}) {
+    CT->delete_shipto($form->{shipto_id});
+    @$form{ grep /^shipto/, keys %$form } = undef;
+  }
+
+  edit();
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_contact {
+  $main::lxdebug->enter_sub();
+
+  $main::auth->assert('customer_vendor_edit');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  CT->get_contact(\%myconfig, \%$form);
+
+  unless ($form->{cp_used}) {
+    CT->delete_contact($form->{cp_id});
+    @$form{ grep /^cp_/, keys %$form } = undef;
+  }
+
+  edit();
+
+  $main::lxdebug->leave_sub();
+}
+
+sub ajax_autocomplete {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $auth->assert('customer_vendor_edit');
+  $form->{column}          = 'name'     unless $form->{column} =~ /^name$/;
+  $form->{vc}              = 'customer' unless $form->{vc} =~ /^customer|vendor$/;
+  $form->{db}              = $form->{vc}; # CT expects this
+  $form->{$form->{column}} = $form->{q}           || '';
+  $form->{limit}           = ($form->{limit} * 1) || 10;
+  $form->{searchitems}   ||= '';
 
-  CT->get_delivery(\%myconfig, \%$form );
+  CT->search(\%myconfig, $form);
 
-  print $cgi->header(), $form->parse_html_template('ct/get_delivery');
+  print $form->ajax_response_header(),
+        $form->parse_html_template('ct/ajax_autocomplete');
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub continue { call_sub($form->{nextsub}); }
+sub continue { call_sub($main::form->{nextsub}); }