Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

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

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index c843df4..31c70d0 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -115,8 +115,14 @@ sub search_contact {
   $::lxdebug->enter_sub;
   $::auth->assert('customer_vendor_edit');
 
-  $::form->{fokus}    = 'Form.name';
+  $::form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'Contacts');
+  ($::form->{CUSTOM_VARIABLES_FILTER_CODE},
+   $::form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables'    => $::form->{CUSTOM_VARIABLES},
+                                                                           'include_prefix' => 'l.',
+                                                                           'filter_prefix'  => 'filter.',
+                                                                           'include_value'  => 'Y');
 
+  $::form->{title} = $::locale->text('Search contacts');
   $::form->header;
   print $::form->parse_html_template('ct/search_contact');
 
@@ -292,11 +298,19 @@ sub list_contacts {
     filter      => $::form->{filter},
   );
 
+  my $cvar_configs = CVar->get_configs('module' => 'Contacts');
+
   my @columns      = qw(
-    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_phone1 cp_phone2
+    cp_id vcname vcnumber cp_name cp_givenname cp_street cp_zipcode cp_city cp_phone1 cp_phone2
     cp_mobile1 cp_mobile2 cp_email cp_abteilung cp_birthday cp_gender
   );
 
+  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 @visible_columns;
   if ($::form->{l}) {
     @visible_columns = grep { $::form->{l}{$_} } @columns;
@@ -313,14 +327,17 @@ sub list_contacts {
     'cp_name'      => { 'text' => $::locale->text('Name'), },
     'cp_givenname' => { 'text' => $::locale->text('Given Name'), },
     'cp_street'    => { 'text' => $::locale->text('Street'), },
+    'cp_zipcode'   => { 'text' => $::locale->text('Zipcode'), },
+    'cp_city'      => { 'text' => $::locale->text('City'), },
     'cp_phone1'    => { 'text' => $::locale->text('Phone1'), },
     'cp_phone2'    => { 'text' => $::locale->text('Phone2'), },
-    'cp_mobile1'   => { 'text' => $::locale->text('Mobile 1'), },
-    'cp_mobile2'   => { 'text' => $::locale->text('Mobile 2'), },
+    'cp_mobile1'   => { 'text' => $::locale->text('Mobile1'), },
+    'cp_mobile2'   => { 'text' => $::locale->text('Mobile2'), },
     'cp_email'     => { 'text' => $::locale->text('E-mail'), },
     'cp_abteilung' => { 'text' => $::locale->text('Department'), },
     'cp_birthday'  => { 'text' => $::locale->text('Birthday'), },
     'cp_gender'    => { 'text' => $::locale->text('Gender'), },
+    %column_defs_cvars,
   );
 
   map { $column_defs{$_}->{visible} = 1 } @visible_columns;
@@ -365,6 +382,13 @@ sub list_contacts {
 
   $report->set_sort_indicator($::form->{sort}, $::form->{sortdir});
 
+  CVar->add_custom_variables_to_report('module'         => 'Contacts',
+                                       'trans_id_field' => 'cp_id',
+                                       'configs'        => $cvar_configs,
+                                       'column_defs'    => \%column_defs,
+                                       'data'           => \@contacts);
+
+
   foreach my $ref (@contacts) {
     my $row = { map { $_ => { 'data' => $ref->{$_} } } @columns };