X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=10ff70675c38e89ff7e58405168decfa233f7c0b;hb=fe73e0d261229f181e8133283b530509773d2151;hp=d4d2f9fb79ac2b7f7094ab4eafcc6f479959414f;hpb=7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index d4d2f9fb7..10ff70675 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -36,8 +36,15 @@
 # $locale->text('Vendors')
 # $locale->text('Add Customer')
 # $locale->text('Add Vendor')
+# $locale->text('Edit Customer')
+# $locale->text('Edit Vendor')
+# $locale->text('Customer saved!')
+# $locale->text('Vendor saved!')
+# $locale->text('Customer deleted!')
+# $locale->text('Cannot delete customer!')
+# $locale->text('Vendor deleted!')
+# $locale->text('Cannot delete vendor!')
 
-use CGI;
 use CGI::Ajax;
 use POSIX qw(strftime);
 
@@ -48,33 +55,37 @@ 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';
 
@@ -94,16 +105,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');
@@ -111,62 +128,62 @@ sub list_names {
   my @options;
   if ($form->{status} eq 'all') {
     push @options, $locale->text('All');
-
   } elsif ($form->{status} eq 'orphaned') {
     push @options, $locale->text('Orphaned');
   }
 
-  if ($form->{name}) {
-    push @options, $locale->text('Name') . " : $form->{name}";
-  }
-  if ($form->{contact}) {
-    push @options, $locale->text('Contact') . " : $form->{contact}";
-  }
-  if ($form->{"$form->{db}number"}) {
-    push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}|;
-  }
-  if ($form->{email}) {
-    push @options, $locale->text('E-mail') . " : $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};
 
   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'), },
+    "$form->{db}number" => { 'text' => $locale->text('Number'), },
     'name'              => { 'text' => $locale->text('Name'), },
-    'address'           => { 'text' => $locale->text('Address'), },
     '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_city), "$form->{db}number", @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}) {
@@ -195,9 +212,9 @@ sub list_names {
   $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',
@@ -230,27 +247,24 @@ 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
-  
-  # $locale->text('Edit Customer')
-  # $locale->text('Edit Vendor')
 
   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
@@ -259,13 +273,17 @@ sub edit {
   &form_header;
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 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");
@@ -276,25 +294,21 @@ sub form_header {
   $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->{shipto_label}   = sub { my $s = shift(@_); join('; ', grep { $_ } map { $s->{"shipto$_"} } qw(name department_1 street city)) || ' ' };
+  $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
   $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') };
 
-  push @{ $form->{AJAX} }, map { 
-    new CGI::Ajax( "get_$_" => "$form->{script}?action=get_$_" ) 
-  } qw(shipto contact delivery);
-
-  $form->{title} = $form->{title_save} 
+  $form->{title} = $form->{title_save}
                 || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
 
-## LINET: Create a drop-down box with all prior titles and greetings.
   CT->query_titles_and_greetings(\%myconfig, \%$form);
   map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT);
-## /LINET
 
   $form->{NOTES} ||= [ ];
 
@@ -305,23 +319,31 @@ 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();
 
-  $auth->assert('customer_vendor_edit');
+  $main::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 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}) {
@@ -329,7 +351,7 @@ sub add_transaction {
 #  	$form->save_history($form->dbconnect(\%myconfig));
 #  }
 #  # /saving the history
-  
+
   $form->isblank("name", $locale->text("Name missing!"));
   if ($form->{"db"} eq "customer") {
     CT->save_customer(\%myconfig, \%$form);
@@ -338,19 +360,22 @@ sub add_transaction {
   }
 
   $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
@@ -361,13 +386,16 @@ sub save_and_ap_transaction {
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_ar_transaction {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit & general_ledger');
+  $main::auth->assert('customer_vendor_edit & general_ledger');
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   $form->{script} = "ar.pl";
   # saving the history
@@ -378,16 +406,19 @@ sub save_and_ar_transaction {
   }
   # /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";
@@ -400,13 +431,16 @@ sub save_and_invoice {
   }
   # /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";
@@ -418,13 +452,16 @@ sub save_and_rfq {
   }
   # /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";
@@ -436,13 +473,20 @@ sub save_and_quotation {
   }
   # /saving the history
   &add_transaction;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub save_and_order {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit & sales_order_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  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}   =
@@ -455,21 +499,23 @@ sub save_and_order {
   }
   # /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');
 
-  # $locale->text('Customer saved!')
-  # $locale->text('Vendor saved!')
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $msg = ucfirst $form->{db};
-  $imsg .= " saved!";
+  my $msg = ucfirst $form->{db};
+  $msg .= " saved!";
 
   $form->isblank("name", $locale->text("Name missing!"));
+  my $rc;
   if ($form->{"db"} eq "customer") {
     $rc = CT->save_customer(\%myconfig, \%$form);
   } else {
@@ -487,19 +533,20 @@ sub save_and_close {
   # /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');
 
-  # $locale->text('Customer saved!')
-  # $locale->text('Vendor saved!')
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
 
-  $msg = ucfirst $form->{db};
-  $imsg .= " saved!";
+  my $msg = ucfirst $form->{db};
+  $msg .= " saved!";
 
   $form->isblank("name", $locale->text("Name missing!"));
 
@@ -526,22 +573,21 @@ sub save {
   # /saving the history
   &edit;
   exit;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub delete {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('customer_vendor_edit');
+  $main::auth->assert('customer_vendor_edit');
 
-  # $locale->text('Customer deleted!')
-  # $locale->text('Cannot delete customer!')
-  # $locale->text('Vendor deleted!')
-  # $locale->text('Cannot delete vendor!')
+  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}) {
@@ -549,77 +595,123 @@ sub delete {
   	$form->{addition} = "DELETED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
-  # /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();
+
+  $main::auth->assert('customer_vendor_edit');
 
-  $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();
 
-  $auth->assert('customer_vendor_edit');
+  $main::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);
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  my $q = new CGI;
-  $result = "$form->{cp_name}";
-  map { $result .= "__pjx__" . $form->{$_} } qw(cp_greeting cp_title cp_givenname cp_phone1 cp_phone2 cp_email cp_abteilung cp_fax cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday);
-  print $q->header();
-  print $result;
-  $lxdebug->leave_sub();
+  CT->get_contact(\%myconfig, \%$form);
+  print $form->ajax_response_header(), join '__pjx__', map $form->{"cp_$_"},
+    qw(name title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used gender);
+  $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);
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  my $q = new CGI;
-  $result = "$form->{shiptoname}";
-  map { $result .= "__pjx__" . $form->{$_} } qw(shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
-  print $q->header();
-  print $result;
-  $lxdebug->leave_sub();
+  CT->get_shipto(\%myconfig, \%$form);
+  print $form->ajax_response_header(),  join '__pjx__', map $form->{"shipto$_"},
+    qw(name department_1 department_2 street zipcode city country contact phone fax email used);
+  $main::lxdebug->leave_sub();
 
 }
 
 sub get_delivery {
-  $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;
 
   CT->get_delivery(\%myconfig, \%$form );
+  $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
+
+  print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');
+
+  $main::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_shipto($form->{cp_id});
+    @$form{ grep /^cp_/, keys %$form } = undef;
+  }
+
+  edit();
 
-  print CGI->new->header();
-  print $form->parse_html_template('ct/get_delivery');
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
-sub continue { call_sub($form->{nextsub}); }
+sub continue { call_sub($main::form->{nextsub}); }