Beim Umwandeln von Aufträgen in Rechnungen nicht sofort den Auftrag schließen. Beim...

[kivitendo-erp.git] / bin / mozilla / ct.pl

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 6968de1..086565d 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -64,11 +64,8 @@ sub add {
 
   $auth->assert('customer_vendor_edit');
 
-  $form->{title} = "Add";
-
-  $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);
 
@@ -111,6 +108,8 @@ sub list_names {
 
   $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');
@@ -162,9 +161,12 @@ sub list_names {
   my @hidden_variables  = (qw(db status obsolete), 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});
+  $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,7 +197,7 @@ sub list_names {
 
   $report->set_export_options('list_names', @hidden_variables);
 
-  $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',
@@ -565,7 +567,7 @@ sub get_contact {
 
   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);
+    qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used);
   $lxdebug->leave_sub();
 
 }
@@ -577,7 +579,7 @@ sub get_shipto {
 
   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);
+    qw(name department_1 department_2 street zipcode city country contact phone fax email used);
   $lxdebug->leave_sub();
 
 }
@@ -594,4 +596,38 @@ sub get_delivery {
   $lxdebug->leave_sub();
 }
 
+sub delete_shipto {
+  $main::lxdebug->enter_sub();
+
+  $auth->assert('customer_vendor_edit');
+
+  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();
+
+  $auth->assert('customer_vendor_edit');
+
+  CT->get_contact(\%myconfig, \%$form);
+
+  unless ($form->{cp_used}) {
+    CT->delete_shipto($form->{cp_id});
+    @$form{ grep /^cp_/, keys %$form } = undef;
+  }
+
+  edit();
+
+  $main::lxdebug->leave_sub();
+}
+
 sub continue { call_sub($form->{nextsub}); }