X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=e79c08012a7fe07ef42fc89966f6325e3b490f6d;hb=99bbf349b825fc48cdb71288e0979ab687770227;hp=407943928647e1f4dddd95b3c5b0c321f1667d7c;hpb=6ff01fdb61880344c2826c86955ef4c1e8f47db4;p=kivitendo-erp.git
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index 407943928..e79c08012 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -1,5 +1,5 @@
#=====================================================================
-# Lx-Office ERP
+# kivitendo ERP
# Copyright (c) 2004
#
# Author: Philip Reetz
@@ -24,23 +24,73 @@
# Datev export module
#======================================================================
-package DATEV;
+package SL::DATEV;
-use List::Util qw(max);
+use utf8;
+use strict;
use SL::DBUtils;
use SL::DATEV::KNEFile;
-use SL::Taxkeys;
use Data::Dumper;
+use DateTime;
+use Exporter qw(import);
use File::Path;
+use List::Util qw(max sum);
use Time::HiRes qw(gettimeofday);
+{
+ my $i = 0;
+ use constant {
+ DATEV_ET_BUCHUNGEN => $i++,
+ DATEV_ET_STAMM => $i++,
+
+ DATEV_FORMAT_KNE => $i++,
+ DATEV_FORMAT_OBE => $i++,
+ };
+}
+
+my @export_constants = qw(DATEV_ET_BUCHUNGEN DATEV_ET_STAMM DATEV_FORMAT_KNE DATEV_FORMAT_OBE);
+our @EXPORT_OK = (@export_constants);
+our %EXPORT_TAGS = (CONSTANTS => [ @export_constants ]);
+
+
+sub new {
+ my $class = shift;
+ my %data = @_;
+
+ my $obj = bless {}, $class;
+
+ $obj->$_($data{$_}) for keys %data;
+
+ $obj;
+}
+
+sub exporttype {
+ my $self = shift;
+ $self->{exporttype} = $_[0] if @_;
+ return $self->{exporttype};
+}
+
+sub has_exporttype {
+ defined $_[0]->{exporttype};
+}
+
+sub format {
+ my $self = shift;
+ $self->{format} = $_[0] if @_;
+ return $self->{format};
+}
+
+sub has_format {
+ defined $_[0]->{format};
+}
+
sub _get_export_path {
$main::lxdebug->enter_sub();
my ($a, $b) = gettimeofday();
- my $path = get_path_for_download_token("${a}-${b}-${$}");
+ my $path = _get_path_for_download_token("${a}-${b}-${$}");
mkpath($path) unless (-d $path);
@@ -49,14 +99,14 @@ sub _get_export_path {
return $path;
}
-sub get_path_for_download_token {
+sub _get_path_for_download_token {
$main::lxdebug->enter_sub();
- my $token = shift;
+ my $token = shift || '';
my $path;
if ($token =~ m|^(\d+)-(\d+)-(\d+)$|) {
- $path = "${main::userspath}/datev-export-${1}-${2}-${3}";
+ $path = $::lx_office_conf{paths}->{userspath} . "/datev-export-${1}-${2}-${3}/";
}
$main::lxdebug->leave_sub();
@@ -64,7 +114,7 @@ sub get_path_for_download_token {
return $path;
}
-sub get_download_token_for_path {
+sub _get_download_token_for_path {
$main::lxdebug->enter_sub();
my $path = shift;
@@ -79,11 +129,120 @@ sub get_download_token_for_path {
return $token;
}
+sub download_token {
+ my $self = shift;
+ $self->{download_token} = $_[0] if @_;
+ return $self->{download_token} ||= _get_download_token_for_path($self->export_path);
+}
+
+sub export_path {
+ my ($self) = @_;
+
+ return $self->{export_path} ||= _get_path_for_download_token($self->{download_token}) || _get_export_path();
+}
+
+sub add_filenames {
+ my $self = shift;
+ push @{ $self->{filenames} ||= [] }, @_;
+}
+
+sub filenames {
+ return @{ $_[0]{filenames} || [] };
+}
+
+sub add_error {
+ my $self = shift;
+ push @{ $self->{errors} ||= [] }, @_;
+}
+
+sub errors {
+ return @{ $_[0]{errors} || [] };
+}
+
+sub add_net_gross_differences {
+ my $self = shift;
+ push @{ $self->{net_gross_differences} ||= [] }, @_;
+}
+
+sub net_gross_differences {
+ return @{ $_[0]{net_gross_differences} || [] };
+}
+
+sub sum_net_gross_differences {
+ return sum $_[0]->net_gross_differences;
+}
+
+sub from {
+ my $self = shift;
+
+ if (@_) {
+ $self->{from} = $_[0];
+ }
+
+ return $self->{from};
+}
+
+sub to {
+ my $self = shift;
+
+ if (@_) {
+ $self->{to} = $_[0];
+ }
+
+ return $self->{to};
+}
+
+sub trans_id {
+ my $self = shift;
+
+ if (@_) {
+ $self->{trans_id} = $_[0];
+ }
+
+ return $self->{trans_id};
+}
+
+sub accnofrom {
+ my $self = shift;
+
+ if (@_) {
+ $self->{accnofrom} = $_[0];
+ }
+
+ return $self->{accnofrom};
+}
+
+sub accnoto {
+ my $self = shift;
+
+ if (@_) {
+ $self->{accnoto} = $_[0];
+ }
+
+ return $self->{accnoto};
+}
+
+
+sub dbh {
+ my $self = shift;
+
+ if (@_) {
+ $self->{dbh} = $_[0];
+ $self->{provided_dbh} = 1;
+ }
+
+ $self->{dbh} ||= $::form->get_standard_dbh;
+}
+
+sub provided_dbh {
+ $_[0]{provided_dbh};
+}
+
sub clean_temporary_directories {
- $main::lxdebug->enter_sub();
+ $::lxdebug->enter_sub;
- foreach my $path (glob "${main::userspath}/datev-export-*") {
- next unless (-d $path);
+ foreach my $path (glob($::lx_office_conf{paths}->{userspath} . "/datev-export-*")) {
+ next unless -d $path;
my $mtime = (stat($path))[9];
next if ((time() - $mtime) < 8 * 60 * 60);
@@ -91,7 +250,7 @@ sub clean_temporary_directories {
rmtree $path;
}
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub _fill {
@@ -118,271 +277,154 @@ sub _fill {
}
sub get_datev_stamm {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
+ return $_[0]{stamm} ||= selectfirst_hashref_query($::form, $_[0]->dbh, 'SELECT * FROM datev');
+}
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
+sub save_datev_stamm {
+ my ($self, $data) = @_;
- $query = qq|SELECT * FROM datev|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
+ do_query($::form, $self->dbh, 'DELETE FROM datev');
- my $ref = $sth->fetchrow_hashref(NAME_lc);
+ my @columns = qw(beraternr beratername dfvkz mandantennr datentraegernr abrechnungsnr);
- map { $form->{$_} = $ref->{$_} } keys %$ref;
+ my $query = "INSERT INTO datev (" . join(', ', @columns) . ") VALUES (" . join(', ', ('?') x @columns) . ")";
+ do_query($::form, $self->dbh, $query, map { $data->{$_} } @columns);
- $sth->finish;
- $dbh->disconnect;
- $main::lxdebug->leave_sub();
+ $self->dbh->commit unless $self->provided_dbh;
}
-sub save_datev_stamm {
- $main::lxdebug->enter_sub();
+sub export {
+ my ($self) = @_;
+ my $result;
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect_noauto($myconfig);
-
- $query = qq|DELETE FROM datev|;
- $dbh->do($query) || $form->dberror($query);
-
- $query = qq|INSERT INTO datev
- (beraternr, beratername, dfvkz, mandantennr, datentraegernr, abrechnungsnr) VALUES
- (|
- . $dbh->quote($form->{beraternr}) . qq|,|
- . $dbh->quote($form->{beratername}) . qq|,|
- . $dbh->quote($form->{dfvkz}) . qq|,
- |
- . $dbh->quote($form->{mandantennr}) . qq|,|
- . $dbh->quote($form->{datentraegernr}) . qq|,|
- . $dbh->quote($form->{abrechnungsnr}) . qq|)|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
- $sth->finish;
+ die 'no format set!' unless $self->has_format;
- $dbh->commit;
- $dbh->disconnect;
- $main::lxdebug->leave_sub();
+ if ($self->format == DATEV_FORMAT_KNE) {
+ $result = $self->kne_export;
+ } elsif ($self->format == DATEV_FORMAT_OBE) {
+ $result = $self->obe_export;
+ } else {
+ die 'unrecognized export format';
+ }
+
+ return $result;
}
sub kne_export {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
+ my ($self) = @_;
my $result;
- if ($form->{exporttype} == 0) {
- $result = kne_buchungsexport($myconfig, $form);
+ die 'no exporttype set!' unless $self->has_exporttype;
+
+ if ($self->exporttype == DATEV_ET_BUCHUNGEN) {
+ $result = $self->kne_buchungsexport;
+ } elsif ($self->exporttype == DATEV_ET_STAMM) {
+ $result = $self->kne_stammdatenexport;
} else {
- $result = kne_stammdatenexport($myconfig, $form);
+ die 'unrecognized exporttype';
}
- $main::lxdebug->leave_sub();
-
return $result;
}
sub obe_export {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect_noauto($myconfig);
- $dbh->commit;
- $dbh->disconnect;
- $main::lxdebug->leave_sub();
+ die 'not yet implemented';
}
-sub get_dates {
- $main::lxdebug->enter_sub();
-
- my ($zeitraum, $monat, $quartal, $transdatefrom, $transdateto) = @_;
-
- $fromto = "transdate >= ";
-
- my @a = localtime;
- $a[5] += 1900;
- $jahr = $a[5];
- if ($zeitraum eq "monat") {
- SWITCH: {
- $monat eq "1" && do {
- $form->{fromdate} = "1.1.$jahr";
- $form->{todate} = "31.1.$jahr";
- last SWITCH;
- };
- $monat eq "2" && do {
- $form->{fromdate} = "1.2.$jahr";
-
- #this works from 1901 to 2099, 1900 and 2100 fail.
- $leap = ($jahr % 4 == 0) ? "29" : "28";
- $form->{todate} = "$leap.2.$jahr";
- last SWITCH;
- };
- $monat eq "3" && do {
- $form->{fromdate} = "1.3.$jahr";
- $form->{todate} = "31.3.$jahr";
- last SWITCH;
- };
- $monat eq "4" && do {
- $form->{fromdate} = "1.4.$jahr";
- $form->{todate} = "30.4.$jahr";
- last SWITCH;
- };
- $monat eq "5" && do {
- $form->{fromdate} = "1.5.$jahr";
- $form->{todate} = "31.5.$jahr";
- last SWITCH;
- };
- $monat eq "6" && do {
- $form->{fromdate} = "1.6.$jahr";
- $form->{todate} = "30.6.$jahr";
- last SWITCH;
- };
- $monat eq "7" && do {
- $form->{fromdate} = "1.7.$jahr";
- $form->{todate} = "31.7.$jahr";
- last SWITCH;
- };
- $monat eq "8" && do {
- $form->{fromdate} = "1.8.$jahr";
- $form->{todate} = "31.8.$jahr";
- last SWITCH;
- };
- $monat eq "9" && do {
- $form->{fromdate} = "1.9.$jahr";
- $form->{todate} = "30.9.$jahr";
- last SWITCH;
- };
- $monat eq "10" && do {
- $form->{fromdate} = "1.10.$jahr";
- $form->{todate} = "31.10.$jahr";
- last SWITCH;
- };
- $monat eq "11" && do {
- $form->{fromdate} = "1.11.$jahr";
- $form->{todate} = "30.11.$jahr";
- last SWITCH;
- };
- $monat eq "12" && do {
- $form->{fromdate} = "1.12.$jahr";
- $form->{todate} = "31.12.$jahr";
- last SWITCH;
- };
- }
- $fromto .=
- "'" . $form->{fromdate} . "' and transdate <= '" . $form->{todate} . "'";
- }
-
- elsif ($zeitraum eq "quartal") {
- if ($quartal == 1) {
- $fromto .=
- "'01.01." . $jahr . "' and transdate <= '31.03." . $jahr . "'";
- } elsif ($quartal == 2) {
- $fromto .=
- "'01.04." . $jahr . "' and transdate <= '30.06." . $jahr . "'";
- } elsif ($quartal == 3) {
- $fromto .=
- "'01.07." . $jahr . "' and transdate <= '30.09." . $jahr . "'";
- } elsif ($quartal == 4) {
- $fromto .=
- "'01.10." . $jahr . "' and transdate <= '31.12." . $jahr . "'";
- }
- }
-
- elsif ($zeitraum eq "zeit") {
- $fromto .= "'" . $transdatefrom . "' and transdate <= '" . $transdateto . "'";
- my ($yy, $mm, $dd) = $main::locale->parse_date(\%main::myconfig, $transdatefrom);
- $jahr = $yy;
- }
+sub fromto {
+ my ($self) = @_;
- $main::lxdebug->leave_sub();
+ return unless $self->from && $self->to;
- return ($fromto, $jahr);
+ return "transdate >= '" . $self->from->to_lxoffice . "' and transdate <= '" . $self->to->to_lxoffice . "'";
}
sub _sign {
- my $value = shift;
-
- return $value < 0 ? -1
- : $value > 0 ? 1
- : 0;
+ $_[0] <=> 0;
}
sub _get_transactions {
$main::lxdebug->enter_sub();
-
+ my $self = shift;
my $fromto = shift;
+ my $progress_callback = shift || sub {};
- my $myconfig = \%main::myconfig;
my $form = $main::form;
- my $dbh = $form->get_standard_dbh($myconfig);
+ my $trans_id_filter = '';
+
+ $trans_id_filter = 'AND ac.trans_id = ' . $self->trans_id if $self->trans_id;
- my @errors = ();
+ my ($notsplitindex);
$fromto =~ s/transdate/ac\.transdate/g;
- my $taxkeys = Taxkeys->new();
my $filter = ''; # Useful for debugging purposes
- my %all_taxchart_ids = selectall_as_map($form, $dbh, qq|SELECT DISTINCT chart_id, TRUE AS is_set FROM tax|, 'chart_id', 'is_set');
+ 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 $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
+ ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate,
+ ct.name, ct.ustid,
+ c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
+ ar.invoice,
+ t.rate AS taxrate
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)
WHERE (ar.id IS NOT NULL)
AND $fromto
+ $trans_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
+ ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate,
+ ct.name,ct.ustid,
+ c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
+ ap.invoice,
+ t.rate AS taxrate
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)
WHERE (ap.id IS NOT NULL)
AND $fromto
+ $trans_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
+ gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate,
+ gl.description AS name, NULL as ustid,
+ c.accno, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
+ FALSE AS invoice,
+ t.rate AS taxrate
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)
WHERE (gl.id IS NOT NULL)
AND $fromto
+ $trans_id_filter
$filter
ORDER BY trans_id, acc_trans_id|;
- my $sth = prepare_execute_query($form, $dbh, $query);
+ my $sth = prepare_execute_query($form, $self->dbh, $query);
+ $self->{DATEV} = [];
my $counter = 0;
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
+ while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
$counter++;
if (($counter % 500) == 0) {
- print("$counter ");
+ $progress_callback->($counter);
}
my $trans = [ $ref ];
@@ -390,13 +432,27 @@ sub _get_transactions {
my $count = $ref->{amount};
my $firstrun = 1;
- while (abs($count) > 0.01 || $firstrun) {
- my $ref2 = $sth->fetchrow_hashref(NAME_lc);
+ # if the amount of a booking in a group is smaller than 0.02, any tax
+ # amounts will likely be smaller than 1 cent, so go into subcent mode
+ my $subcent = abs($count) < 0.02;
+
+ # records from acc_trans are ordered by trans_id and acc_trans_id
+ # first check for unbalanced ledger inside one trans_id
+ # there may be several groups inside a trans_id, e.g. the original booking and the payment
+ # each group individually should be exactly balanced and each group
+ # individually needs its own datev lines
+
+ # 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);
+ # check if trans_id of current acc_trans line is still the same as the
+ # trans_id of the first line in group
+
if ($ref2->{trans_id} != $trans->[0]->{trans_id}) {
- $form->error("Unbalanced ledger! old trans_id " . $trans->[0]->{trans_id} . " new trans_id " . $ref2->{trans_id} . " count $count");
- exit 1;
+ $self->add_error("Unbalanced ledger! old trans_id " . $trans->[0]->{trans_id} . " new trans_id " . $ref2->{trans_id} . " count $count");
+ return;
}
push @{ $trans }, $ref2;
@@ -415,30 +471,63 @@ sub _get_transactions {
$ref->{is_tax} = 1;
}
- if ( !$ref->{invoice}
- && $ref->{is_tax}
- && !($prev_ref->{is_tax})
- && (_sign($ref->{amount}) == _sign($prev_ref->{amount}))) {
+ if ( !$ref->{invoice} # we have a non-invoice booking (=gl)
+ && $ref->{is_tax} # that has "is_tax" set
+ && !($prev_ref->{is_tax}) # previous line wasn't is_tax
+ && (_sign($ref->{amount}) == _sign($prev_ref->{amount}))) { # and sign same as previous sign
$trans->[$i - 1]->{tax_amount} = $ref->{amount};
}
}
- my %taxid_taxkeys = ();
my $absumsatz = 0;
if (scalar(@{$trans}) <= 2) {
- push @{ $form->{DATEV} }, $trans;
+ push @{ $self->{DATEV} }, $trans;
next;
}
+ # determine at which array position the reference value (called absumsatz) is
+ # and which amount it has
+
for my $j (0 .. (scalar(@{$trans}) - 1)) {
- if (abs($trans->[$j]->{'amount'}) > abs($absumsatz)) {
+
+ # Three cases:
+ # 1: gl transaction (Dialogbuchung), invoice is false, no double split booking allowed
+
+ # 2: sales or vendor invoice (Verkaufs- und Einkaufsrechnung): invoice is
+ # true, instead of absumsatz use link AR/AP (there should only be one
+ # entry)
+
+ # 3. AR/AP transaction (Kreditoren- und Debitorenbuchung): invoice is false,
+ # instead of absumsatz use link AR/AP (there should only be one, so jump
+ # out of search as soon as you find it )
+
+ # case 1 and 2
+ # for gl-bookings no split is allowed and there is no AR/AP account, so we always use the maximum value as a reference
+ # for ap/ar bookings we can always search for AR/AP in link and use that
+ if ( ( not $trans->[$j]->{'invoice'} and abs($trans->[$j]->{'amount'}) > abs($absumsatz) )
+ or ($trans->[$j]->{'invoice'} and ($trans->[$j]->{'link'} eq 'AR' or $trans->[$j]->{'link'} eq 'AP'))) {
$absumsatz = $trans->[$j]->{'amount'};
$notsplitindex = $j;
}
+
+ # case 3
+ # 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') {
+ $notsplitindex = $j; # position in booking with highest amount
+ $absumsatz = $trans->[$j]->{'amount'};
+ last;
+ };
}
my $ml = ($trans->[0]->{'umsatz'} > 0) ? 1 : -1;
my $rounding_error = 0;
+ my @taxed;
+
+ # go through each line and determine if it is a tax booking or not
+ # skip all tax lines and notsplitindex line
+ # push all other accounts (e.g. income or expense) with corresponding taxkey
for my $j (0 .. (scalar(@{$trans}) - 1)) {
if ( ($j != $notsplitindex)
@@ -456,15 +545,14 @@ sub _get_transactions {
$new_trans{'umsatz'} = abs($trans->[$j]->{'amount'}) * $ml;
$trans->[$j]->{'umsatz'} = abs($trans->[$j]->{'amount'}) * $ml;
- push @{ $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+ 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;
@@ -475,22 +563,24 @@ sub _get_transactions {
$absumsatz += -1 * $new_trans{'amount'};
} else {
- my $unrounded = $trans->[$j]->{'amount'} * (1 + $tax_rate) * -1; # + $rounding_error;
+ my $unrounded = $trans->[$j]->{'amount'} * (1 + $tax_rate) * -1 + $rounding_error;
my $rounded = $form->round_amount($unrounded, 2);
- $rounding_error += $unrounded - $rounded;
+
+ $rounding_error = $unrounded - $rounded;
$new_trans{'amount'} = $rounded;
- $new_trans{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * (1 + $tax_rate)), 2)) * $ml;
- $trans->[$j]->{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * (1 + $tax_rate)), 2)) * $ml;
- $absumsatz += $form->round_amount($trans->[$j]->{'amount'} + $trans->[$j]->{'amount'} * $tax_rate, 2);
+ $new_trans{'umsatz'} = abs($rounded) * $ml;
+ $trans->[$j]->{'umsatz'} = $new_trans{umsatz};
+ $absumsatz -= $rounded;
}
- push @{ $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+ push @{ $self->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+ push @taxed, $self->{DATEV}->[-1];
}
}
my $idx = 0;
my $correction = 0;
- while (abs($absumsatz) >= 0.01) {
+ while ((abs($absumsatz) >= 0.01) && (abs($absumsatz) < 1.00)) {
if ($idx >= scalar @taxed) {
last if (!$correction);
@@ -526,88 +616,57 @@ sub _get_transactions {
$idx++;
}
- if (abs($absumsatz) >= 0.01) {
- push @errors, "Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz, Rundungsfehler $rounding_error)\n";
+ $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)");
+
+ } elsif (abs($absumsatz) >= 0.01) {
+ $self->add_net_gross_differences($absumsatz);
}
}
$sth->finish();
- $form->error(join("
\n", @errors)) if (@errors);
-
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub make_kne_data_header {
$main::lxdebug->enter_sub();
- my ($myconfig, $form, $fromto, $start_jahr) = @_;
+ my ($self, $form) = @_;
+ my ($primanota);
- my $jahr = $start_jahr;
- if (!$jahr) {
- my @a = localtime;
- $jahr = $a[5];
- }
+ my $stamm = $self->get_datev_stamm;
+
+ my $jahr = $self->from ? $self->from->year : DateTime->today->year;
#Header
my $header = "\x1D\x181";
- $header .= _fill($form->{datentraegernr}, 3, ' ', 'left');
- $header .= ($fromto) ? "11" : "13"; # Anwendungsnummer
- $header .= _fill($form->{dfvkz}, 2, '0');
- $header .= _fill($form->{beraternr}, 7, '0');
- $header .= _fill($form->{mandantennr}, 5, '0');
- $header .= _fill($form->{abrechnungsnr} . $jahr, 6, '0');
-
- $fromto =~ s/transdate|>=|and|\'|<=//g;
- my ($from, $to) = split / /, $fromto;
- $from =~ s/ //g;
- $to =~ s/ //g;
-
- if ($from ne "") {
- my ($fday, $fmonth, $fyear) = split(/\./, $from);
- if (length($fmonth) < 2) {
- $fmonth = "0" . $fmonth;
- }
- if (length($fday) < 2) {
- $fday = "0" . $fday;
- }
- $from = $fday . $fmonth . substr($fyear, -2, 2);
- } else {
- $from = "";
- }
+ $header .= _fill($stamm->{datentraegernr}, 3, ' ', 'left');
+ $header .= ($self->fromto) ? "11" : "13"; # Anwendungsnummer
+ $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 .= $from;
+ $header .= $self->from ? $self->from->strftime('%d%m%y') : '';
+ $header .= $self->to ? $self->to->strftime('%d%m%y') : '';
- if ($to ne "") {
- my ($tday, $tmonth, $tyear) = split(/\./, $to);
- if (length($tmonth) < 2) {
- $tmonth = "0" . $tmonth;
- }
- if (length($tday) < 2) {
- $tday = "0" . $tday;
- }
- $to = $tday . $tmonth . substr($tyear, -2, 2);
- } else {
- $to = "";
- }
- $header .= $to;
-
- if ($fromto ne "") {
+ if ($self->fromto) {
$primanota = "001";
$header .= $primanota;
}
- $header .= _fill($form->{passwort}, 4, '0');
+ $header .= _fill($stamm->{passwort}, 4, '0');
$header .= " " x 16; # Anwendungsinfo
$header .= " " x 16; # Inputinfo
$header .= "\x79";
#Versionssatz
- my $versionssatz = $form->{exporttype} == 0 ? "\xB5" . "1," : "\xB6" . "1,";
+ my $versionssatz = $self->exporttype == DATEV_ET_BUCHUNGEN ? "\xB5" . "1," : "\xB6" . "1,";
- my $dbh = $form->get_standard_dbh($myconfig);
my $query = qq|SELECT accno FROM chart LIMIT 1|;
- my $ref = selectfirst_hashref_query($form, $dbh, $query);
+ my $ref = selectfirst_hashref_query($form, $self->dbh, $query);
$versionssatz .= length $ref->{accno};
$versionssatz .= ",";
@@ -626,7 +685,7 @@ sub datetofour {
my ($date, $six) = @_;
- ($day, $month, $year) = split(/\./, $date);
+ my ($day, $month, $year) = split(/\./, $date);
if ($day =~ /^0/) {
$day = substr($day, 1, 1);
@@ -660,15 +719,15 @@ sub trim_leading_zeroes {
sub make_ed_versionset {
$main::lxdebug->enter_sub();
- my ($header, $filename, $blockcount, $fromto) = @_;
+ my ($self, $header, $filename, $blockcount) = @_;
my $versionset = "V" . substr($filename, 2, 5);
$versionset .= substr($header, 6, 22);
- if ($fromto ne "") {
+ if ($self->fromto) {
$versionset .= "0000" . substr($header, 28, 19);
} else {
- $datum = " " x 16;
+ my $datum = " " x 16;
$versionset .= $datum . "001" . substr($header, 28, 4);
}
@@ -686,12 +745,14 @@ sub make_ed_versionset {
sub make_ev_header {
$main::lxdebug->enter_sub();
- my ($form, $fileno) = @_;
+ my ($self, $form, $fileno) = @_;
- my $ev_header = _fill($form->{datentraegernr}, 3, ' ', 'left');
+ my $stamm = $self->get_datev_stamm;
+
+ my $ev_header = _fill($stamm->{datentraegernr}, 3, ' ', 'left');
$ev_header .= " ";
- $ev_header .= _fill($form->{beraternr}, 7, ' ', 'left');
- $ev_header .= _fill($form->{beratername}, 9, ' ', 'left');
+ $ev_header .= _fill($stamm->{beraternr}, 7, ' ', 'left');
+ $ev_header .= _fill($stamm->{beratername}, 9, ' ', 'left');
$ev_header .= " ";
$ev_header .= (_fill($fileno, 5, '0')) x 2;
$ev_header .= " " x 95;
@@ -704,47 +765,39 @@ sub make_ev_header {
sub kne_buchungsexport {
$main::lxdebug->enter_sub();
- my ($myconfig, $form) = @_;
+ my ($self) = @_;
+
+ my $form = $::form;
my @filenames;
- my $export_path = _get_export_path() . "/";
my $filename = "ED00000";
my $evfile = "EV01";
- my @ed_versionsets;
+ my @ed_versionset;
my $fileno = 0;
- $form->header;
- print qq|
-
-