Date-Input-Felder durch 'L.date_tag's ersetzt

[mfinanz.git] / bin / mozilla / wh.pl

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index b3550b253a9d13102d9438b401bb87443a842e1a..aa372463a67fc67745bde004c02542b306b1ca61 100644 (file)
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -896,7 +896,7 @@ sub generate_report {
 
     my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
 
-    if (($form->{subtotal} eq 'Y')
+    if ( ($form->{subtotal} eq 'Y' && !$form->{report_generator_csv_options_for_import} )
         && (($idx == (scalar @contents - 1))
             || ($entry->{$sort_col} ne $contents[$idx + 1]->{$sort_col}))) {
 
@@ -916,7 +916,7 @@ sub generate_report {
     $idx++;
   }
 
-  if ($column_defs{stock_value}->{visible}) {
+  if ( $column_defs{stock_value}->{visible} && !$form->{report_generator_csv_options_for_import} ) {
     $report->add_separator();
 
     my $row                      = { map { $_ => { 'data' => '', 'class' => 'listsubtotal', } } @columns };