X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=af188f70a4e911f433464217e59deaac3c146fef;hb=a2179ea178c2e8cdcef9fd0cab517048778383de;hp=50fb1c7a602f456792bb25fa60b6256a6107f47f;hpb=49db7a8e5f459fca087c47d426abec58485fddef;p=kivitendo-erp.git diff --git a/SL/DATEV.pm b/SL/DATEV.pm index 50fb1c7a6..af188f70a 100644 --- a/SL/DATEV.pm +++ b/SL/DATEV.pm @@ -1,5 +1,5 @@ #===================================================================== -# Lx-Office ERP +# kivitendo ERP # Copyright (c) 2004 # # Author: Philip Reetz @@ -18,7 +18,8 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1335, USA. #====================================================================== # # Datev export module @@ -31,13 +32,22 @@ use strict; use SL::DBUtils; use SL::DATEV::KNEFile; -use SL::Taxkeys; +use SL::DATEV::CSV; +use SL::DB; +use SL::HTML::Util (); +use SL::Iconv; +use SL::Locale::String qw(t8); +use SL::VATIDNr; use Data::Dumper; use DateTime; use Exporter qw(import); use File::Path; -use List::Util qw(max sum); +use IO::File; +use List::MoreUtils qw(any); +use List::Util qw(min max sum); +use List::UtilsBy qw(partition_by sort_by); +use Text::CSV_XS; use Time::HiRes qw(gettimeofday); { @@ -45,13 +55,15 @@ use Time::HiRes qw(gettimeofday); use constant { DATEV_ET_BUCHUNGEN => $i++, DATEV_ET_STAMM => $i++, + DATEV_ET_CSV => $i++, DATEV_FORMAT_KNE => $i++, DATEV_FORMAT_OBE => $i++, + DATEV_FORMAT_CSV => $i++, }; } -my @export_constants = qw(DATEV_ET_BUCHUNGEN DATEV_ET_STAMM DATEV_FORMAT_KNE DATEV_FORMAT_OBE); +my @export_constants = qw(DATEV_ET_BUCHUNGEN DATEV_ET_STAMM DATEV_ET_CSV DATEV_FORMAT_KNE DATEV_FORMAT_OBE DATEV_FORMAT_CSV); our @EXPORT_OK = (@export_constants); our %EXPORT_TAGS = (CONSTANTS => [ @export_constants ]); @@ -193,6 +205,38 @@ sub to { return $self->{to}; } +sub trans_id { + my $self = shift; + + if (@_) { + $self->{trans_id} = $_[0]; + } + + die "illegal trans_id passed for DATEV export: " . $self->{trans_id} . "\n" unless $self->{trans_id} =~ m/^\d+$/; + + return $self->{trans_id}; +} + +sub warnings { + my $self = shift; + + if (@_) { + $self->{warnings} = [@_]; + } else { + return $self->{warnings}; + } +} + +sub use_pk { + my $self = shift; + + if (@_) { + $self->{use_pk} = $_[0]; + } + + return $self->{use_pk}; +} + sub accnofrom { my $self = shift; @@ -222,7 +266,7 @@ sub dbh { $self->{provided_dbh} = 1; } - $self->{dbh} ||= $::form->get_standard_dbh; + $self->{dbh} ||= SL::DB->client->dbh; } sub provided_dbh { @@ -247,7 +291,7 @@ sub clean_temporary_directories { sub _fill { $main::lxdebug->enter_sub(); - my $text = shift; + my $text = shift // ''; my $field_len = shift; my $fill_char = shift; my $alignment = shift || 'right'; @@ -274,14 +318,15 @@ sub get_datev_stamm { sub save_datev_stamm { my ($self, $data) = @_; - do_query($::form, $self->dbh, 'DELETE FROM datev'); - - my @columns = qw(beraternr beratername dfvkz mandantennr datentraegernr abrechnungsnr); + SL::DB->client->with_transaction(sub { + do_query($::form, $self->dbh, 'DELETE FROM datev'); - my $query = "INSERT INTO datev (" . join(', ', @columns) . ") VALUES (" . join(', ', ('?') x @columns) . ")"; - do_query($::form, $self->dbh, $query, map { $data->{$_} } @columns); + my @columns = qw(beraternr beratername dfvkz mandantennr datentraegernr abrechnungsnr); - $self->dbh->commit unless $self->provided_dbh; + my $query = "INSERT INTO datev (" . join(', ', @columns) . ") VALUES (" . join(', ', ('?') x @columns) . ")"; + do_query($::form, $self->dbh, $query, map { $data->{$_} } @columns); + 1; + }) or do { die SL::DB->client->error }; } sub export { @@ -290,7 +335,9 @@ sub export { die 'no format set!' unless $self->has_format; - if ($self->format == DATEV_FORMAT_KNE) { + if ($self->format == DATEV_FORMAT_CSV) { + $result = $self->csv_export; + } elsif ($self->format == DATEV_FORMAT_KNE) { $result = $self->kne_export; } elsif ($self->format == DATEV_FORMAT_OBE) { $result = $self->obe_export; @@ -311,6 +358,78 @@ sub kne_export { $result = $self->kne_buchungsexport; } elsif ($self->exporttype == DATEV_ET_STAMM) { $result = $self->kne_stammdatenexport; + } elsif ($self->exporttype == DATEV_ET_CSV) { + $result = $self->csv_export_for_tax_accountant; + } else { + die 'unrecognized exporttype'; + } + + return $result; +} + +sub csv_export { + my ($self) = @_; + my $result; + + die 'no exporttype set!' unless $self->has_exporttype; + + if ($self->exporttype == DATEV_ET_BUCHUNGEN) { + + $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(); + + # get encoding from defaults - use cp1252 if DATEV strict export is used + my $enc = ($::instance_conf->get_datev_export_format eq 'cp1252') ? 'cp1252' : 'utf-8'; + my $csv_file = IO::File->new($self->export_path . '/' . $filename, ">:encoding($enc)") 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; + + # convert utf-8 to cp1252//translit if set + if ($::instance_conf->get_datev_export_format eq 'cp1252-translit') { + + my $filename_translit = "EXTF_DATEV_kivitendo_translit" . $self->from->ymd() . '-' . $self->to->ymd() . ".csv"; + open my $fh_in, '<:encoding(UTF-8)', $self->export_path . '/' . $filename or die "could not open $filename for reading: $!"; + open my $fh_out, '>', $self->export_path . '/' . $filename_translit or die "could not open $filename_translit for writing: $!"; + + my $converter = SL::Iconv->new("utf-8", "cp1252//translit"); + + print $fh_out $converter->convert($_) while <$fh_in>; + close $fh_in; + close $fh_out; + + unlink $self->export_path . '/' . $filename or warn "Could not unlink $filename: $!"; + $filename = $filename_translit; + } + + return { download_token => $self->download_token, filenames => $filename }; + + } elsif ($self->exporttype == DATEV_ET_STAMM) { + die 'will never be implemented'; + # 'Background: Export should only contain non + # DATEV-Charts and DATEV import will only + # import new Charts.' + } elsif ($self->exporttype == DATEV_ET_CSV) { + $result = $self->csv_export_for_tax_accountant; } else { die 'unrecognized exporttype'; } @@ -334,73 +453,177 @@ sub _sign { $_[0] <=> 0; } -sub _get_transactions { +sub locked { + my $self = shift; + + if (@_) { + $self->{locked} = $_[0]; + } + return $self->{locked}; +} + +sub generate_datev_data { $main::lxdebug->enter_sub(); - my $self = shift; - my $fromto = shift; - my $progress_callback = shift || sub {}; + + my ($self, %params) = @_; + my $fromto = $params{from_to} // ''; + my $progress_callback = $params{progress_callback} || sub {}; my $form = $main::form; - my ($notsplitindex); + my $trans_id_filter = ''; + my $ar_department_id_filter = ''; + my $ap_department_id_filter = ''; + my $gl_department_id_filter = ''; + if ( $form->{department_id} ) { + $ar_department_id_filter = " AND ar.department_id = ? "; + $ap_department_id_filter = " AND ap.department_id = ? "; + $gl_department_id_filter = " AND gl.department_id = ? "; + } + + my ($gl_itime_filter, $ar_itime_filter, $ap_itime_filter); + if ( $form->{gldatefrom} ) { + $gl_itime_filter = " AND gl.itime >= ? "; + $ar_itime_filter = " AND ar.itime >= ? "; + $ap_itime_filter = " AND ap.itime >= ? "; + } else { + $gl_itime_filter = ""; + $ar_itime_filter = ""; + $ap_itime_filter = ""; + } + + if ( $self->{trans_id} ) { + # ignore dates when trans_id is passed so that the entire transaction is + # checked, not just either the initial bookings or the subsequent payments + # (the transdates will likely differ) + $fromto = ''; + $trans_id_filter = 'ac.trans_id = ' . $self->trans_id; + } else { + $fromto =~ s/transdate/ac\.transdate/g; + }; - $fromto =~ s/transdate/ac\.transdate/g; + my ($notsplitindex); - my $taxkeys = Taxkeys->new(); my $filter = ''; # Useful for debugging purposes my %all_taxchart_ids = selectall_as_map($form, $self->dbh, qq|SELECT DISTINCT chart_id, TRUE AS is_set FROM tax|, 'chart_id', 'is_set'); + my $ar_accno = "c.accno"; + my $ap_accno = "c.accno"; + if ( $self->use_pk ) { + $ar_accno = "CASE WHEN ac.chart_link = 'AR' THEN ct.customernumber ELSE c.accno END as accno"; + $ap_accno = "CASE WHEN ac.chart_link = 'AP' THEN ct.vendornumber ELSE c.accno END as accno"; + } + my $query = - qq|SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey, - ar.invnumber, ar.duedate, ar.amount as umsatz, - ct.name, - c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link, - ar.invoice + qq|SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo, + ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate, ar.itime::date, + ct.name, ct.ustid, ct.customernumber AS vcnumber, ct.id AS customer_id, NULL AS vendor_id, + $ar_accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, + ar.invoice, + t.rate AS taxrate, t.taxdescription, + 'ar' as table, + tc.accno AS tax_accno, tc.description AS tax_accname, + ar.department_id, + ar.notes, + project.projectnumber as projectnumber, project.description as projectdescription, + department.description as departmentdescription FROM acc_trans ac LEFT JOIN ar ON (ac.trans_id = ar.id) LEFT JOIN customer ct ON (ar.customer_id = ct.id) LEFT JOIN chart c ON (ac.chart_id = c.id) + LEFT JOIN tax t ON (ac.tax_id = t.id) + LEFT JOIN chart tc ON (t.chart_id = tc.id) + LEFT JOIN department ON (department.id = ar.department_id) + LEFT JOIN project ON (project.id = ar.globalproject_id) WHERE (ar.id IS NOT NULL) AND $fromto + $trans_id_filter + $ar_itime_filter + $ar_department_id_filter $filter UNION ALL - SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey, - ap.invnumber, ap.duedate, ap.amount as umsatz, - ct.name, - c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link, - ap.invoice + SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,ap.id, ac.amount, ac.taxkey, ac.memo, + ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate, ap.itime::date, + ct.name, ct.ustid, ct.vendornumber AS vcnumber, NULL AS customer_id, ct.id AS vendor_id, + $ap_accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, + ap.invoice, + t.rate AS taxrate, t.taxdescription, + 'ap' as table, + tc.accno AS tax_accno, tc.description AS tax_accname, + ap.department_id, + ap.notes, + project.projectnumber as projectnumber, project.description as projectdescription, + department.description as departmentdescription FROM acc_trans ac LEFT JOIN ap ON (ac.trans_id = ap.id) LEFT JOIN vendor ct ON (ap.vendor_id = ct.id) LEFT JOIN chart c ON (ac.chart_id = c.id) + LEFT JOIN tax t ON (ac.tax_id = t.id) + LEFT JOIN chart tc ON (t.chart_id = tc.id) + LEFT JOIN department ON (department.id = ap.department_id) + LEFT JOIN project ON (project.id = ap.globalproject_id) WHERE (ap.id IS NOT NULL) AND $fromto + $trans_id_filter + $ap_itime_filter + $ap_department_id_filter $filter UNION ALL - SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,gl.id, ac.amount, ac.taxkey, - gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, - gl.description AS name, - c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, c.link, - FALSE AS invoice + SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo, + gl.reference AS invnumber, NULL AS duedate, ac.amount as umsatz, gl.deliverydate, gl.itime::date, + gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id, + c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link, + FALSE AS invoice, + t.rate AS taxrate, t.taxdescription, + 'gl' as table, + tc.accno AS tax_accno, tc.description AS tax_accname, + gl.department_id, + gl.notes, + '' as projectnumber, '' as projectdescription, + department.description as departmentdescription FROM acc_trans ac LEFT JOIN gl ON (ac.trans_id = gl.id) LEFT JOIN chart c ON (ac.chart_id = c.id) + LEFT JOIN tax t ON (ac.tax_id = t.id) + LEFT JOIN chart tc ON (t.chart_id = tc.id) + LEFT JOIN department ON (department.id = gl.department_id) WHERE (gl.id IS NOT NULL) AND $fromto + $trans_id_filter + $gl_itime_filter + $gl_department_id_filter $filter ORDER BY trans_id, acc_trans_id|; - my $sth = prepare_execute_query($form, $self->dbh, $query); + my @query_args; + if ( $form->{gldatefrom} or $form->{department_id} ) { + + for ( 1 .. 3 ) { + if ( $form->{gldatefrom} ) { + my $glfromdate = $::locale->parse_date_to_object($form->{gldatefrom}); + die "illegal data" unless ref($glfromdate) eq 'DateTime'; + push(@query_args, $glfromdate); + } + if ( $form->{department_id} ) { + push(@query_args, $form->{department_id}); + } + } + } + + my $sth = prepare_execute_query($form, $self->dbh, $query, @query_args); $self->{DATEV} = []; my $counter = 0; - while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { + my $continue = 1; # + my $name; + while ( $continue && (my $ref = $sth->fetchrow_hashref("NAME_lc")) ) { + last unless $ref; # for single transactions $counter++; if (($counter % 500) == 0) { $progress_callback->($counter); @@ -424,13 +647,24 @@ sub _get_transactions { # keep fetching new acc_trans lines until the end of a balanced group is reached while (abs($count) > 0.01 || $firstrun || ($subcent && abs($count) > 0.005)) { my $ref2 = $sth->fetchrow_hashref("NAME_lc"); - last unless ($ref2); + unless ( $ref2 ) { + $continue = 0; + last; + }; # check if trans_id of current acc_trans line is still the same as the - # trans_id of the first line in group + # trans_id of the first line in group, i.e. we haven't finished a 0-group + # before moving on to the next trans_id, error will likely be in the old + # trans_id. if ($ref2->{trans_id} != $trans->[0]->{trans_id}) { - $self->add_error("Unbalanced ledger! old trans_id " . $trans->[0]->{trans_id} . " new trans_id " . $ref2->{trans_id} . " count $count"); + require SL::DB::Manager::AccTransaction; + if ( $trans->[0]->{trans_id} ) { + my $acc_trans_obj = SL::DB::Manager::AccTransaction->get_first(where => [ trans_id => $trans->[0]->{trans_id} ]); + $self->add_error(t8("Export error in transaction #1: Unbalanced ledger before next transaction (#2)", + $acc_trans_obj->transaction_name, $ref2->{trans_id}) + ); + }; return; } @@ -458,18 +692,17 @@ sub _get_transactions { } } - my %taxid_taxkeys = (); my $absumsatz = 0; if (scalar(@{$trans}) <= 2) { push @{ $self->{DATEV} }, $trans; next; } - # determine at which array position the reference value (called absumsatz) is + # determine at which array position the reference value (called absumsatz) is # and which amount it has for my $j (0 .. (scalar(@{$trans}) - 1)) { - + # Three cases: # 1: gl transaction (Dialogbuchung), invoice is false, no double split booking allowed @@ -494,7 +727,9 @@ sub _get_transactions { # Problem: we can't distinguish between AR and AP and normal invoices via boolean "invoice" # for AR and AP transaction exit the loop as soon as an AR or AP account is found # there must be only one AR or AP chart in the booking - if ( $trans->[$j]->{'link'} eq 'AR' or $trans->[$j]->{'link'} eq 'AP') { + # since it is possible to do this kind of things with GL too, make sure those don't get aborted in case someone + # manually pays an invoice in GL. + if ($trans->[$j]->{table} ne 'gl' and ($trans->[$j]->{'link'} eq 'AR' or $trans->[$j]->{'link'} eq 'AP')) { $notsplitindex = $j; # position in booking with highest amount $absumsatz = $trans->[$j]->{'amount'}; last; @@ -528,12 +763,11 @@ sub _get_transactions { push @{ $self->{DATEV} }, [ \%new_trans, $trans->[$j] ]; } elsif (($j != $notsplitindex) && !$trans->[$j]->{is_tax}) { - my %tax_info = $taxkeys->get_full_tax_info('transdate' => $trans->[$j]->{transdate}); my %new_trans = (); map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] }; - my $tax_rate = $tax_info{taxkeys}->{ $trans->[$j]->{'taxkey'} }->{taxrate}; + my $tax_rate = $trans->[$j]->{'taxrate'}; $new_trans{'net_amount'} = $trans->[$j]->{'amount'} * -1; $new_trans{'tax_rate'} = 1 + $tax_rate; @@ -599,8 +833,11 @@ sub _get_transactions { $absumsatz = $form->round_amount($absumsatz, 2); if (abs($absumsatz) >= (0.01 * (1 + scalar @taxed))) { - $self->add_error("Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz)"); - + require SL::DB::Manager::AccTransaction; + my $acc_trans_obj = SL::DB::Manager::AccTransaction->get_first(where => [ trans_id => $trans->[0]->{trans_id} ]); + $self->add_error(t8("Export error in transaction #1: Rounding error too large #2", + $acc_trans_obj->transaction_name, $absumsatz) + ); } elsif (abs($absumsatz) >= 0.01) { $self->add_net_gross_differences($absumsatz); } @@ -628,7 +865,7 @@ sub make_kne_data_header { $header .= _fill($stamm->{dfvkz}, 2, '0'); $header .= _fill($stamm->{beraternr}, 7, '0'); $header .= _fill($stamm->{mandantennr}, 5, '0'); - $header .= _fill($stamm->{abrechnungsnr} . $jahr, 6, '0'); + $header .= _fill(($stamm->{abrechnungsnr} // '') . $jahr, 6, '0'); $header .= $self->from ? $self->from->strftime('%d%m%y') : ''; $header .= $self->to ? $self->to->strftime('%d%m%y') : ''; @@ -668,9 +905,6 @@ sub datetofour { my ($day, $month, $year) = split(/\./, $date); - if ($day =~ /^0/) { - $day = substr($day, 1, 1); - } if (length($month) < 2) { $month = "0" . $month; } @@ -743,6 +977,133 @@ sub make_ev_header { return $ev_header; } +sub generate_datev_lines { + my ($self) = @_; + + my @datev_lines = (); + + foreach my $transaction ( @{ $self->{DATEV} } ) { + + # each $transaction entry contains data from several acc_trans entries + # belonging to the same trans_id + + my %datev_data = (); # data for one transaction + my $trans_lines = scalar(@{$transaction}); + + my $umsatz = 0; + my $gegenkonto = ""; + my $konto = ""; + my $belegfeld1 = ""; + my $datum = ""; + my $waehrung = ""; + my $buchungstext = ""; + my $belegfeld2 = ""; + my $datevautomatik = 0; + my $taxkey = 0; + my $charttax = 0; + my $ustid =""; + my ($haben, $soll); + for (my $i = 0; $i < $trans_lines; $i++) { + if ($trans_lines == 2) { + if (abs($transaction->[$i]->{'amount'}) > abs($umsatz)) { + $umsatz = $transaction->[$i]->{'amount'}; + } + } else { + if (abs($transaction->[$i]->{'umsatz'}) > abs($umsatz)) { + $umsatz = $transaction->[$i]->{'umsatz'}; + } + } + if ($transaction->[$i]->{'datevautomatik'}) { + $datevautomatik = 1; + } + if ($transaction->[$i]->{'taxkey'}) { + $taxkey = $transaction->[$i]->{'taxkey'}; + } + if ($transaction->[$i]->{'charttax'}) { + $charttax = $transaction->[$i]->{'charttax'}; + } + if ($transaction->[$i]->{'amount'} > 0) { + $haben = $i; + } else { + $soll = $i; + } + } + + if ($trans_lines >= 2) { + + # Personenkontenerweiterung: accno has already been replaced if use_pk was set + $datev_data{'gegenkonto'} = $transaction->[$haben]->{'accno'}; + $datev_data{'konto'} = $transaction->[$soll]->{'accno'}; + if ($transaction->[$haben]->{'invnumber'} ne "") { + $datev_data{belegfeld1} = $transaction->[$haben]->{'invnumber'}; + } + $datev_data{datum} = $transaction->[$haben]->{'transdate'}; + $datev_data{waehrung} = 'EUR'; + $datev_data{kost1} = $transaction->[$haben]->{'departmentdescription'}; + $datev_data{kost2} = $transaction->[$haben]->{'projectdescription'}; + + if ($transaction->[$haben]->{'name'} ne "") { + $datev_data{buchungstext} = $transaction->[$haben]->{'name'}; + } + if (($transaction->[$haben]->{'ustid'} // '') ne "") { + $datev_data{ustid} = SL::VATIDNr->normalize($transaction->[$haben]->{'ustid'}); + } + if (($transaction->[$haben]->{'duedate'} // '') ne "") { + $datev_data{belegfeld2} = $transaction->[$haben]->{'duedate'}; + } + + # if deliverydate exists, add it to datev export if it is + # * an ar/ap booking that is not a payment + # * a gl booking + if ( ($transaction->[$haben]->{'deliverydate'} // '') ne '' + && ( + ( $transaction->[$haben]->{'table'} =~ /^(ar|ap)$/ + && $transaction->[$haben]->{'link'} !~ m/_paid/ + && $transaction->[$soll]->{'link'} !~ m/_paid/ + ) + || $transaction->[$haben]->{'table'} eq 'gl' + ) + ) { + $datev_data{leistungsdatum} = $transaction->[$haben]->{'deliverydate'}; + } + } + $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? + # Im Prinzip hat jeder acc_trans Eintrag einen Steuerschlüssel, außer, bei gewissen Fällen + # wie: Kreditorenbuchung mit negativen Vorzeichen, SEPA-Export oder Rechnungen die per + # Skript angelegt werden. + # Also falls ein Steuerschlüssel da ist und NICHT datevautomatik diesen Block hinzufügen. + # Oder aber datevautomatik ist WAHR, aber der Steuerschlüssel in der acc_trans weicht + # von dem in der Chart ab: Also wahrscheinlich Programmfehler (NULL übergeben, statt + # DATEV-Steuerschlüssel) oder der Steuerschlüssel des Kontos weicht WIRKLICH von dem Eintrag in der + # acc_trans ab. Gibt es für diesen Fall eine plausiblen Grund? + # + + # only set buchungsschluessel if the following conditions are met: + if ( ( $datevautomatik || $taxkey) + && (!$datevautomatik || ($datevautomatik && ($charttax ne $taxkey)))) { + # $datev_data{buchungsschluessel} = !$datevautomatik ? $taxkey : "4"; + $datev_data{buchungsschluessel} = $taxkey; + } + # set lock for each transaction + $datev_data{locked} = $self->locked; + + push(@datev_lines, \%datev_data) if $datev_data{umsatz}; + } + + # example of modifying export data: + # foreach my $datev_line ( @datev_lines ) { + # if ( $datev_line{"konto"} eq '1234' ) { + # $datev_line{"konto"} = '9999'; + # } + # } + # + + return \@datev_lines; +} + + sub kne_buchungsexport { $main::lxdebug->enter_sub(); @@ -752,163 +1113,99 @@ sub kne_buchungsexport { my @filenames; - my $filename = "ED00000"; + my $filename = "ED00001"; my $evfile = "EV01"; my @ed_versionset; - my $fileno = 0; + my $fileno = 1; + my $ed_filename = $self->export_path . $filename; my $fromto = $self->fromto; - $self->_get_transactions($fromto); - + $self->generate_datev_data(from_to => $self->fromto); # fetches data from db, transforms data and fills $self->{DATEV} return if $self->errors; - my $counter = 0; + my @datev_lines = @{ $self->generate_datev_lines }; - while (scalar(@{ $self->{DATEV} || [] })) { - my $umsatzsumme = 0; - $filename++; - my $ed_filename = $self->export_path . $filename; - push(@filenames, $filename); - my $header = $self->make_kne_data_header($form); - - my $kne_file = SL::DATEV::KNEFile->new(); - $kne_file->add_block($header); - - while (scalar(@{ $self->{DATEV} }) > 0) { - my $transaction = shift @{ $self->{DATEV} }; - my $trans_lines = scalar(@{$transaction}); - $counter++; - - my $umsatz = 0; - my $gegenkonto = ""; - my $konto = ""; - my $belegfeld1 = ""; - my $datum = ""; - my $waehrung = ""; - my $buchungstext = ""; - my $belegfeld2 = ""; - my $datevautomatik = 0; - my $taxkey = 0; - my $charttax = 0; - my ($haben, $soll); - my $iconv = $::locale->{iconv_utf8}; - my %umlaute = ($iconv->convert('ä') => 'ae', - $iconv->convert('ö') => 'oe', - $iconv->convert('ü') => 'ue', - $iconv->convert('Ä') => 'Ae', - $iconv->convert('Ö') => 'Oe', - $iconv->convert('Ü') => 'Ue', - $iconv->convert('ß') => 'sz'); - for (my $i = 0; $i < $trans_lines; $i++) { - if ($trans_lines == 2) { - if (abs($transaction->[$i]->{'amount'}) > abs($umsatz)) { - $umsatz = $transaction->[$i]->{'amount'}; - } - } else { - if (abs($transaction->[$i]->{'umsatz'}) > abs($umsatz)) { - $umsatz = $transaction->[$i]->{'umsatz'}; - } - } - if ($transaction->[$i]->{'datevautomatik'}) { - $datevautomatik = 1; - } - if ($transaction->[$i]->{'taxkey'}) { - $taxkey = $transaction->[$i]->{'taxkey'}; - } - if ($transaction->[$i]->{'charttax'}) { - $charttax = $transaction->[$i]->{'charttax'}; - } - if ($transaction->[$i]->{'amount'} > 0) { - $haben = $i; - } else { - $soll = $i; - } - } - # Umwandlung von Umlauten und Sonderzeichen in erlaubte Zeichen bei Textfeldern + my $umsatzsumme = sum map { $_->{umsatz} } @datev_lines; + + # prepare kne file, everything gets stored in ED00001 + my $header = $self->make_kne_data_header($form); + my $kne_file = SL::DATEV::KNEFile->new(); + $kne_file->add_block($header); + + my $iconv = $::locale->{iconv_utf8}; + my %umlaute = ($iconv->convert('ä') => 'ae', + $iconv->convert('ö') => 'oe', + $iconv->convert('ü') => 'ue', + $iconv->convert('Ä') => 'Ae', + $iconv->convert('Ö') => 'Oe', + $iconv->convert('Ü') => 'Ue', + $iconv->convert('ß') => 'sz'); + + # add the data from @datev_lines to the kne_file, formatting as needed + foreach my $kne ( @datev_lines ) { + $kne_file->add_block("+" . $kne_file->format_amount(abs($kne->{umsatz}), 0)); + + # only add buchungsschluessel if it was previously defined + $kne_file->add_block("\x6C" . $kne->{buchungsschluessel}) if defined $kne->{buchungsschluessel}; + + # ($kne->{gegenkonto}) = $kne->{gegenkonto} =~ /^(\d+)/; + $kne_file->add_block("a" . trim_leading_zeroes($kne->{gegenkonto})); + + if ( $kne->{belegfeld1} ) { + my $invnumber = $kne->{belegfeld1}; foreach my $umlaut (keys(%umlaute)) { - $transaction->[$haben]->{'invnumber'} =~ s/${umlaut}/${umlaute{$umlaut}}/g; - $transaction->[$haben]->{'name'} =~ s/${umlaut}/${umlaute{$umlaut}}/g; + $invnumber =~ s/${umlaut}/${umlaute{$umlaut}}/g; } + $invnumber =~ s/[^0-9A-Za-z\$\%\&\*\+\-\/]//g; + $invnumber = substr($invnumber, 0, 12); + $invnumber =~ s/\ *$//; + $kne_file->add_block("\xBD" . $invnumber . "\x1C"); + } - $transaction->[$haben]->{'invnumber'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\/]//g; - $transaction->[$haben]->{'name'} =~ s/[^0-9A-Za-z\$\%\&\*\+\-\ \/]//g; + $kne_file->add_block("\xBE" . &datetofour($kne->{belegfeld2},1) . "\x1C"); - $transaction->[$haben]->{'invnumber'} = substr($transaction->[$haben]->{'invnumber'}, 0, 12); - $transaction->[$haben]->{'name'} = substr($transaction->[$haben]->{'name'}, 0, 30); - $transaction->[$haben]->{'invnumber'} =~ s/\ *$//; - $transaction->[$haben]->{'name'} =~ s/\ *$//; + $kne_file->add_block("d" . &datetofour($kne->{datum},0)); - if ($trans_lines >= 2) { + # ($kne->{konto}) = $kne->{konto} =~ /^(\d+)/; + $kne_file->add_block("e" . trim_leading_zeroes($kne->{konto})); - $gegenkonto = "a" . trim_leading_zeroes($transaction->[$haben]->{'accno'}); - $konto = "e" . trim_leading_zeroes($transaction->[$soll]->{'accno'}); - if ($transaction->[$haben]->{'invnumber'} ne "") { - $belegfeld1 = "\xBD" . $transaction->[$haben]->{'invnumber'} . "\x1C"; - } - $datum = "d"; - $datum .= &datetofour($transaction->[$haben]->{'transdate'}, 0); - $waehrung = "\xB3" . "EUR" . "\x1C"; - if ($transaction->[$haben]->{'name'} ne "") { - $buchungstext = "\x1E" . $transaction->[$haben]->{'name'} . "\x1C"; - } - if ($transaction->[$haben]->{'duedate'} ne "") { - $belegfeld2 = "\xBE" . &datetofour($transaction->[$haben]->{'duedate'}, 1) . "\x1C"; - } - } + my $name = $kne->{buchungstext}; + foreach my $umlaut (keys(%umlaute)) { + $name =~ s/${umlaut}/${umlaute{$umlaut}}/g; + } + $name =~ s/[^0-9A-Za-z\$\%\&\*\+\-\ \/]//g; + $name = substr($name, 0, 30); + $name =~ s/\ *$//; + $kne_file->add_block("\x1E" . $name . "\x1C"); - $umsatz = $kne_file->format_amount(abs($umsatz), 0); - $umsatzsumme += $umsatz; - $kne_file->add_block("+" . $umsatz); - - # Dies ist die einzige Stelle die datevautomatik auswertet. Was soll gesagt werden? - # Im Prinzip hat jeder acc_trans Eintrag einen Steuerschlüssel, außer, bei gewissen Fällen - # wie: Kreditorenbuchung mit negativen Vorzeichen, SEPA-Export oder Rechnungen die per - # Skript angelegt werden. - # Also falls ein Steuerschlüssel da ist und NICHT datevautomatik diesen Block hinzufügen. - # Oder aber datevautomatik ist WAHR, aber der Steuerschlüssel in der acc_trans weicht - # von dem in der Chart ab: Also wahrscheinlich Programmfehler (NULL übergeben, statt - # DATEV-Steuerschlüssel) oder der Steuerschlüssel des Kontos weicht WIRKLICH von dem Eintrag in der - # acc_trans ab. Gibt es für diesen Fall eine plausiblen Grund? - # - if ( ( $datevautomatik || $taxkey) - && (!$datevautomatik || ($datevautomatik && ($charttax ne $taxkey)))) { -# $kne_file->add_block("\x6C" . (!$datevautomatik ? $taxkey : "4")); - $kne_file->add_block("\x6C${taxkey}"); - } + $kne_file->add_block("\xBA" . SL::VATIDNr->normalize($kne->{'ustid'}) . "\x1C") if $kne->{'ustid'}; - $kne_file->add_block($gegenkonto); - $kne_file->add_block($belegfeld1); - $kne_file->add_block($belegfeld2); - $kne_file->add_block($datum); - $kne_file->add_block($konto); - $kne_file->add_block($buchungstext); - $kne_file->add_block($waehrung . "\x79"); - } + $kne_file->add_block("\xB3" . $kne->{'waehrung'} . "\x1C" . "\x79"); + }; - my $mandantenendsumme = "x" . $kne_file->format_amount($umsatzsumme / 100.0, 14) . "\x79\x7a"; + $umsatzsumme = $kne_file->format_amount(abs($umsatzsumme), 0); + my $mandantenendsumme = "x" . $kne_file->format_amount($umsatzsumme / 100.0, 14) . "\x79\x7a"; - $kne_file->add_block($mandantenendsumme); - $kne_file->flush(); + $kne_file->add_block($mandantenendsumme); + $kne_file->flush(); - open(ED, ">", $ed_filename) or die "can't open outputfile: $!\n"; - print(ED $kne_file->get_data()); - close(ED); + open(ED, ">", $ed_filename) or die "can't open outputfile: $!\n"; + print(ED $kne_file->get_data()); + close(ED); - $ed_versionset[$fileno] = $self->make_ed_versionset($header, $filename, $kne_file->get_block_count()); - $fileno++; - } + $ed_versionset[$fileno] = $self->make_ed_versionset($header, $filename, $kne_file->get_block_count()); #Make EV Verwaltungsdatei - my $ev_header = $self->make_ev_header($form, $fileno); + my $ev_header = $self->make_ev_header($form, $fileno); my $ev_filename = $self->export_path . $evfile; push(@filenames, $evfile); open(EV, ">", $ev_filename) or die "can't open outputfile: EV01\n"; print(EV $ev_header); foreach my $file (@ed_versionset) { - print(EV $ed_versionset[$file]); + print(EV $file); } close(EV); ### @@ -1025,6 +1322,162 @@ sub kne_stammdatenexport { return { 'download_token' => $self->download_token, 'filenames' => \@filenames }; } +sub _format_accno { + my ($accno) = @_; + return $accno . ('0' x (6 - min(length($accno), 6))); +} + +sub csv_export_for_tax_accountant { + my ($self) = @_; + + $self->generate_datev_data(from_to => $self->fromto); + + foreach my $transaction (@{ $self->{DATEV} }) { + foreach my $entry (@{ $transaction }) { + $entry->{sortkey} = join '-', map { lc } (DateTime->from_kivitendo($entry->{transdate})->strftime('%Y%m%d'), $entry->{name}, $entry->{reference}); + } + } + + my %transactions = + partition_by { $_->[0]->{table} } + sort_by { $_->[0]->{sortkey} } + grep { 2 == scalar(@{ $_ }) } + @{ $self->{DATEV} }; + + my %column_defs = ( + acc_trans_id => { 'text' => $::locale->text('ID'), }, + amount => { 'text' => $::locale->text('Amount'), }, + credit_accname => { 'text' => $::locale->text('Credit Account Name'), }, + credit_accno => { 'text' => $::locale->text('Credit Account'), }, + debit_accname => { 'text' => $::locale->text('Debit Account Name'), }, + debit_accno => { 'text' => $::locale->text('Debit Account'), }, + invnumber => { 'text' => $::locale->text('Reference'), }, + name => { 'text' => $::locale->text('Name'), }, + notes => { 'text' => $::locale->text('Notes'), }, + tax => { 'text' => $::locale->text('Tax'), }, + taxkey => { 'text' => $::locale->text('Taxkey'), }, + tax_accname => { 'text' => $::locale->text('Tax Account Name'), }, + tax_accno => { 'text' => $::locale->text('Tax Account'), }, + transdate => { 'text' => $::locale->text('Transdate'), }, + vcnumber => { 'text' => $::locale->text('Customer/Vendor Number'), }, + ); + + my @columns = qw( + acc_trans_id name vcnumber + transdate invnumber amount + debit_accno debit_accname + credit_accno credit_accname + tax + tax_accno tax_accname taxkey + notes + ); + + my %filenames_by_type = ( + ar => $::locale->text('AR Transactions'), + ap => $::locale->text('AP Transactions'), + gl => $::locale->text('GL Transactions'), + ); + + my @filenames; + foreach my $type (qw(ap ar)) { + my %csvs = ( + invoices => { + content => '', + filename => sprintf('%s %s - %s.csv', $filenames_by_type{$type}, $self->from->to_kivitendo, $self->to->to_kivitendo), + csv => Text::CSV_XS->new({ + binary => 1, + eol => "\n", + sep_char => ";", + }), + }, + payments => { + content => '', + filename => sprintf('Zahlungen %s %s - %s.csv', $filenames_by_type{$type}, $self->from->to_kivitendo, $self->to->to_kivitendo), + csv => Text::CSV_XS->new({ + binary => 1, + eol => "\n", + sep_char => ";", + }), + }, + ); + + foreach my $csv (values %csvs) { + $csv->{out} = IO::File->new($self->export_path . '/' . $csv->{filename}, '>:encoding(utf8)') ; + $csv->{csv}->print($csv->{out}, [ map { $column_defs{$_}->{text} } @columns ]); + + push @filenames, $csv->{filename}; + } + + foreach my $transaction (@{ $transactions{$type} }) { + my $is_payment = any { $_->{link} =~ m{A[PR]_paid} } @{ $transaction }; + my $csv = $is_payment ? $csvs{payments} : $csvs{invoices}; + + my ($soll, $haben) = map { $transaction->[$_] } ($transaction->[0]->{amount} > 0 ? (1, 0) : (0, 1)); + my $tax = defined($soll->{tax_accno}) ? $soll : $haben; + my $amount = defined($soll->{net_amount}) ? $soll : $haben; + $haben->{notes} = ($haben->{memo} || $soll->{memo}) if $is_payment; + $haben->{notes} //= ''; + $haben->{notes} = SL::HTML::Util->strip($haben->{notes}); + $haben->{notes} =~ s{\r}{}g; + $haben->{notes} =~ s{\n+}{ }g; + + my %row = ( + amount => $::form->format_amount({ numberformat => '1000,00' }, abs($amount->{amount}), 2), + debit_accno => _format_accno($soll->{accno}), + debit_accname => $soll->{accname}, + credit_accno => _format_accno($haben->{accno}), + credit_accname => $haben->{accname}, + tax => $::form->format_amount({ numberformat => '1000,00' }, abs($amount->{amount}) - abs($amount->{net_amount}), 2), + notes => $haben->{notes}, + (map { ($_ => $tax->{$_}) } qw(taxkey tax_accname tax_accno)), + (map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(acc_trans_id invnumber name vcnumber transdate)), + ); + + $csv->{csv}->print($csv->{out}, [ map { $row{$_} } @columns ]); + } + + $_->{out}->close for values %csvs; + } + + $self->add_filenames(@filenames); + + return { download_token => $self->download_token, filenames => \@filenames }; +} + +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"; + 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 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(); } @@ -1037,12 +1490,14 @@ __END__ =head1 NAME -SL::DATEV - Lx-Office DATEV Export module +SL::DATEV - kivitendo DATEV Export module =head1 SYNOPSIS use SL::DATEV qw(:CONSTANTS); + my $startdate = DateTime->new(year => 2014, month => 9, day => 1); + my $enddate = DateTime->new(year => 2014, month => 9, day => 31); my $datev = SL::DATEV->new( exporttype => DATEV_ET_BUCHUNGEN, format => DATEV_FORMAT_KNE, @@ -1050,6 +1505,14 @@ SL::DATEV - Lx-Office DATEV Export module to => $enddate, ); + # To only export transactions from a specific trans_id: (from and to are ignored) + my $invoice = SL::DB::Manager::Invoice->find_by( invnumber => '216' ); + my $datev = SL::DATEV->new( + exporttype => DATEV_ET_BUCHUNGEN, + format => DATEV_FORMAT_KNE, + trans_id => $invoice->trans_id, + ); + my $datev = SL::DATEV->new( exporttype => DATEV_ET_STAMM, format => DATEV_FORMAT_KNE, @@ -1061,7 +1524,7 @@ SL::DATEV - Lx-Office DATEV Export module my $hashref = $datev->get_datev_stamm; $datev->save_datev_stamm($hashref); - # manually clean up temporary directories + # manually clean up temporary directories older than 8 hours $datev->clean_temporary_directories; # export @@ -1084,6 +1547,16 @@ SL::DATEV - Lx-Office DATEV Export module my $path = $datev->export_path; my @files = glob("$path/*"); + # Only test the datev data of a specific trans_id, without generating an + # export file, but filling $datev->errors if errors exist + + my $datev = SL::DATEV->new( + trans_id => $invoice->trans_id, + ); + $datev->generate_datev_data; + # if ($datev->errors) { ... + + =head1 DESCRIPTION This module implements the DATEV export standard. For usage see above. @@ -1094,7 +1567,31 @@ This module implements the DATEV export standard. For usage see above. =item new PARAMS -Generic constructor. See section attributes for information about hat to pass. +Generic constructor. See section attributes for information about what to pass. + +=item generate_datev_data + +Fetches all transactions from the database (via a trans_id or a date range), +and does an initial transformation (e.g. filters out tax, determines +the brutto amount, checks split transactions ...) and stores this data in +$self->{DATEV}. + +If any errors are found these are collected in $self->errors. + +This function is needed for all the exports, but can be also called +independently in order to check transactions for DATEV compatibility. + +=item generate_datev_lines + +Parse the data in $self->{DATEV} and transform it into a format that can be +used by DATEV, e.g. determines Konto and Gegenkonto, the taxkey, ... + +The transformed data is returned as an arrayref, which is ready to be converted +to a DATEV data format, e.g. KNE, OBE, CSV, ... + +At this stage the "DATEV rule" has already been applied to the taxkeys, i.e. +entries with datevautomatik have an empty taxkey, as the taxkey is already +determined by the chart. =item get_datev_stamm @@ -1136,7 +1633,7 @@ Note: If either a download_token or export_path were set at the creation these a =item filenames -Returns a list of filenames generated by this DATEV object. This only works if th files were generated during it's lifetime, not if the object was created from a download_token. +Returns a list of filenames generated by this DATEV object. This only works if the files were generated during its lifetime, not if the object was created from a download_token. =item net_gross_differences @@ -1152,13 +1649,54 @@ Forces a garbage collection on previous exports which will delete all exports th =item errors -Returns a list of errors that occured. If no errors occured, the export was a success. +Returns a list of errors that occurred. If no errors occurred, the export was a success. =item export Exports data. You have to have set L and L or an error will occur. OBE exports are currently not implemented. +=item csv_export_for_tax_accountant + +Generates up to four downloadable csv files containing data about sales and +purchase invoices, and their respective payments: + +Example: + my $startdate = DateTime->new(year => 2012, month => 1, day => 1); + my $enddate = DateTime->new(year => 2012, month => 12, day => 31); + SL::DATEV->new(from => $startdate, to => $enddate)->csv_export_for_tax_accountant; + # { + # 'download_token' => '1488551625-815654-22430', + # 'filenames' => [ + # 'Zahlungen Kreditorenbuchungen 2012-01-01 - 2012-12-31.csv', + # 'Kreditorenbuchungen 2012-01-01 - 2012-12-31.csv', + # 'Zahlungen Debitorenbuchungen 2012-01-01 - 2012-12-31.csv', + # 'Debitorenbuchungen 2012-01-01 - 2012-12-31.csv' + # ] + # }; + + +=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 @@ -1172,6 +1710,10 @@ This is a list of attributes set in either the C or a method of the same na Set a database handle to use in the process. This allows for an export to be done on a transaction in progress without committing first. +Note: If you don't want this code to commit, simply providing a dbh is not +enough enymore. You'll have to wrap the call into a transaction yourself, so +that the internal transaction does not commit. + =item exporttype See L for possible values. This MUST be set before export is called. @@ -1188,7 +1730,14 @@ Can be set on creation to retrieve a prior export for download. =item to -Set boundary dates for the export. Currently thse MUST be set for the export to work. +Set boundary dates for the export. Unless a trans_id is passed these MUST be +set for the export to work. + +=item trans_id + +To check only one gl/ar/ap transaction, pass the trans_id. The attributes +L and L are currently still needed for the query to be assembled +correctly. =item accnofrom @@ -1196,6 +1745,11 @@ Set boundary dates for the export. Currently thse MUST be set for the export to 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 @@ -1232,7 +1786,7 @@ No or unrecognized exporttype or format was provided for an export =item * -OBE rxport was called, which is not yet implemented. +OBE export was called, which is not yet implemented. =item * @@ -1251,7 +1805,7 @@ C. Exactly that, your ledger is unbalanced. Should never occ =item * C This error occurs if a -transaction could not be reliably sorted out, or had rounding errors over the acceptable threshold. +transaction could not be reliably sorted out, or had rounding errors above the acceptable threshold. =back @@ -1261,7 +1815,7 @@ transaction could not be reliably sorted out, or had rounding errors over the ac =item * -Handling of Vollvorlauf is currently not fully implemented. You must provide both from and to to get a working export. +Handling of Vollvorlauf is currently not fully implemented. You must provide both from and to in order to get a working export. =item * @@ -1276,6 +1830,7 @@ OBE export is currently not implemented. =head1 SEE ALSO L +L =head1 AUTHORS