X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c4d3f82d744113e520282409454f4cc763e012cc..b231d037:/SL/DB/Helper/Payment.pm diff --git a/SL/DB/Helper/Payment.pm b/SL/DB/Helper/Payment.pm index 89fc6e453..c35b12c63 100644 --- a/SL/DB/Helper/Payment.pm +++ b/SL/DB/Helper/Payment.pm @@ -294,14 +294,11 @@ sub pay_invoice { if ( $datev_check ) { my $datev = SL::DATEV->new( - exporttype => DATEV_ET_BUCHUNGEN, - format => DATEV_FORMAT_KNE, dbh => $db->dbh, trans_id => $self->{id}, ); - $datev->clean_temporary_directories; - $datev->export; + $datev->generate_datev_data; if ($datev->errors) { # this exception should be caught by with_transaction, which handles the rollback @@ -640,7 +637,7 @@ sub get_payment_select_options_for_bank_transaction { if ( $open_amount && # invoice amount not 0 $self->skonto_date && # check whether skonto applies ( abs(abs($self->amount_less_skonto) - abs($bt->amount)) < 0.01 || - ( $bt->transaction_code eq "191" && abs($self->amount_less_skonto) < abs($bt->amount) )) && + ( abs($self->amount_less_skonto) < abs($bt->amount) )) && $self->check_skonto_configuration) { if ( $self->within_skonto_period($bt->transdate) ) { push(@options, { payment_type => 'without_skonto', display => t8('without skonto') });