menuv4 strict

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

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index f169be0..35f1064 100644 (file)
--- 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 };
@@ -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,
   );
 
@@ -581,7 +576,7 @@ sub get_contact {
 
   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);
+    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');