X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=7f317403178d15dfaf62c8c9a36749851e942f54;hb=4af639717afee7911c70653b6166d10a7e1f2bae;hp=e7137bb380b538ab33d46d65fb4566d780380330;hpb=4dc48e117cfdb6e59c2d8b9d8087ef8a3bc245a4;p=kivitendo-erp.git diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm index e7137bb38..7f3174031 100644 --- a/SL/Controller/BankTransaction.pm +++ b/SL/Controller/BankTransaction.pm @@ -163,8 +163,6 @@ sub gather_bank_transactions_and_proposals { } next if $found; # batch transaction has no remotename !! - } else { - next unless $bt->{remote_name}; # bank has no name, usually fees, use create invoice to assign } # try to match the current $bt to each of the open_invoices, saving the @@ -276,12 +274,14 @@ sub action_create_invoice { my $templates_ap = SL::DB::Manager::RecordTemplate->get_all( where => [ template_type => 'ap_transaction' ], + sort_by => [ qw(template_name) ], with_objects => [ qw(employee vendor) ], ); my $templates_gl = SL::DB::Manager::RecordTemplate->get_all( query => [ template_type => 'gl_transaction', chart_id => SL::DB::Manager::BankAccount->find_by(id => $self->transaction->local_bank_account_id)->chart_id, ], + sort_by => [ qw(template_name) ], with_objects => [ qw(employee record_template_items) ], ); @@ -850,6 +850,7 @@ sub make_filter_summary { [ $filter->{"valutadate:date::le"}, $::locale->text('Valutadate') . " " . $::locale->text('To Date') ], [ $filter->{"amount:number"}, $::locale->text('Amount') ], [ $filter->{"bank_account_id:integer"}, $::locale->text('Local bank account') ], + [ $filter->{"remote_name:substr::ilike"}, $::locale->text('Remote name') ], ); for (@filters) {