X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fprojects.pl;h=c1b8b7d6e5c5dcfa73e09d144b324d4cf5e84c44;hb=5c5c1eef2ef26aa166f612d0718770488809b74b;hp=f854a4af928142bba79f283b425bf47829123a2c;hpb=6c7e41458d2027f72901d16417a37648942f7445;p=kivitendo-erp.git

diff --git a/bin/mozilla/projects.pl b/bin/mozilla/projects.pl
index f854a4af9..c1b8b7d6e 100644
--- a/bin/mozilla/projects.pl
+++ b/bin/mozilla/projects.pl
@@ -92,7 +92,7 @@ sub search {
    $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables'      => $form->{CUSTOM_VARIABLES},
                                                                            'include_prefix' => 'l_',
                                                                            'include_value'  => 'Y');
-  $form->{fokus}    = 'getElementById("projectnumber")';
+  $::request->{layout}->focus('#projectnumber');
 
   $form->header();
   print $form->parse_html_template('projects/search');
@@ -118,11 +118,10 @@ sub project_report {
 
   my $report       = SL::ReportGenerator->new(\%myconfig, $form);
 
-  my @columns      = qw(projectnumber description active);
-  my @hidden_vars  = ('filter');
-  my $href         = build_std_url('action=project_report', @hidden_vars);
+  my @columns      = qw(projectnumber description customer type active valid);
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
+  my @searchable_custom_variables  = grep { $_->{searchable} }  @{ $cvar_configs };
   my %column_defs_cvars            = ();
   foreach (@includeable_custom_variables) {
     $column_defs_cvars{"cvar_$_->{name}"} = {
@@ -133,14 +132,26 @@ sub project_report {
 
   push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
 
+
+  my @hidden_vars  = (
+    'filter',
+    map({ ('cvar_'. $_->{name} , 'l_cvar_'. $_->{name}) } @includeable_custom_variables),
+    map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables)),
+  );
+  my $href         = build_std_url('action=project_report', @hidden_vars);
+
+
   my %column_defs  = (
     'projectnumber'            => { 'text' => $locale->text('Number'), },
     'description'              => { 'text' => $locale->text('Description'), },
+    'customer'                 => { 'text' => $locale->text('Customer'), },
+    'type'                     => { 'text' => $locale->text('Type'), },
     'active'                   => { 'text' => $locale->text('Active'), 'visible' => 'both' eq $filter->{active}, },
+    'valid'                    => { 'text' => $locale->text('Valid'),  'visible' => 'both' eq $filter->{active}, },
     %column_defs_cvars,
     );
 
-  foreach (qw(projectnumber description)) {
+  foreach (qw(projectnumber description customer type)) {
     $column_defs{$_}->{link}    = $href . "&sort=$_";
     $column_defs{$_}->{visible} = 1;
   }
@@ -150,13 +161,22 @@ sub project_report {
 
   $report->set_export_options('project_report', @hidden_vars, 'sort');
 
+  CVar->add_custom_variables_to_report('module'         => 'Project',
+                                       'trans_id_field' => 'id',
+                                       'configs'        => $cvar_configs,
+                                       'column_defs'    => \%column_defs,
+                                       'data'           => $form->{project_list},
+                                       );
+
   $report->set_sort_indicator($form->{sort}, 1);
 
   my @options;
   push @options, $locale->text('All')                                            if ($filter->{all});
   push @options, $locale->text('Orphaned')                                       if ($filter->{orphaned});
   push @options, $locale->text('Project Number') . " : $filter->{projectnumber}" if ($filter->{projectnumber});
-  push @options, $locale->text('Description') . " : $filter->{description}"      if ($filter->{description});
+  push @options, $locale->text('Description')    . " : $filter->{description}"   if ($filter->{description});
+  push @options, $locale->text('Customer')       . " : $filter->{customer}"      if ($filter->{customer});
+  push @options, $locale->text('Type')           . " : $filter->{type}"          if ($filter->{type});
   push @options, $locale->text('Active')                                         if ($filter->{active} eq 'active');
   push @options, $locale->text('Inactive')                                       if ($filter->{active} eq 'inactive');
   push @options, $locale->text('Orphaned')                                       if ($filter->{status} eq 'orphaned');
@@ -169,6 +189,7 @@ sub project_report {
                        'attachment_basename' => $locale->text('project_list') . strftime('_%Y%m%d', localtime time),
     );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   CVar->add_custom_variables_to_report('module'         => 'Projects',
                                        'trans_id_field' => 'id',
@@ -181,6 +202,7 @@ sub project_report {
 
   foreach my $project (@{ $form->{project_list} }) {
     $project->{active} = $project->{active} ? $locale->text('Yes')  : $locale->text('No');
+    $project->{valid}  = $project->{valid} ? $locale->text('Yes')  : $locale->text('No');
 
     my $row = { map { $_ => { 'data' => $project->{$_} } } keys %{ $project } };
 
@@ -206,8 +228,9 @@ sub display_project_form {
 
   $form->{title}     = $form->{project}->{id} ? $locale->text("Edit Project") : $locale->text("Add Project");
 
+  $form->{ALL_CUSTOMERS}    = SL::DB::Manager::Customer->get_all_sorted(where => [ or => [ obsolete => 0, obsolete => undef, id => $form->{project}->{customer_id} ]]);
   $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'Projects', 'trans_id' => $form->{project}->{id});
-  $main::lxdebug->dump(0, "cv", $form->{CUSTOM_VARIABLES});
+#  $main::lxdebug->dump(0, "cv", $form->{CUSTOM_VARIABLES});
   CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
 
   $form->header();