X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=692fb701bea728b8691cc46a3169e24e5956f11b;hb=e713c3142d8c603b31d25fff371da47f56976aae;hp=2bf4a9c51e6b46ee9f228c8b1efad01768643cbf;hpb=413651d0f606611bd44a07a9ca08d22cac23ab54;p=kivitendo-erp.git

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index 2bf4a9c51..692fb701b 100644
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -25,7 +25,6 @@ use SL::DB::BankAccount;
 use SL::DB::RecordTemplate;
 use SL::DB::SepaExportItem;
 use SL::DBUtils qw(like);
-use SL::Presenter;
 
 use List::MoreUtils qw(any);
 use List::Util qw(max);
@@ -291,9 +290,9 @@ sub action_create_invoice {
     'bank_transactions/create_invoice',
     { layout => 0 },
     title        => t8('Create invoice'),
-    TEMPLATES_GL => $use_vendor_filter ? undef : $templates_gl,
+    TEMPLATES_GL => $use_vendor_filter && @{ $templates_ap } ? undef : $templates_gl,
     TEMPLATES_AP => $templates_ap,
-    vendor_name  => $use_vendor_filter ? $vendor_of_transaction->name : undef,
+    vendor_name  => $use_vendor_filter && @{ $templates_ap } ? $vendor_of_transaction->name : undef,
   );
 }
 
@@ -328,15 +327,13 @@ sub action_filter_templates {
 
   $self->{transaction}      = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
 
-  my @filter;
-  push @filter, ('vendor.name'   => { ilike => '%' . $::form->{vendor} . '%' })    if $::form->{vendor};
-  push @filter, ('template_name' => { ilike => '%' . $::form->{template} . '%' })  if $::form->{template};
-  push @filter, ('reference'     => { ilike => '%' . $::form->{reference} . '%' }) if $::form->{reference};
+  my (@filter, @filter_ap);
 
-  my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
-    where        => [ template_type => 'ap_transaction', (and => \@filter) x !!@filter ],
-    with_objects => [ qw(employee vendor) ],
-  );
+  # filter => gl and ap | filter_ap = ap (i.e. vendorname)
+  push @filter,    ('template_name' => { ilike => '%' . $::form->{template} . '%' })  if $::form->{template};
+  push @filter,    ('reference'     => { ilike => '%' . $::form->{reference} . '%' }) if $::form->{reference};
+  push @filter_ap, ('vendor.name'   => { ilike => '%' . $::form->{vendor} . '%' })    if $::form->{vendor};
+  push @filter_ap, @filter;
   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,
@@ -345,6 +342,10 @@ sub action_filter_templates {
     with_objects => [ qw(employee record_template_items) ],
   );
 
+  my $templates_ap = SL::DB::Manager::RecordTemplate->get_all(
+    where        => [ template_type => 'ap_transaction', (and => \@filter_ap) x !!@filter_ap ],
+    with_objects => [ qw(employee vendor) ],
+  );
   $::form->{filter} //= {};
 
   $self->callback($self->url_for(