24 May 2012 13:07
Lx-Office ERP, branch master updated. release-2.7.0-128-g7e7a136
Sven Schöling <m.bunkus <at> linet-services.de>
2012-05-24 11:07:36 GMT
2012-05-24 11:07:36 GMT
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Lx-Office ERP".
The branch master has been updated
via 7e7a13692ac4dd952cf85a972d2919eed80edca1 (commit)
via 631b4c042a087595af1ee3af1fee4dc4dc2470ea (commit)
via 71180454c6f80037a7a2fa58a662b6b5cd4a67b1 (commit)
from 69a44d3b470358fcd7e473d38fb5dfd5c62c8b50 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e7a13692ac4dd952cf85a972d2919eed80edca1
Author: Sven Schöling <s.schoeling <at> linet-services.de>
Date: Thu May 24 12:34:04 2012 +0200
DATEV check in die 5 haupt buchungsmasken verlinkt
commit 631b4c042a087595af1ee3af1fee4dc4dc2470ea
Author: Sven Schöling <s.schoeling <at> linet-services.de>
Date: Thu May 24 12:56:25 2012 +0200
DATEV Export modular gekapselt.
commit 71180454c6f80037a7a2fa58a662b6b5cd4a67b1
Author: Sven Schöling <s.schoeling <at> linet-services.de>
Date: Thu May 24 12:32:52 2012 +0200
Spellchecks
-----------------------------------------------------------------------
Summary of changes:
SL/AP.pm | 22 +
SL/AR.pm | 22 +
SL/BP.pm | 2 +-
SL/DATEV.pm | 850 +++++++++++++++++++++------------
SL/DB/Order.pm | 2 +-
SL/GL.pm | 22 +
SL/IR.pm | 22 +
SL/IS.pm | 22 +
bin/mozilla/datev.pl | 103 +++--
config/lx_office.conf.default | 21 +
locale/de/all | 6 +-
t/006spellcheck.t | 3 +
t/datev/interface.t | 94 ++++
templates/webpages/datev/export3.html | 24 +
14 files changed, 853 insertions(+), 362 deletions(-)
create mode 100644 t/datev/interface.t
create mode 100644 templates/webpages/datev/export3.html
Full change list:
diff --git a/SL/AP.pm b/SL/AP.pm
index 3c29ca8..eda1e71 100644
--- a/SL/AP.pm
+++ b/SL/AP.pm
<at> <at> -34,6 +34,7 <at> <at>
package AP;
+use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
use SL::IO;
use SL::MoreCommon;
<at> <at> -353,6 +354,27 <at> <at> sub post_transaction {
IO->set_datepaid(table => 'ap', id => $form->{id}, dbh => $dbh);
+ # safety check datev export
+ if ($::lx_office_conf{datev_check}{check_on_ap_transaction}) {
+ my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
+ $transdate ||= DateTime->today;
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ dbh => $dbh,
+ from => $transdate,
+ to => $transdate,
+ );
+
+ $datev->export;
+
+ if ($datev->errors) {
+ $dbh->rollback;
+ die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+ }
+ }
+
if (!$provided_dbh) {
$dbh->commit();
$dbh->disconnect();
diff --git a/SL/AR.pm b/SL/AR.pm
index e1501b7..002041e 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
<at> <at> -35,6 +35,7 <at> <at>
package AR;
use Data::Dumper;
+use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
use SL::IO;
use SL::MoreCommon;
<at> <at> -273,6 +274,27 <at> <at> sub post_transaction {
IO->set_datepaid(table => 'ar', id => $form->{id}, dbh => $dbh);
+ # safety check datev export
+ if ($::lx_office_conf{datev_check}{check_on_ar_transaction}) {
+ my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
+ $transdate ||= DateTime->today;
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ dbh => $dbh,
+ from => $transdate,
+ to => $transdate,
+ );
+
+ $datev->export;
+
+ if ($datev->errors) {
+ $dbh->rollback;
+ die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+ }
+ }
+
my $rc = 1;
if (!$provided_dbh) {
$rc = $dbh->commit();
diff --git a/SL/BP.pm b/SL/BP.pm
index c8b4a3d..f7eaf2b 100644
--- a/SL/BP.pm
+++ b/SL/BP.pm
<at> <at> -196,7 +196,7 <at> <at> sub get_spoolfiles {
}
}
- if ($form->{type} =~ /(invoice|sales_order|sales_quotation|puchase_order|request_quotation|packing_list)$/) {
+ if ($form->{type} =~ /(invoice|sales_order|sales_quotation|purchase_order|request_quotation|packing_list)$/) {
if ($form->{transdatefrom}) {
$query .= " AND a.transdate >= ?";
push( <at> values, $form->{transdatefrom});
diff --git a/SL/DATEV.pm b/SL/DATEV.pm
index bfb48d0..bbdc9b5 100644
--- a/SL/DATEV.pm
+++ b/SL/DATEV.pm
<at> <at> -24,7 +24,7 <at> <at>
# Datev export module
#======================================================================
-package DATEV;
+package SL::DATEV;
use utf8;
use strict;
<at> <at> -34,15 +34,64 <at> <at> use SL::DATEV::KNEFile;
use SL::Taxkeys;
use Data::Dumper;
+use DateTime;
+use Exporter qw(import);
use File::Path;
-use List::Util qw(max);
+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 <at> export_constants = qw(DATEV_ET_BUCHUNGEN DATEV_ET_STAMM DATEV_FORMAT_KNE DATEV_FORMAT_OBE);
+our <at> EXPORT_OK = ( <at> export_constants);
+our %EXPORT_TAGS = (CONSTANTS => [ <at> export_constants ]);
+
+
+sub new {
+ my $class = shift;
+ my %data = <at> _;
+
+ my $obj = bless {}, $class;
+
+ $obj->$_($data{$_}) for keys %data;
+
+ $obj;
+}
+
+sub exporttype {
+ my $self = shift;
+ $self->{exporttype} = $_[0] if <at> _;
+ return $self->{exporttype};
+}
+
+sub has_exporttype {
+ defined $_[0]->{exporttype};
+}
+
+sub format {
+ my $self = shift;
+ $self->{format} = $_[0] if <at> _;
+ 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);
<at> <at> -51,14 +100,14 <at> <at> 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 = $::lx_office_conf{paths}->{userspath} . "/datev-export-${1}-${2}-${3}";
+ $path = $::lx_office_conf{paths}->{userspath} . "/datev-export-${1}-${2}-${3}/";
}
$main::lxdebug->leave_sub();
<at> <at> -66,7 +115,7 <at> <at> 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;
<at> <at> -81,11 +130,110 <at> <at> sub get_download_token_for_path {
return $token;
}
+sub download_token {
+ my $self = shift;
+ $self->{download_token} = $_[0] if <at> _;
+ return $self->{download_token} ||= _get_download_token_for_path($self->export_path);
+}
+
+sub export_path {
+ my ($self) = <at> _;
+
+ return $self->{export_path} ||= _get_path_for_download_token($self->{download_token}) || _get_export_path();
+}
+
+sub add_filenames {
+ my $self = shift;
+ push <at> { $self->{filenames} ||= [] }, <at> _;
+}
+
+sub filenames {
+ return <at> { $_[0]{filenames} || [] };
+}
+
+sub add_error {
+ my $self = shift;
+ push <at> { $self->{errors} ||= [] }, <at> _;
+}
+
+sub errors {
+ return <at> { $_[0]{errors} || [] };
+}
+
+sub add_net_gross_differences {
+ my $self = shift;
+ push <at> { $self->{net_gross_differences} ||= [] }, <at> _;
+}
+
+sub net_gross_differences {
+ return <at> { $_[0]{net_gross_differences} || [] };
+}
+
+sub sum_net_gross_differences {
+ return sum $_[0]->net_gross_differences;
+}
+
+sub from {
+ my $self = shift;
+
+ if ( <at> _) {
+ $self->{from} = $_[0];
+ }
+
+ return $self->{from};
+}
+
+sub to {
+ my $self = shift;
+
+ if ( <at> _) {
+ $self->{to} = $_[0];
+ }
+
+ return $self->{to};
+}
+
+sub accnofrom {
+ my $self = shift;
+
+ if ( <at> _) {
+ $self->{accnofrom} = $_[0];
+ }
+
+ return $self->{accnofrom};
+}
+
+sub accnoto {
+ my $self = shift;
+
+ if ( <at> _) {
+ $self->{accnoto} = $_[0];
+ }
+
+ return $self->{accnoto};
+}
+
+
+sub dbh {
+ my $self = shift;
+
+ if ( <at> _) {
+ $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($::lx_office_conf{paths}->{userspath} . "/datev-export-*")) {
- next unless (-d $path);
+ next unless -d $path;
my $mtime = (stat($path))[9];
next if ((time() - $mtime) < 8 * 60 * 60);
<at> <at> -93,7 +241,7 <at> <at> sub clean_temporary_directories {
rmtree $path;
}
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub _fill {
<at> <at> -120,225 +268,88 <at> <at> sub _fill {
}
sub get_datev_stamm {
- $main::lxdebug->enter_sub();
-
- my ($self, $myconfig, $form) = <at> _;
+ 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) = <at> _;
- my $query = qq|SELECT * FROM datev|;
- my $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 <at> columns = qw(beraternr beratername dfvkz mandantennr datentraegernr abrechnungsnr);
- map { $form->{$_} = $ref->{$_} } keys %$ref;
+ my $query = "INSERT INTO datev (" . join(', ', <at> columns) . ") VALUES (" . join(', ', ('?') x <at> columns) . ")";
+ do_query($::form, $self->dbh, $query, map { $data->{$_} } <at> 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) = <at> _;
+ my $result;
- my ($self, $myconfig, $form) = <at> _;
-
- # connect to database
- my $dbh = $form->dbconnect_noauto($myconfig);
-
- my $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|)|;
- my $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) = <at> _;
+ my ($self) = <at> _;
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) = <at> _;
-
- # 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) = <at> _;
- my ($fromto, $jahr, $leap);
-
- my $form = $main::form;
-
- $fromto = "transdate >= ";
-
- my <at> 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) = <at> _;
- $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 ($notsplitindex);
- my <at> errors = ();
-
- $form->{net_gross_differences} = [];
- $form->{sum_net_gross_differences} = 0;
$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,
<at> <at> -385,14 +396,14 <at> <at> sub _get_transactions {
ORDER BY trans_id, acc_trans_id|;
- my $sth = prepare_execute_query($form, $dbh, $query);
- $form->{DATEV} = [];
+ my $sth = prepare_execute_query($form, $self->dbh, $query);
+ $self->{DATEV} = [];
my $counter = 0;
while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
$counter++;
if (($counter % 500) == 0) {
- print("$counter ");
+ $progress_callback->($counter);
}
my $trans = [ $ref ];
<at> <at> -406,8 +417,8 <at> <at> sub _get_transactions {
last unless ($ref2);
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");
- ::end_of_request();
+ $self->add_error("Unbalanced ledger! old trans_id " . $trans->[0]->{trans_id} . " new trans_id " . $ref2->{trans_id} . " count $count");
+ return;
}
push <at> { $trans }, $ref2;
<at> <at> -437,7 +448,7 <at> <at> sub _get_transactions {
my %taxid_taxkeys = ();
my $absumsatz = 0;
if (scalar( <at> {$trans}) <= 2) {
- push <at> { $form->{DATEV} }, $trans;
+ push <at> { $self->{DATEV} }, $trans;
next;
}
<at> <at> -471,7 +482,7 <at> <at> sub _get_transactions {
$new_trans{'umsatz'} = abs($trans->[$j]->{'amount'}) * $ml;
$trans->[$j]->{'umsatz'} = abs($trans->[$j]->{'amount'}) * $ml;
- push <at> { $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+ push <at> { $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});
<at> <at> -500,8 +511,8 <at> <at> sub _get_transactions {
$absumsatz -= $rounded;
}
- push <at> { $form->{DATEV} }, [ \%new_trans, $trans->[$j] ];
- push <at> taxed, $form->{DATEV}->[-1];
+ push <at> { $self->{DATEV} }, [ \%new_trans, $trans->[$j] ];
+ push <at> taxed, $self->{DATEV}->[-1];
}
}
<at> <at> -545,92 +556,55 <at> <at> sub _get_transactions {
$absumsatz = $form->round_amount($absumsatz, 2);
if (abs($absumsatz) >= (0.01 * (1 + scalar <at> taxed))) {
- push <at> errors, "Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz)\n";
+ $self->add_error("Datev-Export fehlgeschlagen! Bei Transaktion $trans->[0]->{trans_id} ($absumsatz)");
} elsif (abs($absumsatz) >= 0.01) {
- push <at> { $form->{net_gross_differences} }, $absumsatz;
- $form->{sum_net_gross_differences} += $absumsatz;
+ $self->add_net_gross_differences($absumsatz);
}
}
$sth->finish();
- $form->error(join("<br>\n", <at> errors)) if ( <at> errors);
-
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub make_kne_data_header {
$main::lxdebug->enter_sub();
- my ($myconfig, $form, $fromto, $start_jahr) = <at> _;
+ my ($self, $form) = <at> _;
my ($primanota);
- my $jahr = $start_jahr;
- if (!$jahr) {
- my <at> 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 .= ",";
<at> <at> -683,12 +657,12 <at> <at> sub trim_leading_zeroes {
sub make_ed_versionset {
$main::lxdebug->enter_sub();
- my ($header, $filename, $blockcount, $fromto) = <at> _;
+ my ($self, $header, $filename, $blockcount) = <at> _;
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 {
my $datum = " " x 16;
<at> <at> -709,12 +683,14 <at> <at> sub make_ed_versionset {
sub make_ev_header {
$main::lxdebug->enter_sub();
- my ($form, $fileno) = <at> _;
+ my ($self, $form, $fileno) = <at> _;
+
+ my $stamm = $self->get_datev_stamm;
- my $ev_header = _fill($form->{datentraegernr}, 3, ' ', 'left');
+ 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;
<at> <at> -727,47 +703,39 <at> <at> sub make_ev_header {
sub kne_buchungsexport {
$main::lxdebug->enter_sub();
- my ($myconfig, $form) = <at> _;
+ my ($self) = <at> _;
+
+ my $form = $::form;
my <at> filenames;
- my $export_path = _get_export_path() . "/";
my $filename = "ED00000";
my $evfile = "EV01";
my <at> ed_versionset;
my $fileno = 0;
- $form->header;
- print qq|
- <html>
- <body>Export in Bearbeitung<br>
- Buchungssätze verarbeitet:
-|;
-
- my ($fromto, $start_jahr) =
- &get_dates($form->{zeitraum}, $form->{monat},
- $form->{quartal}, $form->{transdatefrom},
- $form->{transdateto});
- _get_transactions($fromto);
+ my $fromto = $self->fromto;
+
+ $self->_get_transactions($fromto);
+
+ return if $self->errors;
+
my $counter = 0;
- print qq|<br>2. Durchlauf:|;
- while (scalar( <at> { $form->{DATEV} })) {
+
+ while (scalar( <at> { $self->{DATEV} || [] })) {
my $umsatzsumme = 0;
$filename++;
- my $ed_filename = $export_path . $filename;
+ my $ed_filename = $self->export_path . $filename;
push( <at> filenames, $filename);
- my $header = &make_kne_data_header($myconfig, $form, $fromto, $start_jahr);
+ my $header = $self->make_kne_data_header($form);
my $kne_file = SL::DATEV::KNEFile->new();
$kne_file->add_block($header);
- while (scalar( <at> { $form->{DATEV} }) > 0) {
- my $transaction = shift <at> { $form->{DATEV} };
+ while (scalar( <at> { $self->{DATEV} }) > 0) {
+ my $transaction = shift <at> { $self->{DATEV} };
my $trans_lines = scalar( <at> {$transaction});
$counter++;
- if (($counter % 500) == 0) {
- print("$counter ");
- }
my $umsatz = 0;
my $gegenkonto = "";
<at> <at> -885,13 +853,13 <at> <at> sub kne_buchungsexport {
print(ED $kne_file->get_data());
close(ED);
- $ed_versionset[$fileno] = &make_ed_versionset($header, $filename, $kne_file->get_block_count(), $fromto);
+ $ed_versionset[$fileno] = $self->make_ed_versionset($header, $filename, $kne_file->get_block_count());
$fileno++;
}
#Make EV Verwaltungsdatei
- my $ev_header = &make_ev_header($form, $fileno);
- my $ev_filename = $export_path . $evfile;
+ my $ev_header = $self->make_ev_header($form, $fileno);
+ my $ev_filename = $self->export_path . $evfile;
push( <at> filenames, $evfile);
open(EV, ">", $ev_filename) or die "can't open outputfile: EV01\n";
print(EV $ev_header);
<at> <at> -900,29 +868,25 <at> <at> sub kne_buchungsexport {
print(EV $ed_versionset[$file]);
}
close(EV);
- print qq|<br>Done. <br>
-|;
###
+
+ $self->add_filenames( <at> filenames);
+
$main::lxdebug->leave_sub();
- return { 'download_token' => get_download_token_for_path($export_path), 'filenames' => \ <at> filenames };
+ return { 'download_token' => $self->download_token, 'filenames' => \ <at> filenames };
}
sub kne_stammdatenexport {
$main::lxdebug->enter_sub();
- my ($myconfig, $form) = <at> _;
- $form->{abrechnungsnr} = "99";
+ my ($self) = <at> _;
+ my $form = $::form;
- $form->header;
- print qq|
- <html>
- <body>Export in Bearbeitung<br>
-|;
+ $self->get_datev_stamm->{abrechnungsnr} = "99";
my <at> filenames;
- my $export_path = _get_export_path() . "/";
my $filename = "ED00000";
my $evfile = "EV01";
my <at> ed_versionset;
<at> <at> -933,26 +897,22 <at> <at> sub kne_stammdatenexport {
my $total_bytes = 256;
my $buchungssatz = "";
$filename++;
- my $ed_filename = $export_path . $filename;
+ my $ed_filename = $self->export_path . $filename;
push( <at> filenames, $filename);
open(ED, ">", $ed_filename) or die "can't open outputfile: $!\n";
- my $header = &make_kne_data_header($myconfig, $form, "");
+ my $header = $self->make_kne_data_header($form);
$remaining_bytes -= length($header);
my $fuellzeichen;
- our $fromto;
-
- # connect to database
- my $dbh = $form->dbconnect($myconfig);
my ( <at> where, <at> values) = ((), ());
- if ($form->{accnofrom}) {
+ if ($self->accnofrom) {
push <at> where, 'c.accno >= ?';
- push <at> values, $form->{accnofrom};
+ push <at> values, $self->accnofrom;
}
- if ($form->{accnoto}) {
+ if ($self->accnoto) {
push <at> where, 'c.accno <= ?';
- push <at> values, $form->{accnoto};
+ push <at> values, $self->accnoto;
}
my $where_str = <at> where ? ' WHERE ' . join(' AND ', map { "($_)" } <at> where) : '';
<at> <at> -962,7 +922,7 <at> <at> sub kne_stammdatenexport {
$where_str
ORDER BY c.accno|;
- my $sth = $dbh->prepare($query);
+ my $sth = $self->dbh->prepare($query);
$sth->execute( <at> values) || $form->dberror($query);
while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
<at> <at> -1002,10 +962,10 <at> <at> sub kne_stammdatenexport {
#Make EV Verwaltungsdatei
$ed_versionset[0] =
- &make_ed_versionset($header, $filename, $blockcount, $fromto);
+ $self->make_ed_versionset($header, $filename, $blockcount);
- my $ev_header = &make_ev_header($form, $fileno);
- my $ev_filename = $export_path . $evfile;
+ my $ev_header = $self->make_ev_header($form, $fileno);
+ my $ev_filename = $self->export_path . $evfile;
push( <at> filenames, $evfile);
open(EV, ">", $ev_filename) or die "can't open outputfile: EV01\n";
print(EV $ev_header);
<at> <at> -1015,15 +975,277 <at> <at> sub kne_stammdatenexport {
}
close(EV);
- $dbh->disconnect;
- ###
-
- print qq|<br>Done. <br>
-|;
+ $self->add_filenames( <at> filenames);
$main::lxdebug->leave_sub();
- return { 'download_token' => get_download_token_for_path($export_path), 'filenames' => \ <at> filenames };
+ return { 'download_token' => $self->download_token, 'filenames' => \ <at> filenames };
+}
+
+sub DESTROY {
+ clean_temporary_directories();
}
1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::DATEV - Lx-Office DATEV Export module
+
+=head1 SYNOPSIS
+
+ use SL::DATEV qw(:CONSTANTS);
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ from => $startdate,
+ to => $enddate,
+ );
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_STAMM,
+ format => DATEV_FORMAT_KNE,
+ accnofrom => $start_account_number,
+ accnoto => $end_account_number,
+ );
+
+ # get or set datev stamm
+ my $hashref = $datev->get_datev_stamm;
+ $datev->save_datev_stamm($hashref);
+
+ # manually clean up temporary directories
+ $datev->clean_temporary_directories;
+
+ # export
+ $datev->export;
+
+ if ($datev->errors) {
+ die join "\n", $datev->error;
+ }
+
+ # get relevant data for saving the export:
+ my $dl_token = $datev->download_token;
+ my $path = $datev->export_path;
+ my <at> files = $datev->filenames;
+
+ # retrieving an export at a later time
+ my $datev = SL::DATEV->new(
+ download_token => $dl_token_from_user,
+ );
+
+ my $path = $datev->export_path;
+ my <at> files = glob("$path/*");
+
+=head1 DESCRIPTION
+
+This module implements the DATEV export standard. For usage see above.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item new PARAMS
+
+Generic constructor. See section attributes for information about hat to pass.
+
+=item get_datev_stamm
+
+Loads DATEV Stammdaten and returns as hashref.
+
+=item save_datev_stamm HASHREF
+
+Saves DATEV Stammdaten from provided hashref.
+
+=item exporttype
+
+See L<CONSTANTS> for possible values
+
+=item has_exporttype
+
+Returns true if an exporttype has been set. Without exporttype most report functions won't work.
+
+=item format
+
+Specifies the designated format of the export. Currently only KNE export is implemented.
+
+See L<CONSTANTS> for possible values
+
+=item has_format
+
+Returns true if a format has been set. Without format most report functions won't work.
+
+=item download_token
+
+Returns a download token for this DATEV object.
+
+Note: If either a download_token or export_path were set at the creation these are infered, otherwise randomly generated.
+
+=item export_path
+
+Returns an export_path for this DATEV object.
+
+Note: If either a download_token or export_path were set at the creation these are infered, otherwise randomly generated.
+
+=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.
+
+=item net_gross_differences
+
+If there were any net gross differences during calculation they will be collected here.
+
+=item sum_net_gross_differences
+
+Sum of all differences.
+
+=item clean_temporary_directories
+
+Forces a garbage collection on previous exports which will delete all exports that are older than 8 hours. It will be automatically called on destruction of the object, but is advised to be called manually before delivering results of an export to the user.
+
+=item errors
+
+Returns a list of errors that occured. If no errors occured, the export was a success.
+
+=item export
+
+Exports data. You have to have set L<exporttype> and L<format> or an error will
+occur. OBE exports are currently not implemented.
+
+=back
+
+=head1 ATTRIBUTES
+
+This is a list of attributes set in either the C<new> or a method of the same name.
+
+=over 4
+
+=item dbh
+
+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.
+
+=item exporttype
+
+See L<CONSTANTS> for possible values. This MUST be set before export is called.
+
+=item format
+
+See L<CONSTANTS> for possible values. This MUST be set before export is called.
+
+=item download_token
+
+Can be set on creation to retrieve a prior export for download.
+
+=item from
+
+=item to
+
+Set boundary dates for the export. Currently thse MUST be set for the export to work.
+
+=item accnofrom
+
+=item accnoto
+
+Set boundary account numbers for the export. Only useful for a stammdaten export.
+
+=back
+
+=head1 CONSTANTS
+
+=head2 Supplied to L<exporttype>
+
+=over 4
+
+=item DATEV_ET_BUCHUNGEN
+
+=item DATEV_ET_STAMM
+
+=back
+
+=head2 Supplied to L<format>.
+
+=over 4
+
+=item DATEV_FORMAT_KNE
+
+=item DATEV_FORMAT_OBE
+
+=back
+
+=head1 ERROR HANDLING
+
+This module will die in the following cases:
+
+=over 4
+
+=item *
+
+No or unrecognized exporttype or format was provided for an export
+
+=item *
+
+OBE rxport was called, which is not yet implemented.
+
+=item *
+
+general I/O errors
+
+=back
+
+Errors that occur during th actual export will be collected in L<errors>. The following types can occur at the moment:
+
+=over 4
+
+=item *
+
+C<Unbalanced Ledger!>. Exactly that, your ledger is unbalanced. Should never occur.
+
+=item *
+
+C<Datev-Export fehlgeschlagen! Bei Transaktion %d (%f).> This error occurs if a
+transaction could not be reliably sorted out, or had rounding errors over the acceptable threshold.
+
+=back
+
+=head1 BUGS AND CAVEATS
+
+=over 4
+
+=item *
+
+Handling of Vollvorlauf is currently not fully implemented. You must provide both from and to to get a working export.
+
+=item *
+
+OBE export is currently not implemented.
+
+=back
+
+=head1 TODO
+
+- handling of export_path and download token is a bit dodgy, clean that up.
+
+=head1 SEE ALSO
+
+L<SL::DATEV::KNEFile>
+
+=head1 AUTHORS
+
+Philip Reetz E<lt>p.reetz <at> linet-services.deE<gt>,
+
+Moritz Bunkus E<lt>m.bunkus <at> linet-services.deE<gt>,
+
+Jan Büren E<lt>jan <at> lx-office-hosting.deE<gt>,
+
+Geoffrey Richardson E<lt>information <at> lx-office-hosting.deE<gt>,
+
+Sven Schöling E<lt>s.schoeling <at> linet-services.deE<gt>,
+
+Stephan Köhler
+
+=cut
diff --git a/SL/DB/Order.pm b/SL/DB/Order.pm
index 8212a64..6a9977b 100644
--- a/SL/DB/Order.pm
+++ b/SL/DB/Order.pm
<at> <at> -155,7 +155,7 <at> <at> sub number {
my %number_method = (
sales_order => 'ordnumber',
sales_quotation => 'quonumber',
- puchase_order => 'ordnumber',
+ purchase_order => 'ordnumber',
request_quotation => 'quonumber',
);
diff --git a/SL/GL.pm b/SL/GL.pm
index f538bc3..cdd9d40 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
<at> <at> -39,6 +39,7 <at> <at>
package GL;
use Data::Dumper;
+use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
use strict;
<at> <at> -184,6 +185,27 <at> <at> sub post_transaction {
do_query($form, $dbh, qq|UPDATE gl SET storno = 't' WHERE id = ?|, conv_i($form->{storno_id}));
}
+ # safety check datev export
+ if ($::lx_office_conf{datev_check}{check_on_gl_transaction}) {
+ my $transdate = $::form->{transdate} ? DateTime->from_lxoffice($::form->{transdate}) : undef;
+ $transdate ||= DateTime->today;
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ dbh => $dbh,
+ from => $transdate,
+ to => $transdate,
+ );
+
+ $datev->export;
+
+ if ($datev->errors) {
+ $dbh->rollback;
+ die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+ }
+ }
+
# commit and redirect
my $rc = $dbh->commit;
$dbh->disconnect;
diff --git a/SL/IR.pm b/SL/IR.pm
index edf55f1..d8569ac 100644
--- a/SL/IR.pm
+++ b/SL/IR.pm
<at> <at> -38,6 +38,7 <at> <at> use SL::AM;
use SL::ARAP;
use SL::Common;
use SL::CVar;
+use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
use SL::DO;
use SL::GenericTranslations;
<at> <at> -683,6 +684,27 <at> <at> sub post_invoice {
'arap_id' => $form->{id},
'table' => 'ap',);
+ # safety check datev export
+ if ($::lx_office_conf{datev_check}{check_on_purchase_invoice}) {
+ my $transdate = $::form->{invdate} ? DateTime->from_lxoffice($::form->{invdate}) : undef;
+ $transdate ||= DateTime->today;
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ dbh => $dbh,
+ from => $transdate,
+ to => $transdate,
+ );
+
+ $datev->export;
+
+ if ($datev->errors) {
+ $dbh->rollback;
+ die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+ }
+ }
+
my $rc = 1;
if (!$provided_dbh) {
$rc = $dbh->commit();
diff --git a/SL/IS.pm b/SL/IS.pm
index 0c3b4c8..d6acb2b 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
<at> <at> -40,6 +40,7 <at> <at> use SL::AM;
use SL::ARAP;
use SL::CVar;
use SL::Common;
+use SL::DATEV qw(:CONSTANTS);
use SL::DBUtils;
use SL::DO;
use SL::GenericTranslations;
<at> <at> -1080,6 +1081,27 <at> <at> sub post_invoice {
'arap_id' => $form->{id},
'table' => 'ar',);
+ # safety check datev export
+ if ($::lx_office_conf{datev_check}{check_on_sales_invoice}) {
+ my $transdate = $::form->{invdate} ? DateTime->from_lxoffice($::form->{invdate}) : undef;
+ $transdate ||= DateTime->today;
+
+ my $datev = SL::DATEV->new(
+ exporttype => DATEV_ET_BUCHUNGEN,
+ format => DATEV_FORMAT_KNE,
+ dbh => $dbh,
+ from => $transdate,
+ to => $transdate,
+ );
+
+ $datev->export;
+
+ if ($datev->errors) {
+ $dbh->rollback;
+ die join "\n", $::locale->text('DATEV check returned errors:'), $datev->errors;
+ }
+ }
+
my $rc = 1;
$dbh->commit if !$provided_dbh;
diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index f3dbc2e..097b5d7 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
<at> <at> -29,7 +29,7 <at> <at> use POSIX qw(strftime getcwd);
use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
use SL::Common;
-use SL::DATEV;
+use SL::DATEV qw(:CONSTANTS);
use strict;
<at> <at> -45,9 +45,10 <at> <at> sub export {
$::lxdebug->enter_sub;
$::auth->assert('datev_export');
- DATEV->get_datev_stamm(\%::myconfig, $::form);
+ my $stamm = SL::DATEV->new->get_datev_stamm;
+
$::form->header;
- print $::form->parse_html_template('datev/export');
+ print $::form->parse_html_template('datev/export', $stamm);
$::lxdebug->leave_sub;
}
<at> <at> -85,48 +86,41 <at> <at> sub export_stammdaten {
}
sub export3 {
- $main::lxdebug->enter_sub();
-
- my $form = $main::form;
- my %myconfig = %main::myconfig;
- my $locale = $main::locale;
-
- $main::auth->assert('datev_export');
-
- DATEV::clean_temporary_directories();
-
- DATEV->save_datev_stamm(\%myconfig, \%$form);
+ $::lxdebug->enter_sub;
+ $::auth->assert('datev_export');
- my $link = "datev.pl?action=download&download_token=";
+ my %data = (
+ exporttype => $::form->{exporttype} ? DATEV_ET_STAMM : DATEV_ET_BUCHUNGEN,
+ format => $::form->{kne} ? DATEV_FORMAT_KNE : DATEV_FORMAT_OBE,
+ );
+
+ if ($::form->{exporttype} == DATEV_ET_STAMM) {
+ $data{accnofrom} = $::form->{accnofrom},
+ $data{accnoto} = $::form->{accnoto},
+ } elsif ($::form->{exporttype} == DATEV_ET_BUCHUNGEN) {
+ <at> data{qw(from to)} = _get_dates(
+ $::form->{zeitraum}, $::form->{monat}, $::form->{quartal},
+ $::form->{transdatefrom}, $::form->{transdateto},
+ );
+ } else {
+ die 'invalid exporttype';
+ }
- if ($form->{kne}) {
- my $result = DATEV->kne_export(\%myconfig, \%$form);
- if ($result && <at> { $result->{filenames} }) {
- $link .= Q($result->{download_token});
+ my $datev = SL::DATEV->new(%data);
- print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br><br><a href="$link">Download</a>|);
+ $datev->clean_temporary_directories;
+ $datev->save_datev_stamm($::form);
- print $form->parse_html_template('datev/net_gross_difference') if <at> { $form->{net_gross_differences} };
+ $datev->export;
- } else {
- $form->error("KNE-Export schlug fehl.");
- }
+ if (!$datev->errors) {
+ $::form->header;
+ print $::form->parse_html_template('datev/export3', { datev => $datev });
} else {
- # OBE-Export nicht implementiert.
-
- # my <at> filenames = DATEV->obe_export(\%myconfig, \%$form);
- # if ( <at> filenames) {
- # print(qq|<br><b>| . $locale->text('OBE-Export erfolgreich!') . qq|</b><br>|);
- # $link .= "&filenames=" . $form->escape(join(":", <at> filenames));
- # print(qq|<br><a href="$link">Download</a>|);
- # } else {
- # $form->error("OBE-Export schlug fehl.");
- # }
+ $::form->error("Export schlug fehl.\n" . join "\n", $datev->errors);
}
- print("</body></html>");
-
- $main::lxdebug->leave_sub();
+ $::lxdebug->leave_sub;
}
sub download {
<at> <at> -135,14 +129,16 <at> <at> sub download {
my $form = $main::form;
my $locale = $main::locale;
- $main::auth->assert('datev_export');
+ $::auth->assert('datev_export');
my $tmp_name = Common->tmpname();
my $zip_name = strftime("kivitendo-datev-export-%Y%m%d.zip", localtime(time()));
my $cwd = getcwd();
- my $path = DATEV::get_path_for_download_token($form->{download_token});
+ my $datev = SL::DATEV->new(download_token => $form->{download_token});
+
+ my $path = $datev->export_path;
if (!$path) {
$form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
}
<at> <at> -153,7 +149,6 <at> <at> sub download {
if (! <at> filenames) {
chdir($cwd);
- DATEV::clean_temporary_directories();
$form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
}
<at> <at> -175,7 +170,31 <at> <at> sub download {
unlink($tmp_name);
- DATEV::clean_temporary_directories();
-
$main::lxdebug->leave_sub();
}
+
+sub _get_dates {
+ $::lxdebug->enter_sub;
+
+ my ($mode, $month, $quarter, $transdatefrom, $transdateto) = <at> _;
+ my ($fromdate, $todate);
+
+ if ($mode eq "monat") {
+ $fromdate = DateTime->new(day => 1, month => $month, year => DateTime->today->year);
+ $todate = $fromdate->clone->add(months => 1)->add(days => -1);
+ } elsif ($mode eq "quartal") {
+ die 'quarter out of of bounds' if $quarter < 1 || $quarter > 4;
+ $fromdate = DateTime->new(day => 1, month => (3 * $quarter - 2), year => DateTime->today->year);
+ $todate = $fromdate->clone->add(months => 3)->add(days => -1);
+ } elsif ($mode eq "zeit") {
+ $fromdate = DateTime->from_lxoffice($transdatefrom);
+ $todate = DateTime->from_lxoffice($transdateto);
+ die 'need from and to time' unless $fromdate && $todate;
+ } else {
+ die 'undefined interval mode';
+ }
+
+ $::lxdebug->leave_sub;
+
+ return ($fromdate, $todate);
+}
diff --git a/config/lx_office.conf.default b/config/lx_office.conf.default
index 396c576..53bacff 100644
--- a/config/lx_office.conf.default
+++ b/config/lx_office.conf.default
<at> <at> -163,6 +163,27 <at> <at> email_subject = Benachrichtigung: automatisch erstellte Rechnungen
# The template file used for the email's body.
email_template = templates/webpages/oe/periodic_invoices_email.txt
+[datev_check]
+# it is possible to make a quick DATEV export everytime you post a record to ensure things
+# work nicely with their data requirements. This will result in a slight overhead though
+# you can enable this for each type of record independantly.
+
+# check when a sales invoice or a payment for a sales invoice is posted
+check_on_sales_invoice = 0
+# check when a purchase invoice or a payment for a purchase invoice is posted
+check_on_purchase_invoice = 0
+# check when an ar transaction is posted
+check_on_ar_transaction = 0
+# check when an ap transaction is posted
+check_on_ap_transaction = 0
+# check when a gl transaction is posted
+check_on_gl_transaction = 0
+
+# not implemented yet:
+#check_on_cash_and_receipt = 0
+#check_on_dunning = 0
+#check_on_sepa_import = 0
+
[console]
# autologin to use if none is given
login =
diff --git a/locale/de/all b/locale/de/all
index 7b16fc0..9e1d62a 100644
--- a/locale/de/all
+++ b/locale/de/all
<at> <at> -523,6 +523,7 <at> <at> $self->{texts} = {
'DATEV - Export Assistent' => 'DATEV-Exportassistent',
'DATEV Angaben' => 'DATEV-Angaben',
'DATEV Export' => 'DATEV-Export',
+ 'DATEV check returned errors:' => 'Die DATEV Prüfung dieser Buchung ergab Fehler:',
'DATEX - Export Assistent' => 'DATEV-Exportassistent',
'DELETED' => 'Gelöscht',
'DFV-Kennzeichen' => 'DFV-Kennzeichen',
<at> <at> -593,11 +594,8 <at> <at> $self->{texts} = {
'Delivery Order created' => 'Lieferschein erstellt',
'Delivery Order deleted!' => 'Lieferschein gelöscht!',
'Delivery Orders' => 'Lieferscheine',
- 'Delivery Orders for this document' => 'Lieferscheine für dieses Dokument',
'Delivery Plan' => 'Lieferplan',
'Delivery Plan for currently outstanding sales orders' => 'Lieferplan für offene Verkaufsaufträge',
- 'Delivery information deleted.' => 'Lieferinformation gelöscht.',
- 'Delivery information saved.' => 'Lieferinformation gespeichert.',
'Department' => 'Abteilung',
'Department 1' => 'Abteilung (1)',
'Department 2' => 'Abteilung (2)',
<at> <at> -1142,6 +1140,7 <at> <at> $self->{texts} = {
'Missing amount' => 'Fehlbetrag',
'Missing parameter #1 in call to sub #2.' => 'Fehlernder Parameter \'#1\' in Funktionsaufruf \'#2\'.',
'Missing parameter (at least one of #1) in call to sub #2.' => 'Fehlernder Parameter (mindestens einer aus \'#1\') in Funktionsaufruf \'#2\'.',
+ 'Missing qty' => '',
'Missing taxkeys in invoices with taxes.' => 'Fehlende Steuerschlüssel in Rechnungen mit Steuern',
'Missing user id!' => 'Benutzer ID fehlt!',
'Mitarbeiter' => 'Mitarbeiter',
<at> <at> -1250,7 +1249,6 <at> <at> $self->{texts} = {
'Number pages' => 'Seiten nummerieren',
'Number variables: \'PRECISION=n\' forces numbers to be shown with exactly n decimal places.' => 'Zahlenvariablen: Mit \'PRECISION=n\' erzwingt man, dass Zahlen mit n Nachkommastellen formatiert werden.',
'OB Transaction' => 'EB-Buchung',
- 'OBE-Export erfolgreich!' => 'OBE-Export erfolgreich!',
'Objects have been imported.' => 'Objekte wurden importiert.',
'Obsolete' => 'Ungültig',
'Oct' => 'Okt',
diff --git a/t/006spellcheck.t b/t/006spellcheck.t
index 600460c..0a332ff 100644
--- a/t/006spellcheck.t
+++ b/t/006spellcheck.t
<at> <at> -41,6 +41,9 <at> <at> paramater
varsion
fomr
puhs
+invoce
+CONTANTS
+puchase
);
$testcount = scalar( <at> Support::Files::testitems);
diff --git a/t/datev/interface.t b/t/datev/interface.t
new file mode 100644
index 0000000..61a4eff
--- /dev/null
+++ b/t/datev/interface.t
<at> <at> -0,0 +1,94 <at> <at>
+use strict;
+use Test::More;
+use Test::Deep ();
+
+use lib 't';
+
+use_ok 'Support::TestSetup';
+use SL::DATEV qw(:CONSTANTS);
+use DateTime;
+
+Support::TestSetup::login();
+
+# first, test all the accessors
+my $d = new_ok('SL::DATEV' => [], 'new without params');
+
+# export_type
+ok(!$d->has_exporttype, 'no exporttype');
+is($d->exporttype(DATEV_ET_BUCHUNGEN), DATEV_ET_BUCHUNGEN, 'set exporttype');
+is($d->exporttype, DATEV_ET_BUCHUNGEN, 'get exporttype');
+ok($d->has_exporttype, 'now exporttype');
+
+# export_path/download_token
+ok(!$d->has_format, 'no format');
+is($d->format(DATEV_FORMAT_KNE), DATEV_FORMAT_KNE, 'set format');
+is($d->format, DATEV_FORMAT_KNE, 'get format');
+ok($d->has_format, 'now format');
+
+# check if autogenerated download token work work
+ok($d->export_path, 'auto generated export path');
+ok($d->download_token, 'auto generated download token');
+
+my $export_path = $d->export_path;
+my $download_token = $d->download_token;
+
+# see if that's roundtrip safe
+$d = new_ok('SL::DATEV' => [ download_token => $download_token ], 'new with dl token');
+
+is($d->download_token, $download_token, 'previously set download token');
+is($d->export_path, $export_path, 'export path from download token');
+
+
+# array attributes
+Test::Deep::cmp_deeply([$d->filenames], [], 'init filenames');
+is($d->add_filenames(qw(a b c)), 3, 'add filenames');
+Test::Deep::cmp_deeply([$d->filenames], [qw(a b c)], 'get filenames');
+
+Test::Deep::cmp_deeply([$d->errors], [], 'init errors');
+is($d->add_error(qw(a b c)), 3, 'add error');
+Test::Deep::cmp_deeply([$d->errors], [qw(a b c)], 'get errors');
+
+Test::Deep::cmp_deeply([$d->net_gross_differences], [], 'init net_gross_differences');
+is($d->add_net_gross_differences(qw(1 2 3)), 3, 'add net_gross_differences');
+Test::Deep::cmp_deeply([$d->net_gross_differences], [qw(1 2 3)], 'get net_gross_differences');
+is($d->sum_net_gross_differences, 6, 'sum net_gross_differences');
+
+
+#get/set attributes
+
+is($d->from, undef, 'init from');
+is($d->from(DateTime->today), DateTime->today, 'set from');
+is($d->from, DateTime->today, 'get from');
+
+is($d->to, undef, 'init to');
+is($d->to(DateTime->today), DateTime->today, 'set to');
+is($d->to, DateTime->today, 'get to');
+
+is($d->accnofrom, undef, 'init accnofrom');
+is($d->accnofrom('3400'), '3400', 'set accnofrom');
+is($d->accnofrom, '3400', 'get accnofrom');
+
+is($d->accnoto, undef, 'init accnoto');
+is($d->accnoto('3400'), '3400', 'set accnoto');
+is($d->accnoto, '3400', 'get accnoto');
+
+# dbh handling
+is($d->dbh, $::form->get_standard_dbh, 'init dbh');
+ok(!$d->provided_dbh, 'no dbh provided');
+
+my $other_dbh = $::form->get_standard_dbh->clone;
+
+$d = new_ok('SL::DATEV' => [ dbh => $other_dbh ], 'new with dbh');
+isnt($d->dbh, $::form->get_standard_dbh, 'now a different dbh');
+ok($d->provided_dbh, 'now got some provided dbh');
+
+
+$d = new_ok('SL::DATEV' => [], 'another clean one');
+is($d->fromto, undef, 'if no from or to -> fromto undef');
+
+# TODO:error handling. test that stuff dies if it has to
+
+done_testing();
+
+
+1;
diff --git a/templates/webpages/datev/export3.html b/templates/webpages/datev/export3.html
new file mode 100644
index 0000000..86c3099
--- /dev/null
+++ b/templates/webpages/datev/export3.html
<at> <at> -0,0 +1,24 <at> <at>
+[%- USE T8 %]
+[%- USE HTML %]
+<html>
+<body>
+ Export in Bearbeitung<br>
+
+ <br>
+ Done.
+ <br>
+
+ <br><b>[% 'KNE-Export erfolgreich!' | $T8 %]</b>
+ <br>
+ <br>
+ <a href="datev.pl?action=download&download_token=[% datev.download_token | html %]">Download</a>
+
+[% IF datev.net_gross_differences.size %]
+[% INCLUDE 'datev/net_gross_difference'
+ net_gross_differences = datev.net_gross_differences,
+ sum_net_gross_differences = datev.sum_net_gross_differences
+%]
+[% END %]
+
+</body>
+</html>
hooks/post-receive
--
--
Lx-Office ERP
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Lx-office-svn mailing list
Lx-office-svn <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lx-office-svn
RSS Feed