X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=5d2dbb198fb8a63d95be85dd625b0640d13b504a;hb=808bfd679e48691da8f0b9bbb8c778ab7805cbda;hp=b0e9936e78f554cd375ec9d430f72889bb9e4910;hpb=69b298a0f814b3e21d85d3958d198f15001ed6f1;p=kivitendo-erp.git diff --git a/SL/DATEV.pm b/SL/DATEV.pm index b0e9936e7..5d2dbb198 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -372,7 +372,34 @@ sub csv_export { die 'no exporttype set!' unless $self->has_exporttype; if ($self->exporttype == DATEV_ET_BUCHUNGEN) { - _csv_buchungsexport_to_file($self, data => $self->csv_buchungsexport); + + $self->generate_datev_data(from_to => $self->fromto); + return if $self->errors; + + my $datev_csv = SL::DATEV::CSV->new( + datev_lines => $self->generate_datev_lines, + from => $self->from, + to => $self->to, + locked => $self->locked, + ); + + + my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv"; + + my $csv = Text::CSV_XS->new({ + binary => 1, + sep_char => ";", + always_quote => 1, + eol => "\r\n", + }) or die "Cannot use CSV: ".Text::CSV_XS->error_diag(); + + my $csv_file = IO::File->new($self->export_path . '/' . $filename, '>:encoding(cp1252)') or die "Can't open: $!"; + $csv->print($csv_file, $_) for @{ $datev_csv->header }; + $csv->print($csv_file, $_) for @{ $datev_csv->lines }; + $csv_file->close; + $self->{warnings} = $datev_csv->warnings; + + return { download_token => $self->download_token, filenames => $filename }; } elsif ($self->exporttype == DATEV_ET_STAMM) { die 'will never be implemented'; @@ -385,7 +412,7 @@ sub csv_export { die 'unrecognized exporttype'; } -return $result; + return $result; } sub obe_export { @@ -404,6 +431,15 @@ sub _sign { $_[0] <=> 0; } +sub locked { + my $self = shift; + + if (@_) { + $self->{locked} = $_[0]; + } + return $self->{locked}; +} + sub generate_datev_data { $main::lxdebug->enter_sub(); @@ -994,7 +1030,6 @@ sub generate_datev_lines { $datev_data{belegfeld2} = $transaction->[$haben]->{'duedate'}; } } - $datev_data{soll_haben_kennzeichen} = (0 < $umsatz) ? 'H' : 'S'; $datev_data{umsatz} = abs($umsatz); # sales invoices without tax have a different sign??? # Dies ist die einzige Stelle die datevautomatik auswertet. Was soll gesagt werden? @@ -1370,100 +1405,11 @@ sub csv_export_for_tax_accountant { return { download_token => $self->download_token, filenames => \@filenames }; } -sub csv_buchungsexport { - my $self = shift; - my %params = @_; - - $self->generate_datev_data(from_to => $self->fromto); - return if $self->errors; - - my @datev_lines = @{ $self->generate_datev_lines }; - - my @csv_columns = SL::DATEV::CSV->kivitendo_to_datev(); - my @csv_headers = SL::DATEV::CSV->generate_csv_header( - from => $self->from->ymd(''), - to => $self->to->ymd(''), - first_day_of_fiscal_year => $self->to->year . '0101', - locked => 0 - ); - - my @array_of_datev; - - # 2 Headers - push @array_of_datev, \@csv_headers; - push @array_of_datev, [ map { $_->{csv_header_name} } @csv_columns ]; - - my @warnings; - foreach my $row ( @datev_lines ) { - my @current_datev_row; - - # shorten strings - if ($row->{belegfeld1}) { - $row->{buchungsbes} = $row->{belegfeld1} if $row->{belegfeld1}; - $row->{belegfeld1} = substr($row->{belegfeld1}, 0, 12); - $row->{buchungsbes} = substr($row->{buchungsbes}, 0, 60); - } - - $row->{datum} = datetofour($row->{datum}, 0); - $row->{kost1} = substr($row->{kost1}, 0, 8) if $row->{kost1}; - $row->{kost2} = substr($row->{kost2}, 0, 8) if $row->{kost2}; - - # , as decimal point and trim for UstID - $row->{umsatz} =~ s/\./,/; - $row->{ustid} =~ s/\s//g if $row->{ustid}; # trim whitespace - - foreach my $column (@csv_columns) { - if (exists $column->{max_length} && $column->{kivi_datev_name} ne 'not yet implemented') { - # check max length - die "Incorrect length of field" if length($row->{ $column->{kivi_datev_name} }) > $column->{max_length}; - } - if (exists $column->{valid_check} && $column->{kivi_datev_name} ne 'not yet implemented') { - # more checks, listed as user warnings - push @warnings, t8("Wrong field value '#1' for field '#2' for the transaction" . - " with amount '#3'",$row->{ $column->{kivi_datev_name} }, - $column->{kivi_datev_name},$row->{umsatz}) - unless ($column->{valid_check}->($row->{ $column->{kivi_datev_name} })); - } - push @current_datev_row, $row->{ $column->{kivi_datev_name} }; - } - push @array_of_datev, \@current_datev_row; - } - $self->warnings(@warnings) if @warnings; - return \@array_of_datev; -} - -sub _csv_buchungsexport_to_file { - my $self = shift; - my %params = @_; - - # we can definitely deny shorter data structures - croak ("Need at least 2 rows for header info") unless scalar @{ $params{data} } > 1; - - my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv"; - my @data = \$params{data}; - - my $csv = Text::CSV_XS->new({ - binary => 1, - sep_char => ";", - always_quote => 1, - eol => "\r\n", - }) or die "Cannot use CSV: ".Text::CSV_XS->error_diag(); - - if ($csv->version >= 1.18) { - # get rid of stupid datev warnings in "Validity program" - $csv->quote_empty(1); - } - - my $csv_file = IO::File->new($self->export_path . '/' . $filename, '>:encoding(cp1252)') or die "Can't open: $!"; - $csv->print($csv_file, $_) for @{ $params{data} }; - $csv_file->close; - - return { download_token => $self->download_token, filenames => $params{filename} }; -} - sub check_vcnumbers_are_valid_pk_numbers { my ($self) = @_; + # better use a class variable and set this in sub new (also needed in DATEV::CSV) + # calculation is also a bit more sane in sub check_valid_length_of_accounts my $length_of_accounts = length(SL::DB::Manager::Chart->get_first(where => [charttype => 'A'])->accno) // 4; my $pk_length = $length_of_accounts + 1; my $query = <<"SQL"; @@ -1476,6 +1422,23 @@ SQL return defined $has_non_pk_accounts ? 0 : 1; } + +sub check_valid_length_of_accounts { + my ($self) = @_; + + my $query = <<"SQL"; + SELECT DISTINCT char_length (accno) FROM chart WHERE charttype='A' AND id in (select chart_id from acc_trans); +SQL + + my $accno_length = selectall_hashref_query($::form, SL::DB->client->dbh, $query); + if (1 < scalar @$accno_length) { + $::form->error(t8("Invalid combination of ledger account number length." . + " Mismatch length of #1 with length of #2. Please check your account settings. ", + $accno_length->[0]->{char_length}, $accno_length->[1]->{char_length})); + } + return 1; +} + sub DESTROY { clean_temporary_directories(); } @@ -1674,33 +1637,6 @@ Example: # }; -=item csv_buchungsexport - -Generates the CSV-Format data for the CSV DATEV export and returns -an 2-dimensional array as an array_ref. - -Requires $self->fromto for a valid DATEV header. - -Furthermore we assume that the first day of the fiscal year is -the first of January and we cannot guarantee that our data in kivitendo -is locked, that means a booking cannot be modified after a defined (vat tax) -period. -Some validity checks (max_length and regex) will be done if the -data structure contains them and the field is defined. - -To add or alter the structure of the data take a look at SL::DATEV::CSV.pm - -=item _csv_buchungsexport_to_file - -Generates one downloadable csv file wrapped in a zip archive. -Basically this method is just a thin wrapper for TEXT::CSV_XS.pm - -Generates a CSV-file with the same encodings as defined in DATEV Format CSV 2015: - $ file - $ EXTF_Buchungsstapel.csv: ISO-8859 text, with very long lines, with CRLF line terminators - -Usage: _csv_buchungsexport_to_file($self, data => $self->csv_buchungsexport); - =item check_vcnumbers_are_valid_pk_numbers Returns 1 if all vcnumbers are suitable for the DATEV export, 0 if not. @@ -1715,6 +1651,13 @@ All vcnumbers are checked, obsolete customers or vendors aren't exempt. There is also no check for the typical customer range 10000-69999 and the typical vendor range 70000-99999. +=item check_valid_length_of_accounts + +Returns 1 if all currently booked accounts have only one common number length domain (e.g. 4 or 6). +Will throw an error if more than one distinct size is detected. +The error message gives a short hint with the value of the (at least) +two mismatching number length domains. + =back =head1 ATTRIBUTES @@ -1763,6 +1706,11 @@ correctly. Set boundary account numbers for the export. Only useful for a stammdaten export. +=item locked + +Boolean if the transactions are locked (read-only in kivitenod) or not. +Default value is false + =back =head1 CONSTANTS