X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/031566ec011c921c54d114a122181e2418025619..a695cc30eec6422260f0e9a9b00bbc209649d212:/SL/Controller/BankTransaction.pm diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm index 6b51c2463..5dea0c55f 100644 --- a/SL/Controller/BankTransaction.pm +++ b/SL/Controller/BankTransaction.pm @@ -28,7 +28,6 @@ use SL::DBUtils qw(like); use List::UtilsBy qw(partition_by); use List::MoreUtils qw(any); -use List::MoreUtils qw(any none); use List::Util qw(max); use Rose::Object::MakeMethods::Generic @@ -129,7 +128,8 @@ sub action_list { $open_invoice->{skonto_type} = 'without_skonto'; foreach (@{ $sepa_export_items_by_id{ $open_invoice->id } || [] }) { my $factor = ($_->ar_id == $open_invoice->id ? 1 : -1); - $open_invoice->{realamount} = $::form->format_sellprice($open_invoice->amount*$factor); + $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2); + $open_invoice->{skonto_type} = $_->payment_type; $sepa_exports{$_->sepa_export_id} ||= { count => 0, is_ar => 0, amount => 0, proposed => 0, invoices => [], item => $_ }; $sepa_exports{$_->sepa_export_id}->{count}++; @@ -182,7 +182,9 @@ sub action_list { # score is stored in $bt->{agreement} foreach my $open_invoice (@all_open_invoices) { - ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice); + ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice, + sepa_export_items => $all_open_sepa_export_items, + ); $open_invoice->{realamount} = $::form->format_amount(\%::myconfig, $open_invoice->amount * ($open_invoice->{is_ar} ? 1 : -1), 2); }