X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDATEV.pm;h=c83112feac8a46affab33e50b53a193f8132b648;hb=3ac9bdcaf2633da20fc12464eddc946417689b48;hp=f53e9fcc92554d4a3c37591b72dab896710f85a3;hpb=d1731f0cf48fd1c43f75db5f55f9a710a81c21a3;p=kivitendo-erp.git
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index f53e9fcc9..c83112fea 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
@@ -83,17 +83,17 @@ sub kne_export {
$main::lxdebug->enter_sub();
my ($self, $myconfig, $form) = @_;
- my $rc;
+ my @rc;
if ($form->{exporttype} == 0) {
- $rc = &kne_buchungsexport($myconfig, $form);
+ @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 {
@@ -314,16 +314,12 @@ sub get_transactions {
$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] };
@@ -333,8 +329,7 @@ sub get_transactions {
}
}
if (abs($absumsatz) > 0.01) {
- print(STDERR $absumsatz, "ABSAUMSATZ\n");
- $form->error("Datev-Export fehlgeschlagen!");
+ $form->error("Datev-Export fehlgeschlagen! Bei Transaktion $i->[0]->{trans_id}\n");
}
} else {
push @{ $form->{DATEV} }, \@{$i};
@@ -396,7 +391,7 @@ sub make_kne_data_header {
$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;
}
@@ -411,7 +406,7 @@ sub make_kne_data_header {
$header .= $from;
if ($to ne "") {
- my ($tday, $tmonth, $tyear) = split /\./, $to;
+ my ($tday, $tmonth, $tyear) = split(/\./, $to);
if (length($tmonth) < 2) {
$tmonth = "0" . $tmonth;
}
@@ -475,7 +470,7 @@ sub datetofour {
my ($date, $six) = @_;
- ($day, $month, $year) = split /\./, $date;
+ ($day, $month, $year) = split(/\./, $date);
if ($day =~ /^0/) {
$day = substr($day, 1, 1);
@@ -504,7 +499,7 @@ sub formatumsatz {
my ($umsatz, $stellen) = @_;
$umsatz =~ s/-//;
- ($vorkomma, $nachkomma) = split /\./, $umsatz;
+ ($vorkomma, $nachkomma) = split(/\./, $umsatz);
$umsatz = "";
if ($stellen > 0) {
for ($i = $stellen; $i >= $stellen + 2 - length($vorkomma); $i--) {
@@ -588,12 +583,14 @@ sub kne_buchungsexport {
my ($myconfig, $form) = @_;
- my $export_path = "datev/";
+ my @filenames;
+
+ my $export_path = $main::userspath . "/";
my $filename = "ED00000";
my $evfile = "EV01";
my @ed_versionsets;
my $fileno = 0;
-
+
$form->header;
print qq|
@@ -616,13 +613,14 @@ sub kne_buchungsexport {
my $buchungssatz = "";
$filename++;
my $ed_filename = $export_path . $filename;
+ push(@filenames, $filename);
open(ED, "> $ed_filename") or die "can't open outputfile: $!\n";
$header = &make_kne_data_header($myconfig, $form, $fromto);
$remaining_bytes -= length($header);
while (scalar(@{ $form->{DATEV} }) > 0) {
- $transaction = shift @{ $form->{DATEV} };
- $trans_lines = scalar(@{$transaction});
+ $transaction = shift @{ $form->{DATEV} };
+ $trans_lines = scalar(@{$transaction});
$counter++;
if (($counter % 500) == 0) {
print("$counter ");
@@ -827,6 +825,7 @@ sub kne_buchungsexport {
#Make EV Verwaltungsdatei
$ev_header = &make_ev_header($form, $fileno);
$ev_filename = $export_path . $evfile;
+ push(@filenames, $evfile);
open(EV, "> $ev_filename") or die "can't open outputfile: EV01\n";
print(EV $ev_header);
@@ -834,11 +833,12 @@ sub kne_buchungsexport {
print(EV $ed_versionset[$file]);
}
close(EV);
-print qq|
Done.
-