From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 14 Jun 2007 15:33:44 +0000 (+0000)
Subject: 1. $form->{title} wird nicht mehr zwangsweise umgeschrieben und nach $form->header... 
X-Git-Tag: release-2.4.3^2~121
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f0ce00ebc34b16381f25c9ce75d36521bd046e1f;p=kivitendo-erp.git

1. $form->{title} wird nicht mehr zwangsweise umgeschrieben und nach $form->header() wiederhergestellt.
2. Kosmetik: lokale Variable $form anstelle von $self->{form}.
---

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index dbdbf72c9..4a48dfd84 100644
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -161,9 +161,10 @@ sub set_export_options {
 sub generate_with_headers {
   my $self   = shift;
   my $format = lc $self->{options}->{output_format};
+  my $form   = $self->{form};
 
   if (!$self->{columns}) {
-    $self->{form}->error('Incorrect usage -- no columns specified');
+    $form->error('Incorrect usage -- no columns specified');
   }
 
   my $filename =  $self->{options}->{attachment_basename} || 'report';
@@ -171,8 +172,11 @@ sub generate_with_headers {
   $filename    =~ s|.*/||;
 
   if ($format eq 'html') {
-    $self->{form}->{title} = $self->{title};
-    $self->{form}->header();
+    my $title      = $form->{title};
+    $form->{title} = $self->{title} if ($self->{title});
+    $form->header();
+    $form->{title} = $title;
+
     print $self->generate_html_content();
 
   } elsif ($format eq 'csv') {
@@ -184,7 +188,7 @@ sub generate_with_headers {
     $self->generate_pdf_content();
 
   } else {
-    $self->{form}->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)');
+    $form->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)');
   }
 }