X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FHelper%2FReportGenerator.pm;h=0cf376df4ed9d0ca56690e851ae8e2cfee83fafa;hb=f7c4665fd435b94e599ea1ac2ba23d8e21a8420f;hp=3cf2622a714341335c3d86e4253779578f390e72;hpb=3d1ae2d96b65e88a5b12dde2b2524dc10f7932fa;p=kivitendo-erp.git

diff --git a/SL/Controller/Helper/ReportGenerator.pm b/SL/Controller/Helper/ReportGenerator.pm
index 3cf2622a7..0cf376df4 100644
--- a/SL/Controller/Helper/ReportGenerator.pm
+++ b/SL/Controller/Helper/ReportGenerator.pm
@@ -89,6 +89,7 @@ sub report_generator_list_objects {
   croak "Parameter 'objects' must exist and be an array reference"                if                      ref($params{objects}) ne 'ARRAY';
   croak "Parameter 'report' must exist and be an instance of SL::ReportGenerator" if                      ref($params{report})  ne 'SL::ReportGenerator';
   croak "Parameter 'options', if exists, must be a hash reference"                if $params{options} && (ref($params{options}) ne 'HASH');
+  $params{layout} //= 1;
 
   my $column_defs = $params{report}->{columns};
   my @columns     = $params{report}->get_visible_columns;
@@ -110,7 +111,12 @@ sub report_generator_list_objects {
     $params{report}->add_data(\%data);
   }
 
-  return $params{report}->generate_with_headers(%{ $params{options} || {}});
+  if ($params{layout}) {
+    return $params{report}->generate_with_headers(%{ $params{options} || {}});
+  } else {
+    my $html = $params{report}->generate_html_content(%{ $params{options} || {}});
+    $self->render(\$html , { layout => 0, process => 0 });
+  }
 }
 
 1;