X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a3a6ec066c6860a3aab44449d0620660665ed6e0..254ef1b288fe55a17d10468ba776b43661594269:/SL/DATEV.pm diff --git a/SL/DATEV.pm b/SL/DATEV.pm index 426788ab0..1b2f42672 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -372,7 +372,30 @@ 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_ref, $self->warnings = 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_ref }; + $csv_file->close; + + return { download_token => $self->download_token, filenames => $filename }; } elsif ($self->exporttype == DATEV_ET_STAMM) { die 'will never be implemented'; @@ -404,6 +427,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(); @@ -1370,96 +1402,38 @@ 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 +sub check_vcnumbers_are_valid_pk_numbers { + my ($self) = @_; - 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; + 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"; + SELECT customernumber AS vcnumber FROM customer WHERE customernumber !~ '^[[:digit:]]{$pk_length}\$' + UNION + SELECT vendornumber AS vcnumber FROM vendor WHERE vendornumber !~ '^[[:digit:]]{$pk_length}\$' + LIMIT 1; +SQL + my ($has_non_pk_accounts) = selectrow_query($::form, SL::DB->client->dbh, $query); + return defined $has_non_pk_accounts ? 0 : 1; } -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; +sub check_valid_length_of_accounts { + my ($self) = @_; - my $filename = "EXTF_DATEV_kivitendo" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv"; - my @data = \$params{data}; + my $query = <<"SQL"; + SELECT DISTINCT char_length (accno) FROM chart WHERE charttype='A' AND id in (select chart_id from acc_trans); +SQL - 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 $accno_length = selectall_hashref_query($::form, SL::DB->client->dbh, $query); + if (1 < keys $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})); } - - 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} }; + return 1; } + sub DESTROY { clean_temporary_directories(); } @@ -1685,7 +1659,26 @@ Generates a CSV-file with the same encodings as defined in DATEV Format CSV 2015 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. + +Finds the default length of charts (e.g. 4), adds 1 for the pk chart length +(e.g. 5), and checks the database for any customers or vendors whose customer- +or vendornumber doesn't consist of only numbers with exactly that length. E.g. +for a chart length of four "10001" would be ok, but not "10001b" or "1000". + +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 @@ -1734,6 +1727,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