X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=35f10647579d90a420962ed80b4ac0837751870f;hb=429203bfb57dd673aa807d749ab43c8e3332f8c8;hp=02ac29e1c6550759201373517c28e642cbbaa2bb;hpb=19688fcacc86e86dd6ff5c5427e3b50893bb60f0;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 02ac29e1c..35f106475 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -121,24 +121,19 @@ 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('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};
+  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", 'contact',  'phone',
-    'fax',       'email', 'taxnumber', 'street', 'zipcode' , 'city', '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 };
@@ -149,7 +144,7 @@ sub list_names {
 
   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'), },
     'contact'           => { 'text' => $locale->text('Contact'), },
     'phone'             => { 'text' => $locale->text('Phone'), },
@@ -161,9 +156,9 @@ sub list_names {
     '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'), },
+    'street'            => { 'text' => $locale->text('Street'), },
+    'zipcode'           => { 'text' => $locale->text('Zipcode'), },
+    'city'              => { 'text' => $locale->text('City'), },
     %column_defs_cvars,
   );
 
@@ -252,7 +247,7 @@ sub edit {
   # 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);
 
@@ -291,7 +286,7 @@ sub form_header {
   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->{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);
@@ -332,7 +327,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);
@@ -545,7 +540,7 @@ 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}";
@@ -580,8 +575,8 @@ sub get_contact {
   $auth->assert('customer_vendor_edit');
 
   CT->get_contact(\%myconfig, \%$form);
-  print $form->ajax_response_header(), join '__pjx__', map $form->{"cp_$_"}, 
-    qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used);
+  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);
   $lxdebug->leave_sub();
 
 }
@@ -604,6 +599,7 @@ sub get_delivery {
   $auth->assert('customer_vendor_edit');
 
   CT->get_delivery(\%myconfig, \%$form );
+  $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
   print $form->ajax_response_header(), $form->parse_html_template('ct/get_delivery');