X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBankTransaction.pm;h=7f896461b15a9705d7e15f186a5690b167174cb9;hb=be54aea5115bbfcc5d91de846879126417cacdbd;hp=e77240621726258a782965ea2ce3e4a725367895;hpb=d51b3011755b4a7e006f433d9fe5836a22a69638;p=kivitendo-erp.git

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index e77240621..7f896461b 100644
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -101,7 +101,6 @@ sub action_list {
       @where
     ],
   );
-
   # credit notes have a negative amount, treat differently
   my $all_open_ar_invoices = SL::DB::Manager::Invoice        ->get_all(where => [ or => [ amount => { gt => \'paid' },
                                                                                           and => [ type    => 'credit_note',
@@ -292,9 +291,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,
   );
 }
 
@@ -329,15 +328,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,
@@ -346,6 +343,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(
@@ -658,7 +659,7 @@ sub save_single_bank_transaction {
           # so $amount_of_transaction is negative but needs positive
           $amount_of_transaction *= -1;
 
-        } elsif (!$invoice->is_sales && $invoice->invoice_type eq 'ap_transaction' ) {
+        } elsif (!$invoice->is_sales && $invoice->invoice_type =~ m/ap_transaction|purchase_invoice/) {
           # $invoice->open_amount may be negative for ap_transaction but may be positiv for negativ ap_transaction
           # if $invoice->open_amount is negative $bank_transaction->amount is positve
           # if $invoice->open_amount is positive $bank_transaction->amount is negative