X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=8c72d3cf99c518c96d0527808d5a0fb755a6007c;hb=98ccfccb26e831dd0a12dcae229eabb33744ed8b;hp=a39481b828c3c9ce7072091ab9c8381a7dedca76;hpb=b63cc1ed739e06f7fa526eecbf63e67a08fb348e;p=kivitendo-erp.git diff --git a/SL/AR.pm b/SL/AR.pm index a39481b82..8c72d3cf9 100644 --- a/SL/AR.pm +++ b/SL/AR.pm @@ -35,6 +35,7 @@ package AR; use Data::Dumper; +use SL::DATEV qw(:CONSTANTS); use SL::DBUtils; use SL::IO; use SL::MoreCommon; @@ -273,6 +274,27 @@ 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(); @@ -427,6 +449,7 @@ sub ar_transactions { qq| a.transaction_description, | . qq| pr.projectnumber AS globalprojectnumber, | . qq| c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | . + qq| c.id as customer_id, | . qq| e.name AS employee, | . qq| e2.name AS salesman, | . qq| tz.description AS taxzone, | . @@ -449,6 +472,10 @@ sub ar_transactions { qq|LEFT JOIN department d ON (d.id = a.department_id)|; my $where = "1 = 1"; + if ($form->{customernumber}) { + $where .= " AND c.customernumber = ?"; + push(@values, $form->{customernumber}); + } if ($form->{customer_id}) { $where .= " AND a.customer_id = ?"; push(@values, $form->{customer_id});