X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/6a12a968761127af91e9da8db7579be2836bcaaa..3649d1c496c1ab6a9959b51bc9a7ba406d1507c9:/SL/Controller/Project.pm?ds=inline

diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm
index 2c2498b04..6cffe360e 100644
--- a/SL/Controller/Project.pm
+++ b/SL/Controller/Project.pm
@@ -57,11 +57,9 @@ sub action_list {
 
   $self->make_filter_summary;
 
-  my $projects = $self->models->get;
-
   $self->prepare_report;
 
-  $self->report_generator_list_objects(report => $self->{report}, objects => $projects);
+  $self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);
 }
 
 sub action_new {
@@ -218,15 +216,10 @@ sub prepare_report {
 
   map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs;
 
-  if ( $report->{options}{output_format} =~ /^(pdf|csv)$/i ) {
-    $self->models->disable_plugin('paginated');
-  }
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'Project',
     output_format         => 'HTML',
-    raw_top_info_text     => $self->render('project/report_top', { output => 0 }),
-    raw_bottom_info_text  => $self->render('project/report_bottom', { output => 0 }),
     title                 => $::locale->text('Projects'),
     allow_pdf_export      => 1,
     allow_csv_export      => 1,
@@ -235,8 +228,10 @@ sub prepare_report {
   $report->set_column_order(@columns);
   $report->set_export_options(qw(list filter));
   $report->set_options_from_form;
+  $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
   $report->set_options(
+    raw_top_info_text     => $self->render('project/report_top',    { output => 0 }),
     raw_bottom_info_text  => $self->render('project/report_bottom', { output => 0 }),
   );
 }
@@ -251,12 +246,13 @@ sub init_models {
         by    => 'projectnumber',
         dir   => 1,
       },
-      customer      => t8('Customer'),
-      description   => t8('Description'),
-      projectnumber => t8('Project Number'),
-      project_type  => t8('Project Type'),
+      customer       => t8('Customer'),
+      description    => t8('Description'),
+      projectnumber  => t8('Project Number'),
+      project_type   => t8('Project Type'),
+      project_status => t8('Project Status'),
     },
-    with_objects => [ 'customer' ],
+    with_objects => [ 'customer', 'project_status', 'project_type' ],
   );
 }