X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=29ef34f8e52431b35dd270fa6a89ccd3b48a9de5;hb=58b90d2d1159a4564f4ef0533669a506442e88eb;hp=fb3ec74d22ce6fbad2e53c258b1e0008f32109f2;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index fb3ec74d2..29ef34f8e 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -26,6 +26,8 @@
package DATEV;
+use SL::DBUtils;
+
use Data::Dumper;
sub get_datev_stamm {
@@ -37,19 +39,18 @@ sub get_datev_stamm {
my $dbh = $form->dbconnect($myconfig);
$query = qq|SELECT * FROM datev|;
- $sth = $dbh->prepare($query);
+ $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
my $ref = $sth->fetchrow_hashref(NAME_lc);
-
+
map { $form->{$_} = $ref->{$_} } keys %$ref;
-
+
$sth->finish;
$dbh->disconnect;
$main::lxdebug->leave_sub();
}
-
sub save_datev_stamm {
$main::lxdebug->enter_sub();
@@ -63,42 +64,47 @@ sub save_datev_stamm {
$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|)|;
+ (|
+ . $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;
-
+
$dbh->commit;
$dbh->disconnect;
$main::lxdebug->leave_sub();
}
-
+
sub kne_export {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form) = @_;
- my $rc;
+ my @rc;
- if ($form->{exporttype}==0) {
- $rc = &kne_buchungsexport($myconfig, $form);
+ if ($form->{exporttype} == 0) {
+ @rc = &kne_buchungsexport($myconfig, $form);
} else {
- $rc = &kne_stammdatenexport($myconfig, $form);
+ @rc = &kne_stammdatenexport($myconfig, $form);
}
$main::lxdebug->leave_sub();
- return $rc;
+ return @rc;
}
-
sub obe_export {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form) = @_;
# connect to database
- my $dbh = $form->dbconnect_noauto($myconfig);
+ my $dbh = $form->dbconnect_noauto($myconfig);
$dbh->commit;
$dbh->disconnect;
$main::lxdebug->leave_sub();
@@ -108,326 +114,375 @@ sub get_dates {
$main::lxdebug->enter_sub();
my ($zeitraum, $monat, $quartal, $transdatefrom, $transdateto) = @_;
-
- $fromto="transdate >= ";
-
- my @a = localtime; $a[5] += 1900;
- $jahr=$a[5];
+
+ $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}."'";
+ 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."'";
+ 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."'";
+ $fromto .= "'" . $transdatefrom . "' and transdate <= '" . $transdateto . "'";
+ my ($yy, $mm, $dd) = $main::locale->parse_date(\%main::myconfig, $transdatefrom);
+ $jahr = $yy;
}
$main::lxdebug->leave_sub();
- return $fromto;
+ return ($fromto, $jahr);
}
-sub get_transactions {
+sub _get_transactions {
$main::lxdebug->enter_sub();
- my ($myconfig, $form, $fromto) = @_;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
-
- $fromto =~ s/transdate/ac\.transdate/g;
-
- $query = qq|SELECT taxkey, rate FROM tax|;
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
-
+ my $fromto = shift;
+
+ my $myconfig = \%main::myconfig;
+ my $form = $main::form;
+
+ my $dbh = $form->get_standard_dbh($myconfig);
+
+ my @errors = ();
+
+ $fromto =~ s/transdate/ac\.transdate/g;
+
+ my %taxes = selectall_as_map($form, $dbh, qq|SELECT id, rate FROM tax|, 'id', 'rate');
+
+ my $query =
+ qq|SELECT ac.oid, 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,
+ t.chart_id, t.rate, t.id AS taxid, t.taxkey AS taxtaxkey
+ FROM acc_trans ac,ar ar, customer ct, chart c
+ LEFT JOIN tax t ON (t.chart_id = c.id)
+ WHERE $fromto
+ AND (ac.trans_id = ar.id)
+ AND (ac.trans_id = ar.id)
+ AND (ar.customer_id = ct.id)
+ AND (ac.chart_id = c.id)
+
+ UNION ALL
+
+ SELECT ac.oid, 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,
+ t.chart_id, t.rate, t.id AS taxid, t.taxkey AS taxtaxkey
+ FROM acc_trans ac, ap ap, vendor ct, chart c
+ LEFT JOIN tax t ON (t.chart_id = c.id)
+ WHERE $fromto
+ AND (ac.trans_id = ap.id)
+ AND (ap.vendor_id = ct.id)
+ AND (ac.chart_id = c.id)
+
+ UNION ALL
+
+ SELECT ac.oid, 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,
+ t.chart_id, t.rate, t.id AS taxid, t.taxkey AS taxtaxkey
+ FROM acc_trans ac, gl gl, chart c
+ LEFT JOIN tax t ON (t.chart_id = c.id)
+ WHERE $fromto
+ AND (ac.trans_id = gl.id)
+ AND (ac.chart_id = c.id)
+
+ ORDER BY trans_id, oid|;
+
+ my $sth = prepare_execute_query($form, $dbh, $query);
+
+ my @splits;
+ my $counter = 0;
while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- $taxes{$ref->{taxkey}} = $ref->{rate};
- }
-
- $sth->finish();
-
- $query = qq|SELECT ac.oid, 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, t.chart_id, t.rate FROM acc_trans ac,ar ar, customer ct,
- chart c LEFT JOIN tax t ON
- (t.chart_id=c.id)WHERE $fromto AND ac.trans_id=ar.id AND ac.trans_id=ar.id
- AND ar.customer_id=ct.id AND ac.chart_id=c.id
- UNION ALL
- SELECT ac.oid, 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, t.chart_id, t.rate FROM acc_trans ac, ap ap, vendor ct, chart c LEFT JOIN tax t ON
- (t.chart_id=c.id)
- WHERE $fromto AND ac.trans_id=ap.id AND ap.vendor_id=ct.id AND ac.chart_id=c.id
- UNION ALL
- SELECT ac.oid, 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, t.chart_id, t.rate FROM acc_trans ac, gl gl,
- chart c LEFT JOIN tax t ON
- (t.chart_id=c.id) WHERE $fromto AND ac.trans_id=gl.id AND ac.chart_id=c.id
- ORDER BY trans_id, oid|;
-
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
- $i=0;
- $g=0;
- @splits;
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- $count=0;
- $firstrun = 1;
- $count += $ref->{amount};
- push @{ $i}, $ref;
- while (abs($count)> 0.01 || $firstrun) {
- $ref2 = $sth->fetchrow_hashref(NAME_lc);
+ $counter++;
+ if (($counter % 500) == 0) {
+ print("$counter ");
+ }
+
+ my $trans = [ $ref ];
+
+ my $count = $ref->{amount};
+ my $firstrun = 1;
+
+ while (abs($count) > 0.01 || $firstrun) {
+ my $ref2 = $sth->fetchrow_hashref(NAME_lc);
last unless ($ref2);
- $count += $ref2->{amount};
- push @{ $i}, $ref2;
- $firstrun = 0;
+
+ push @{ $trans }, $ref2;
+
+ $count += $ref2->{amount};
+ $firstrun = 0;
}
- $absumsatz = 0;
- if (scalar(@ {$i}) >2) {
- for my $j (0 .. (scalar(@ {$i}) -1)) {
- if (abs($i->[$j]->{'amount'}) > abs($absumsatz)) {
- $absumsatz = $i->[$j]->{'amount'};
- $notsplitindex = $j;
- }
+
+ my %taxid_taxkeys = ();
+ my $absumsatz = 0;
+ if (scalar(@{$trans}) <= 2) {
+ push @{ $form->{DATEV} }, $trans;
+ next;
+ }
+
+ for my $j (0 .. (scalar(@{$trans}) - 1)) {
+ if (abs($trans->[$j]->{'amount'}) > abs($absumsatz)) {
+ $absumsatz = $trans->[$j]->{'amount'};
+ $notsplitindex = $j;
}
- $ml = ($i->[0]->{'umsatz'} > 0) ? 1 : -1;
- for my $j (0 .. (scalar(@ {$i}) -1)) {
- if (($j != $notsplitindex) && ($i->[$j]->{'chart_id'} eq "") && ($i->[$j]->{'taxkey'} eq "" || $i->[$j]->{'taxkey'} eq "0" || $i->[$j]->{'taxkey'} eq "1" || $i->[$j]->{'taxkey'} eq "10" || $i->[$j]->{'taxkey'} eq "11")) {
- my %blubb = {};
- map({ $blubb{$_} = $i->[$notsplitindex]->{$_}; } keys(%{ $i->[$notsplitindex] }));
- $absumsatz += $i->[$j]->{'amount'};
- $blubb{'amount'} = $i->[$j]->{'amount'} * (-1);
- $blubb{'umsatz'} = abs($i->[$j]->{'amount'}) * $ml;
- $i->[$j]->{'umsatz'} = abs($i->[$j]->{'amount'}) * $ml;
- push @{$splits[$g]}, \%blubb; #$i->[$notsplitindex];
- push @{$splits[$g]}, $i->[$j];
- push @{ $form->{DATEV} }, \@{$splits[$g]};
- $g++;
- } elsif (($j != $notsplitindex) && ($i->[$j]->{'chart_id'} eq "")) {
- $absumsatz += ($i->[$j]->{'amount'} * (1 + $taxes{$i->[$j]->{'taxkey'}}));
- my %blubb = {};
- map({ $blubb{$_} = $i->[$notsplitindex]->{$_}; } keys(%{ $i->[$notsplitindex] }));
- $test = 1+ $taxes{$i->[$j]->{'taxkey'}};
- $blubb{'amount'} = $form->round_amount(($i->[$j]->{'amount'} * $test * -1),2);
-
- #print(STDERR $test, " Taxrate\n\n");
- $blubb{'umsatz'} = abs($form->round_amount(($i->[$j]->{'amount'} * $test),2)) *$ml;
-
- $i->[$j]->{'umsatz'} = abs($form->round_amount(($i->[$j]->{'amount'} * $test),2)) *$ml;
-
- #print(STDERR $i->[$j]->{'umsatz'}, " Steuer Umsatz\n");
- #print(STDERR $i->[$j]->{'amount'}, " Steuer Betrag\n");
- #print(STDERR $blubb{'umsatz'}, " Umsatz NOTSPLIT\n");
- push @{$splits[$g]}, \%blubb;
- push @{$splits[$g]}, $i->[$j];
- push @{ $form->{DATEV} }, \@{$splits[$g]};
- $g++;
- } else {
- next;
- }
+ if (($trans->[$j]->{'taxtaxkey'}) && ($trans->[$j]->{'taxid'})) {
+ $taxid_taxkeys{$trans->[$j]->{'taxtaxkey'}} = $trans->[$j]->{'taxid'};
}
- if (abs($absumsatz) > 0.01) {
- print(STDERR $absumsatz, "ABSAUMSATZ\n");
- $form->error("Datev-Export fehlgeschlagen!");
+ }
+
+ my $ml = ($trans->[0]->{'umsatz'} > 0) ? 1 : -1;
+ for my $j (0 .. (scalar(@{$trans}) - 1)) {
+ if ( ($j != $notsplitindex)
+ && ($trans->[$j]->{'chart_id'} eq "")
+ && ( $trans->[$j]->{'taxkey'} eq ""
+ || $trans->[$j]->{'taxkey'} eq "0"
+ || $trans->[$j]->{'taxkey'} eq "1"
+ || $trans->[$j]->{'taxkey'} eq "10"
+ || $trans->[$j]->{'taxkey'} eq "11")) {
+ my %new_trans = ();
+ map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };
+
+ $absumsatz += $trans->[$j]->{'amount'};
+ $new_trans{'amount'} = $trans->[$j]->{'amount'} * (-1);
+ $new_trans{'umsatz'} = abs($trans->[$j]->{'amount'}) * $ml;
+ $trans->[$j]->{'umsatz'} = abs($trans->[$j]->{'amount'}) * $ml;
+
+ push @splits, [ \%new_trans, $trans->[$j] ];
+ push @{ $form->{DATEV} }, $splits[-1];
+
+ } elsif (($j != $notsplitindex) && ($trans->[$j]->{'chart_id'} eq "")) {
+ $absumsatz += ($trans->[$j]->{'amount'} * (1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} }));
+
+ my %new_trans = ();
+ map { $new_trans{$_} = $trans->[$notsplitindex]->{$_}; } keys %{ $trans->[$notsplitindex] };
+
+ my $tax_rate = 1 + $taxes{ $taxid_taxkeys{$trans->[$j]->{'taxkey'}} };
+ $new_trans{'amount'} = $form->round_amount(($trans->[$j]->{'amount'} * $tax_rate * -1), 2);
+ $new_trans{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * $tax_rate), 2)) * $ml;
+ $trans->[$j]->{'umsatz'} = abs($form->round_amount(($trans->[$j]->{'amount'} * $tax_rate), 2)) * $ml;
+
+ push @splits, [ \%new_trans, $trans->[$j] ];
+ push @{ $form->{DATEV} }, $splits[-1];
}
- } else {
- push @{ $form->{DATEV} }, \@{ $i};
}
- $i++;
+
+ if (abs($absumsatz) > 0.01) {
+ push @errors, "Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz)\n";
+ }
}
- $sth->finish;
- $dbh->disconnect;
-
+
+ $sth->finish();
+
+ $form->error(join("
\n", @errors)) if (@errors);
+
$main::lxdebug->leave_sub();
}
sub make_kne_data_header {
$main::lxdebug->enter_sub();
- my ($myconfig, $form, $fromto) = @_;
-
+ my ($myconfig, $form, $fromto, $start_jahr) = @_;
+
# connect to database
my $dbh = $form->dbconnect($myconfig);
- my @a = localtime;
- $jahr=$a[5];
+ my $jahr = $start_jahr;
+ if (!$jahr) {
+ my @a = localtime;
+ $jahr = $a[5];
+ }
#Header
- $anwendungsnr = ($fromto) ? "\x31\x31" : "\x31\x33" ;
- while (length($form->{datentraegernr})<3) {
- $form->{datentraegernr}= "\x30".$form->{datentraegernr};
+ $anwendungsnr = ($fromto) ? "\x31\x31" : "\x31\x33";
+ while (length($form->{datentraegernr}) < 3) {
+ $form->{datentraegernr} = "\x30" . $form->{datentraegernr};
}
-
- $header="\x1D\x18\x31".$form->{datentraegernr}.$anwendungsnr;
- $dfvkz=$form->{dfvkz};
- while (length($dfvkz)<2) {
- $dfvkz = "\x30".$dfvkz;
+ $header = "\x1D\x18\x31" . $form->{datentraegernr} . $anwendungsnr;
+
+ $dfvkz = $form->{dfvkz};
+ while (length($dfvkz) < 2) {
+ $dfvkz = "\x30" . $dfvkz;
}
$header .= $dfvkz;
- $beraternr=$form->{beraternr};
- while (length($beraternr)<7) {
- $beraternr = "\x30".$beraternr;
+ $beraternr = $form->{beraternr};
+ while (length($beraternr) < 7) {
+ $beraternr = "\x30" . $beraternr;
}
$header .= $beraternr;
- $mandantennr=$form->{mandantennr};
- while (length($mandantennr)<5) {
- $mandantennr = "\x30".$mandantennr;
+ $mandantennr = $form->{mandantennr};
+ while (length($mandantennr) < 5) {
+ $mandantennr = "\x30" . $mandantennr;
}
$header .= $mandantennr;
- $abrechnungsnr=$form->{abrechnungsnr}.$jahr;
- while (length($abrechnungsnr)<6) {
- $abrechnungsnr = "\x30".$abrechnungsnr;
+ $abrechnungsnr = $form->{abrechnungsnr} . $jahr;
+ while (length($abrechnungsnr) < 6) {
+ $abrechnungsnr = "\x30" . $abrechnungsnr;
}
$header .= $abrechnungsnr;
$fromto =~ s/transdate|>=|and|\'|<=//g;
my ($from, $to) = split / /, $fromto;
$from =~ s/ //g;
- $to =~ s/ //g;
+ $to =~ s/ //g;
if ($from ne "") {
- my ($fday, $fmonth, $fyear) = split /\./, $from;
+ my ($fday, $fmonth, $fyear) = split(/\./, $from);
if (length($fmonth) < 2) {
- $fmonth = "0".$fmonth;
+ $fmonth = "0" . $fmonth;
}
if (length($fday) < 2) {
- $fday = "0".$fday;
+ $fday = "0" . $fday;
}
- $from = $fday.$fmonth.substr($fyear, -2, 2);
- } else {$from="";}
+ $from = $fday . $fmonth . substr($fyear, -2, 2);
+ } else {
+ $from = "";
+ }
$header .= $from;
if ($to ne "") {
- my ($tday, $tmonth, $tyear) = split /\./, $to;
- if (length($tmonth) <2) {
- $tmonth = "0".$tmonth;
+ my ($tday, $tmonth, $tyear) = split(/\./, $to);
+ if (length($tmonth) < 2) {
+ $tmonth = "0" . $tmonth;
}
- if (length($tday) <2) {
- $tday = "0".$tday;
+ if (length($tday) < 2) {
+ $tday = "0" . $tday;
}
- $to = $tday.$tmonth.substr($tyear, -2, 2);
- } else {$to="";}
+ $to = $tday . $tmonth . substr($tyear, -2, 2);
+ } else {
+ $to = "";
+ }
$header .= $to;
if ($fromto ne "") {
$primanota = "\x30\x30\x31";
$header .= $primanota;
}
- $passwort=$form->{passwort};
- while (length($passwort)<4) {
- $passwort = "\x30".$passwort;
+ $passwort = $form->{passwort};
+ while (length($passwort) < 4) {
+ $passwort = "\x30" . $passwort;
}
- $header .= $passwort;
+ $header .= $passwort;
$anwendungsinfo = "\x20" x 16;
$header .= $anwendungsinfo;
$inputinfo = "\x20" x 16;
$header .= $inputinfo;
-
+
$header .= "\x79";
-
+
#Versionssatz
- if ($form->{exporttype}==0) {
- $versionssatz= "\xB5"."1,";
+ if ($form->{exporttype} == 0) {
+ $versionssatz = "\xB5" . "1,";
} else {
- $versionssatz= "\xB6"."1,";}
-
-
+ $versionssatz = "\xB6" . "1,";
+ }
+
$query = qq| select accno from chart limit 1|;
- $sth=$dbh->prepare($query);
+ $sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
my $ref = $sth->fetchrow_hashref(NAME_lc);
-
+
$accnolength = $ref->{accno};
$sth->finish;
-
+
$versionssatz .= length($accnolength);
$versionssatz .= ",";
$versionssatz .= length($accnolength);
- $versionssatz .= ",SELF"."\x1C\x79";
-
+ $versionssatz .= ",SELF" . "\x1C\x79";
+
$dbh->disconnect;
$header .= $versionssatz;
@@ -441,23 +496,23 @@ sub datetofour {
$main::lxdebug->enter_sub();
my ($date, $six) = @_;
-
- ($day, $month, $year) = split /\./, $date;
+
+ ($day, $month, $year) = split(/\./, $date);
if ($day =~ /^0/) {
- $day = substr($day,1,1);
+ $day = substr($day, 1, 1);
}
- if (length($month) <2) {
- $month = "0".$month;
- }
- if (length($year) >2) {
+ if (length($month) < 2) {
+ $month = "0" . $month;
+ }
+ if (length($year) > 2) {
$year = substr($year, -2, 2);
}
-
+
if ($six) {
- $date= $day.$month.$year;
+ $date = $day . $month . $year;
} else {
- $date= $day.$month;
+ $date = $day . $month;
}
$main::lxdebug->leave_sub();
@@ -469,19 +524,19 @@ sub formatumsatz {
$main::lxdebug->enter_sub();
my ($umsatz, $stellen) = @_;
-
+
$umsatz =~ s/-//;
- ($vorkomma, $nachkomma) = split /\./, $umsatz;
- $umsatz="";
- if ($stellen>0) {
- for ($i=$stellen; $i >= $stellen+2 - length($vorkomma); $i--) {
- $umsatz .="0";
+ ($vorkomma, $nachkomma) = split(/\./, $umsatz);
+ $umsatz = "";
+ if ($stellen > 0) {
+ for ($i = $stellen; $i >= $stellen + 2 - length($vorkomma); $i--) {
+ $umsatz .= "0";
}
}
- for ($i=3; $i > length($nachkomma); $i--) {
+ for ($i = 3; $i > length($nachkomma); $i--) {
$nachkomma .= "0";
}
- $umsatz = $vorkomma.substr($nachkomma,0,2);
+ $umsatz = $vorkomma . substr($nachkomma, 0, 2);
$main::lxdebug->leave_sub();
@@ -492,23 +547,24 @@ sub make_ed_versionset {
$main::lxdebug->enter_sub();
my ($header, $filename, $blockcount, $fromto) = @_;
-
- $versionset="V".substr($filename,2,5);
- $versionset.=substr($header,6,22);
+
+ $versionset = "V" . substr($filename, 2, 5);
+ $versionset .= substr($header, 6, 22);
if ($fromto ne "") {
- $versionset.="0000".substr($header,28,19);
- } else { $datum= "\x20" x 16;
- $versionset .= $datum."001".substr($header,28,4);
- }
- while (length($blockcount) <5) {
- $blockcount= "0".$blockcount;
- }
- $versionset.=$blockcount;
- $versionset.="001";
- $versionset.="\x20\x31";
- $versionset.= substr($header,-12,10)." ";
- $versionset.= "\x20" x 53;
-
+ $versionset .= "0000" . substr($header, 28, 19);
+ } else {
+ $datum = "\x20" x 16;
+ $versionset .= $datum . "001" . substr($header, 28, 4);
+ }
+ while (length($blockcount) < 5) {
+ $blockcount = "0" . $blockcount;
+ }
+ $versionset .= $blockcount;
+ $versionset .= "001";
+ $versionset .= "\x20\x31";
+ $versionset .= substr($header, -12, 10) . " ";
+ $versionset .= "\x20" x 53;
+
$main::lxdebug->leave_sub();
return $versionset;
@@ -518,33 +574,32 @@ sub make_ev_header {
$main::lxdebug->enter_sub();
my ($form, $fileno) = @_;
- $datentraegernr=$form->{datentraegernr};
- $beraternummer=$form->{beraternr};
- $beratername=$form->{beratername};
- $anzahl_dateien=$fileno;
-
- while (length($datentraegernr) <3) {
- $datentraegernr.= " ";
- }
-
- while (length($beraternummer) <7) {
- $beraternummer.=" ";
- }
-
- while (length($beratername) <9) {
- $beratername.= " ";
- }
-
- while (length($anzahl_dateien) <5) {
- $anzahl_dateien = "0".$anzahl_dateien;
- }
-
-
- $ev_header=$datentraegernr."\x20\x20\x20".$beraternummer.$beratername."\x20";
- $ev_header.=$anzahl_dateien.$anzahl_dateien;
- $ev_header.= "\x20" x 95;
-
-
+ $datentraegernr = $form->{datentraegernr};
+ $beraternummer = $form->{beraternr};
+ $beratername = $form->{beratername};
+ $anzahl_dateien = $fileno;
+
+ while (length($datentraegernr) < 3) {
+ $datentraegernr .= " ";
+ }
+
+ while (length($beraternummer) < 7) {
+ $beraternummer .= " ";
+ }
+
+ while (length($beratername) < 9) {
+ $beratername .= " ";
+ }
+
+ while (length($anzahl_dateien) < 5) {
+ $anzahl_dateien = "0" . $anzahl_dateien;
+ }
+
+ $ev_header =
+ $datentraegernr . "\x20\x20\x20" . $beraternummer . $beratername . "\x20";
+ $ev_header .= $anzahl_dateien . $anzahl_dateien;
+ $ev_header .= "\x20" x 95;
+
$main::lxdebug->leave_sub();
return $ev_header;
@@ -554,300 +609,367 @@ sub kne_buchungsexport {
$main::lxdebug->enter_sub();
my ($myconfig, $form) = @_;
-
- my $export_path="datev/";
- my $filename="ED00000";
- my $evfile="EV01";
+
+ my @filenames;
+
+ my $export_path = $main::userspath . "/";
+ my $filename = "ED00000";
+ my $evfile = "EV01";
my @ed_versionsets;
- my $fileno=0;
-
- $fromto= &get_dates($form->{zeitraum}, $form->{monat}, $form->{quartal}, $form->{transdatefrom}, $form->{transdateto});
- &get_transactions($myconfig, $form, $fromto);
-
- while (scalar(@{ $form->{DATEV}})) {
- my $blockcount=1;
- my $remaining_bytes=256;
- my $total_bytes=256;
- my $umsatzsumme=0;
- my $buchungssatz = "";
+ my $fileno = 0;
+
+ $form->header;
+ print qq|
+
+