Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 0185267e

Von Thomas Heck vor mehr als 12 Jahren hinzugefügt

  • ID 0185267ee634095b8c6e247357dafe1207f97996
  • Vorgänger 11da4a00
  • Nachfolger ab598b02

Spaltenueberschriften Export auf Import abgleichen

implementiert #1851

Unterschiede anzeigen:

SL/ReportGenerator.pm
72 72
  foreach my $column (values %{ $self->{columns} }) {
73 73
    $column->{visible} = $self->{options}->{std_column_visibility} unless defined $column->{visible};
74 74
  }
75
  
76
  if( $::form->{report_generator_csv_options_for_import} ) {
77
    foreach my $key (keys %{ $self->{columns} }) {
78
      $self->{columns}{$key}{text} = $key;
79
    }
80
  }
75 81

  
76 82
  $self->set_column_order(sort keys %{ $self->{columns} });
77 83
}
bin/mozilla/gl.pl
466 466

  
467 467
    my $row_set = [ $row ];
468 468

  
469
    if (($form->{l_subtotal} eq 'Y')
469
    if ( ($form->{l_subtotal} eq 'Y' && !$form->{report_generator_csv_options_for_import} )
470 470
        && (($idx == (scalar @{ $form->{GL} } - 1))
471 471
            || ($ref->{ $form->{sort} } ne $form->{GL}->[$idx + 1]->{ $form->{sort} }))) {
472 472
      push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, [ qw(debit credit) ], 'listsubtotal');
......
477 477
    $idx++;
478 478
  }
479 479

  
480
  $report->add_separator();
481

  
482 480
  # = 0 for balanced ledger
483 481
  my $balanced_ledger = $totals{debit} + $totals{debit_tax} - $totals{credit} - $totals{credit_tax};
484 482

  
......
496 494
  $data .= $sh;
497 495

  
498 496
  $row->{balance}->{data}        = $data;
499

  
500
  $report->add_data($row);
497
    
498
  if ( !$form->{report_generator_csv_options_for_import} ) {
499
    $report->add_separator();
500
    $report->add_data($row);
501
  }
501 502

  
502 503
  my $raw_bottom_info_text;
503 504

  
bin/mozilla/ic.pl
1401 1401
    $idx++;
1402 1402
  }
1403 1403

  
1404
  if ($form->{"l_linetotal"}) {
1404
  if ($form->{"l_linetotal"} && !$form->{report_generator_csv_options_for_import}) {
1405 1405
    my $row = { map { $_ => { 'class' => 'listtotal', } } @columns };
1406 1406

  
1407 1407
    map { $row->{"linetotal$_"}->{data} = $form->format_amount(\%myconfig, $totals{$_}, 2) } @subtotal_columns;
bin/mozilla/wh.pl
896 896

  
897 897
    my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
898 898

  
899
    if (($form->{subtotal} eq 'Y')
899
    if ( ($form->{subtotal} eq 'Y' && !$form->{report_generator_csv_options_for_import} )
900 900
        && (($idx == (scalar @contents - 1))
901 901
            || ($entry->{$sort_col} ne $contents[$idx + 1]->{$sort_col}))) {
902 902

  
......
916 916
    $idx++;
917 917
  }
918 918

  
919
  if ($column_defs{stock_value}->{visible}) {
919
  if ( $column_defs{stock_value}->{visible} && !$form->{report_generator_csv_options_for_import} ) {
920 920
    $report->add_separator();
921 921

  
922 922
    my $row                      = { map { $_ => { 'data' => '', 'class' => 'listsubtotal', } } @columns };
locale/de/all
1115 1115
  'Main sorting'                => 'Hauptsortierung',
1116 1116
  'Make'                        => 'Lieferant',
1117 1117
  'Make (with X being a number)' => 'Lieferant (X ist eine fortlaufende Zahl)',
1118
  'Make compatible for import'  => 'Für den Import kompatibel machen',
1118 1119
  'Make default profile'        => 'Zu Standardprofil machen',
1119 1120
  'Manage Custom Variables'     => 'Benutzerdefinierte Variablen',
1120 1121
  'Mandantennummer'             => 'Mandantennummer',
templates/webpages/report_generator/csv_export_options.html
61 61
    <td valign="top">
62 62
     <input type="checkbox" name="report_generator_csv_options_headers" id="report_generator_csv_options_headers" value="1" checked>
63 63
     <label for="report_generator_csv_options_headers">[% 'Include column headings' | $T8 %]</label>
64
     <input type="checkbox" name="report_generator_csv_options_for_import" id="report_generator_csv_options_for_import" value="1">
65
     <label for="report_generator_csv_options_for_import">[% 'Make compatible for import' | $T8 %]</label>
64 66
    </td>
65 67
   </tr>
66 68

  

Auch abrufbar als: Unified diff