Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e8f87db4

Von Jan Büren vor fast 7 Jahren hinzugefügt

  • ID e8f87db491c55fc5b9978f2722c92eca1f236b83
  • Vorgänger 0ad87689
  • Nachfolger 5ca9d91a

DATEV: Kosmetik. Einrückungen sauber gesetzt

Unterschiede anzeigen:

SL/DATEV.pm
373 373

  
374 374
  if ($self->exporttype == DATEV_ET_BUCHUNGEN) {
375 375

  
376
  $self->generate_datev_data(from_to => $self->fromto);
377
  return if $self->errors;
378
  my $datev_ref;
379
  ($datev_ref, $self->{warnings}) = SL::DATEV::CSV->new(datev_lines  => $self->generate_datev_lines,
380
                                                        from         => $self->from,
381
                                                        to           => $self->to,
382
                                                        locked       => $self->locked,
383
                                                       );
384

  
385
  my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv";
386

  
387
  my $csv = Text::CSV_XS->new({
388
              binary       => 1,
389
              sep_char     => ";",
390
              always_quote => 1,
391
              eol          => "\r\n",
392
            }) or die "Cannot use CSV: ".Text::CSV_XS->error_diag();
393

  
394
  my $csv_file = IO::File->new($self->export_path . '/' . $filename, '>:encoding(cp1252)') or die "Can't open: $!";
395
  $csv->print($csv_file, $_) for @{ $datev_ref };
396
  $csv_file->close;
397

  
398
  return { download_token => $self->download_token, filenames => $filename };
376
    $self->generate_datev_data(from_to => $self->fromto);
377
    return if $self->errors;
378
    my $datev_ref;
379
    ($datev_ref, $self->{warnings}) = SL::DATEV::CSV->new(datev_lines  => $self->generate_datev_lines,
380
                                                          from         => $self->from,
381
                                                          to           => $self->to,
382
                                                          locked       => $self->locked,
383
                                                         );
384

  
385
    my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv";
386

  
387
    my $csv = Text::CSV_XS->new({
388
                binary       => 1,
389
                sep_char     => ";",
390
                always_quote => 1,
391
                eol          => "\r\n",
392
              }) or die "Cannot use CSV: ".Text::CSV_XS->error_diag();
393

  
394
    my $csv_file = IO::File->new($self->export_path . '/' . $filename, '>:encoding(cp1252)') or die "Can't open: $!";
395
    $csv->print($csv_file, $_) for @{ $datev_ref };
396
    $csv_file->close;
397

  
398
    return { download_token => $self->download_token, filenames => $filename };
399 399

  
400 400
  } elsif ($self->exporttype == DATEV_ET_STAMM) {
401 401
    die 'will never be implemented';
......
408 408
    die 'unrecognized exporttype';
409 409
  }
410 410

  
411
return $result;
411
  return $result;
412 412
}
413 413

  
414 414
sub obe_export {

Auch abrufbar als: Unified diff