DB/BankTransaction: Kosmetik Fall SEPA-Check

[mfinanz.git] / SL / Controller / BankTransaction.pm

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index afa06e9d471ed9db994a1f2a31e0cf5373dead13..03826739139908c22bfc962ff30fe996ebba45e3 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -21,12 +21,19 @@ use SL::JSON;
 use SL::DB::Chart;
 use SL::DB::AccTransaction;
 use SL::DB::Tax;
 use SL::DB::Chart;
 use SL::DB::AccTransaction;
 use SL::DB::Tax;

-use SL::DB::Draft;

 use SL::DB::BankAccount;
 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);

 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (

- 'scalar --get_set_init' => [ qw(models) ],
+  scalar                  => [ qw(callback transaction) ],
+  'scalar --get_set_init' => [ qw(models problems) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 );
 
 __PACKAGE__->run_before('check_auth');


@@ -39,22 +46,21 @@ __PACKAGE__->run_before('check_auth');
 sub action_search {
   my ($self) = @_;
 
 sub action_search {
   my ($self) = @_;
 

-  my $bank_accounts = SL::DB::Manager::BankAccount->get_all();
+  my $bank_accounts = SL::DB::Manager::BankAccount->get_all_sorted( query => [ obsolete => 0 ] );

 
 

+  $self->setup_search_action_bar;

   $self->render('bank_transactions/search',
   $self->render('bank_transactions/search',

-                 label_sub => sub { t8('#1 - Account number #2, bank code #3, #4', $_[0]->name, $_[0]->account_number, $_[0]->bank_code, $_[0]->bank, )},

                  BANK_ACCOUNTS => $bank_accounts);
 }
 
 sub action_list_all {
   my ($self) = @_;
 
                  BANK_ACCOUNTS => $bank_accounts);
 }
 
 sub action_list_all {
   my ($self) = @_;
 

-  my $transactions = $self->models->get;
-

   $self->make_filter_summary;
   $self->prepare_report;
 
   $self->make_filter_summary;
   $self->prepare_report;
 

-  $self->report_generator_list_objects(report => $self->{report}, objects => $transactions);
+  $self->setup_list_all_action_bar;
+  $self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);

 }
 
 sub action_list {
 }
 
 sub action_list {


@@ -70,259 +76,306 @@ sub action_list {
   $sort_by = 'transdate' if $sort_by eq 'proposal';
   $sort_by .= $::form->{sort_dir} ? ' DESC' : ' ASC';
 
   $sort_by = 'transdate' if $sort_by eq 'proposal';
   $sort_by .= $::form->{sort_dir} ? ' DESC' : ' ASC';
 

-  my $fromdate = $::locale->parse_date_to_object(\%::myconfig, $::form->{filter}->{fromdate});
-  my $todate   = $::locale->parse_date_to_object(\%::myconfig, $::form->{filter}->{todate});
+  my $fromdate = $::locale->parse_date_to_object($::form->{filter}->{fromdate});
+  my $todate   = $::locale->parse_date_to_object($::form->{filter}->{todate});

   $todate->add( days => 1 ) if $todate;
 
   my @where = ();
   push @where, (transdate => { ge => $fromdate }) if ($fromdate);
   push @where, (transdate => { lt => $todate })   if ($todate);
   $todate->add( days => 1 ) if $todate;
 
   my @where = ();
   push @where, (transdate => { ge => $fromdate }) if ($fromdate);
   push @where, (transdate => { lt => $todate })   if ($todate);

-
-  my $bank_transactions = SL::DB::Manager::BankTransaction->get_all(where => [ amount => {ne => \'invoice_amount'},
-                                                                               local_bank_account_id => $::form->{filter}{bank_account},
-                                                                               @where ],
-                                                                    with_objects => [ 'local_bank_account', 'currency' ],
-                                                                    sort_by => $sort_by, limit => 10000);
-
-  my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => [amount => { gt => \'paid' }], with_objects => 'customer');
-  my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { gt => \'paid' }], with_objects => 'vendor');
+  my $bank_account = SL::DB::Manager::BankAccount->find_by( id => $::form->{filter}{bank_account} );
+  # bank_transactions no younger than starting date,
+  # including starting date (same search behaviour as fromdate)
+  # but OPEN invoices to be matched may be from before
+  if ( $bank_account->reconciliation_starting_date ) {
+    push @where, (transdate => { ge => $bank_account->reconciliation_starting_date });
+  };
+
+  my $bank_transactions = SL::DB::Manager::BankTransaction->get_all(
+    with_objects => [ 'local_bank_account', 'currency' ],
+    sort_by      => $sort_by,
+    limit        => 10000,
+    where        => [
+      amount                => {ne => \'invoice_amount'},
+      local_bank_account_id => $::form->{filter}{bank_account},
+      @where
+    ],
+  );
+  $main::lxdebug->message(LXDebug->DEBUG2(),"count bt=".scalar(@{$bank_transactions}." bank_account=".$bank_account->id." chart=".$bank_account->chart_id));
+
+  # 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',
+                                                                                                   amount  => { lt => \'paid' }
+                                                                                                 ],
+                                                                                        ],
+                                                                                ],
+                                                                       with_objects => ['customer','payment_terms']);
+
+  my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { ne => \'paid' }], with_objects => ['vendor'  ,'payment_terms']);
+  my $all_open_sepa_export_items = SL::DB::Manager::SepaExportItem->get_all(where => [chart_id => $bank_account->chart_id ,
+                                                                             'sepa_export.executed' => 0, 'sepa_export.closed' => 0 ], with_objects => ['sepa_export']);
+  $main::lxdebug->message(LXDebug->DEBUG2(),"count sepaexport=".scalar(@{$all_open_sepa_export_items}));

 
   my @all_open_invoices;
 
   my @all_open_invoices;

-  push @all_open_invoices, @{ $all_open_ar_invoices };
-  push @all_open_invoices, @{ $all_open_ap_invoices };
+  # filter out invoices with less than 1 cent outstanding
+  push @all_open_invoices, map { $_->{is_ar}=1 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ar_invoices };
+  push @all_open_invoices, map { $_->{is_ar}=0 ; $_ } grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };
+  $main::lxdebug->message(LXDebug->DEBUG2(),"bank_account=".$::form->{filter}{bank_account}." invoices: ".scalar(@{ $all_open_ar_invoices }).
+                              " + ".scalar(@{ $all_open_ap_invoices })." non fully paid=".scalar(@all_open_invoices)." transactions=".scalar(@{ $bank_transactions }));
+
+  my @all_sepa_invoices;
+  my @all_non_sepa_invoices;
+  my %sepa_exports;
+  # first collect sepa export items to open invoices
+  foreach my $open_invoice (@all_open_invoices){
+    #    my @items =  grep { $_->ap_id == $open_invoice->id ||  $_->ar_id == $open_invoice->id } @{$all_open_sepa_export_items};
+    $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount,2);
+    $open_invoice->{skonto_type} = 'without_skonto';
+    foreach ( @{$all_open_sepa_export_items}) {
+      if ( $_->ap_id == $open_invoice->id ||  $_->ar_id == $open_invoice->id ) {
+        my $factor = ($_->ar_id == $open_invoice->id?1:-1);
+        $main::lxdebug->message(LXDebug->DEBUG2(),"exitem=".$_->id." for invoice ".$open_invoice->id." factor=".$factor);
+        $open_invoice->{realamount}  = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
+        $open_invoice->{sepa_export_item} = $_ ;
+        $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}++ ;
+        $sepa_exports{$_->sepa_export_id}->{is_ar}++ if  $_->ar_id == $open_invoice->id;
+        $sepa_exports{$_->sepa_export_id}->{amount} += $_->amount * $factor;
+        push @{ $sepa_exports{$_->sepa_export_id}->{invoices} }, $open_invoice;
+        #$main::lxdebug->message(LXDebug->DEBUG2(),"amount for export id ".$_->sepa_export_id." = ".
+        #                          $sepa_exports{$_->sepa_export_id}->{amount}." count = ".
+        #                          $sepa_exports{$_->sepa_export_id}->{count}." is_ar = ".
+        #                          $sepa_exports{$_->sepa_export_id}->{is_ar} );
+        push @all_sepa_invoices , $open_invoice;
+      }
+    }
+    push @all_non_sepa_invoices , $open_invoice if ! $open_invoice->{sepa_export_item};
+  }
+
+  # try to match each bank_transaction with each of the possible open invoices
+  # by awarding points
+  my @proposals;

 
   foreach my $bt (@{ $bank_transactions }) {
 
   foreach my $bt (@{ $bank_transactions }) {

+    ## 5 Stellen hinter dem Komma auf 2 Stellen reduzieren
+    $bt->amount($bt->amount*1);
+    $bt->invoice_amount($bt->invoice_amount*1);
+    $main::lxdebug->message(LXDebug->DEBUG2(),"BT ".$bt->id." amount=".$bt->amount." invoice_amount=".$bt->invoice_amount." remote=". $bt->{remote_name});
+
+    $bt->{proposals}    = [];
+    $bt->{rule_matches} = [];
+
+    $bt->{remote_name} .= $bt->{remote_name_1} if $bt->{remote_name_1};
+
+    if ( $self->is_collective_transaction($bt) ) {
+      foreach ( keys  %sepa_exports) {
+        #$main::lxdebug->message(LXDebug->DEBUG2(),"Exp ID=".$_." compare sum amount ".($sepa_exports{$_}->{amount} *1) ." == ".($bt->amount * 1));
+        if ( $bt->transaction_code eq '191' && abs(($sepa_exports{$_}->{amount} * 1) - ($bt->amount * 1)) < 0.01 ) {
+          ## jupp
+          @{$bt->{proposals}} = @{$sepa_exports{$_}->{invoices}};
+          $bt->{agreement}    = 20;
+          push(@{$bt->{rule_matches}},'sepa_export_item(20)');
+          $sepa_exports{$_}->{proposed}=1;
+          #$main::lxdebug->message(LXDebug->DEBUG2(),"has ".scalar($bt->{proposals})." invoices");
+          push(@proposals, $bt);
+          next;
+        }
+      }
+    }

     next unless $bt->{remote_name};  # bank has no name, usually fees, use create invoice to assign
     next unless $bt->{remote_name};  # bank has no name, usually fees, use create invoice to assign

-    foreach my $open_invoice (@all_open_invoices){
-      $open_invoice->{agreement} = 0;
-
-      #compare banking arrangements
-      my ($bank_code, $account_number);
-      $bank_code      = $open_invoice->customer->bank_code      if $open_invoice->is_sales;
-      $account_number = $open_invoice->customer->account_number if $open_invoice->is_sales;
-      $bank_code      = $open_invoice->vendor->bank_code        if ! $open_invoice->is_sales;
-      $account_number = $open_invoice->vendor->account_number   if ! $open_invoice->is_sales;
-      ($bank_code eq $bt->remote_bank_code
-        && $account_number eq $bt->remote_account_number) ? ($open_invoice->{agreement} += 2) : ();
-
-      my $datediff = $bt->transdate->{utc_rd_days} - $open_invoice->transdate->{utc_rd_days};
-      $open_invoice->{datediff} = $datediff;
-
-      #compare amount
-#      (abs($open_invoice->amount) == abs($bt->amount)) ? ($open_invoice->{agreement} += 2) : ();
-# do we need double abs here? 
-      (abs(abs($open_invoice->amount) - abs($bt->amount)) < 0.01) ? ($open_invoice->{agreement} += 4) : ();
-
-      #search invoice number in purpose
-      my $invnumber = $open_invoice->invnumber;
-# possible improvement: match has to have more than 1 character?
-      $bt->purpose =~ /\b$invnumber\b/i ? ($open_invoice->{agreement} += 2) : ();
-
-      #check sign
-      if ( $open_invoice->is_sales && $bt->amount < 0 ) {
-        $open_invoice->{agreement} -= 1;
-      };
-      if ( ! $open_invoice->is_sales && $bt->amount > 0 ) {
-        $open_invoice->{agreement} -= 1;
-      };
-
-      #search customer/vendor number in purpose
-      my $cvnumber;
-      $cvnumber = $open_invoice->customer->customernumber if $open_invoice->is_sales;
-      $cvnumber = $open_invoice->vendor->vendornumber     if ! $open_invoice->is_sales;
-      $bt->purpose =~ /\b$cvnumber\b/i ? ($open_invoice->{agreement}++) : ();
-
-      #compare customer/vendor name and account holder
-      my $cvname;
-      $cvname = $open_invoice->customer->name if $open_invoice->is_sales;
-      $cvname = $open_invoice->vendor->name   if ! $open_invoice->is_sales;
-      $bt->remote_name =~ /\b$cvname\b/i ? ($open_invoice->{agreement}++) : ();
-
-      #Compare transdate of bank_transaction with transdate of invoice
-      #Check if words in remote_name appear in cvname
-      $open_invoice->{agreement} += &check_string($bt->remote_name,$cvname);
-
-      $open_invoice->{agreement} -= 1 if $datediff < -5; # dies hebelt eventuell Vorkasse aus
-      $open_invoice->{agreement} += 1 if $datediff < 30; # dies hebelt eventuell Vorkasse aus
-
-      # only if we already have a good agreement, let date further change value of agreement.
-      # this is so that if there are several open invoices which are all equal (rent jan, rent feb...) the one with the best date match is chose over the others
-      # another way around this is to just pre-filter by periods instead of matching everything
-      if ( $open_invoice->{agreement} > 5 ) {
-        if ( $datediff == 0 ) { 
-          $open_invoice->{agreement} += 3;
-        } elsif  ( $datediff > 0 and $datediff <= 14 ) {
-          $open_invoice->{agreement} += 2;
-        } elsif  ( $datediff >14 and $datediff < 35) {
-          $open_invoice->{agreement} += 1;
-        } elsif  ( $datediff >34 and $datediff < 120) {
-          $open_invoice->{agreement} += 1;
-        } elsif  ( $datediff < 0 ) {
-          $open_invoice->{agreement} -= 1;
-        } else {
-          # e.g. datediff > 120
-        };
-      };

 
 

-      #if ($open_invoice->transdate->{utc_rd_days} == $bt->transdate->{utc_rd_days}) {  
-        #$open_invoice->{agreement} += 4;
-        #print FH "found matching date for invoice " . $open_invoice->invnumber . " ( " . $bt->transdate->{utc_rd_days} . " . \n";
-      #} elsif (($open_invoice->transdate->{utc_rd_days} + 30) < $bt->transdate->{utc_rd_days}) {  
-        #$open_invoice->{agreement} -= 1;
-      #} else {
-        #$open_invoice->{agreement} -= 2;
-        #print FH "found nomatch date -2 for invoice " . $open_invoice->invnumber . " ( " . $bt->transdate->{utc_rd_days} . " . \n";
-      #};
-      #print FH "agreement after date_agreement: " . $open_invoice->{agreement} . "\n";
+    foreach ( @{$all_open_sepa_export_items}) {
+      last if scalar (@all_sepa_invoices) == 0;
+      foreach my $open_invoice (@all_sepa_invoices){
+        $open_invoice->{agreement}    = 0;
+        $open_invoice->{rule_matches} ='';
+        if ( $_->ap_id == $open_invoice->id ||  $_->ar_id == $open_invoice->id ) {
+          #$main::lxdebug->message(LXDebug->DEBUG2(),"exitem2=".$_->id." for invoice ".$open_invoice->id);
+          my $factor = ( $_->ar_id == $open_invoice->id?1:-1);
+          $_->amount($_->amount*1);
+          #$main::lxdebug->message(LXDebug->DEBUG2(),"remote account '".$bt->{remote_account_number}."' bt_amount=".$bt->amount." factor=".$factor);
+          #$main::lxdebug->message(LXDebug->DEBUG2(),"compare with   '".$_->vc_iban."'    amount=".$_->amount);
+          if ( $bt->{remote_account_number} eq $_->vc_iban && abs(abs($_->amount) - abs($bt->amount)) < 0.01 ) {
+            my $iban;
+            $iban = $open_invoice->customer->iban if $open_invoice->is_sales;
+            $iban = $open_invoice->vendor->iban   if ! $open_invoice->is_sales;
+            if($bt->{remote_account_number} eq $iban && abs(abs($open_invoice->amount) - abs($bt->amount)) < 0.01 ) {
+              ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
+              $open_invoice->{agreement} += 5;
+              $open_invoice->{rule_matches} .= 'sepa_export_item(5) ';
+              $main::lxdebug->message(LXDebug->DEBUG2(),"sepa invoice_id=".$open_invoice->id." agreement=".$open_invoice->{agreement}." rules matches=".$open_invoice->{rule_matches});
+              $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,$open_invoice->amount*$factor,2);
+            }
+          }
+        }
+      }
+    }

 
 

+    # try to match the current $bt to each of the open_invoices, saving the
+    # results of get_agreement_with_invoice in $open_invoice->{agreement} and
+    # $open_invoice->{rule_matches}.

 
 

+    # The values are overwritten each time a new bt is checked, so at the end
+    # of each bt the likely results are filtered and those values are stored in
+    # the arrays $bt->{proposals} and $bt->{rule_matches}, and the agreement
+    # score is stored in $bt->{agreement}

 
 

+    foreach my $open_invoice (@all_non_sepa_invoices, @all_sepa_invoices) {
+      ($open_invoice->{agreement}, $open_invoice->{rule_matches}) = $bt->get_agreement_with_invoice($open_invoice);
+      $open_invoice->{realamount} = $::form->format_amount(\%::myconfig,
+                                      $open_invoice->amount * ($open_invoice->{is_ar} ? 1 : -1), 2);

     }
     }

-# finished going through all open_invoices
-
-    # go through each bt
-    # for each open_invoice try to match it to each open_invoice and store agreement in $open_invoice->{agreement} (which gets overwritten each time for each bt)
-    #    calculate 
-#  
-
-    $bt->{proposals} = [];
-    my $agreement = 11;
-    # wird nie ausgeführt, bzw. nur ganz am Ende
-# oder einmal am Anfang?
-# es werden maximal 7 vorschläge gemacht?
-    # 7 mal wird geprüft, ob etwas passt
-    while (scalar @{ $bt->{proposals} } < 1 && $agreement-- > 0) {
-      $bt->{proposals} = [ grep { $_->{agreement} > $agreement } @all_open_invoices ];
-      #Kann wahrscheinlich weg:
-#      map { $_->{style} = "green" } @{ $bt->{proposals} } if $agreement >= 5;
-#      map { $_->{style} = "orange" } @{ $bt->{proposals} } if $agreement < 5 and $agreement >= 3;
-#      map { $_->{style} = "red" } @{ $bt->{proposals} } if $agreement < 3;
-      $bt->{agreement} = $agreement;  # agreement value at cutoff, will correspond to several results if threshold is 7 and several are already above 7
-    }
+
+    my $agreement = 15;
+    my $min_agreement = 3; # suggestions must have at least this score
+
+    my $max_agreement = max map { $_->{agreement} } @all_open_invoices;
+
+    # add open_invoices with highest agreement into array $bt->{proposals}
+    if ( $max_agreement >= $min_agreement ) {
+      $bt->{proposals} = [ grep { $_->{agreement} == $max_agreement } @all_open_invoices ];
+      $bt->{agreement} = $max_agreement; #scalar @{ $bt->{proposals} } ? $agreement + 1 : '';
+
+      # store the rule_matches in a separate array, so they can be displayed in template
+      foreach ( @{ $bt->{proposals} } ) {
+        push(@{$bt->{rule_matches}}, $_->{rule_matches});
+      };
+    };

   }  # finished one bt
   # finished all bt
 
   # separate filter for proposals (second tab, agreement >= 5 and exactly one match)
   # to qualify as a proposal there has to be
   }  # finished one bt
   # finished all bt
 
   # separate filter for proposals (second tab, agreement >= 5 and exactly one match)
   # to qualify as a proposal there has to be

-  # * agreement >= 5
-  # * there must be only one exact match 
+  # * agreement >= 5  TODO: make threshold configurable in configuration
+  # * there must be only one exact match

   # * depending on whether sales or purchase the amount has to have the correct sign (so Gutschriften don't work?)
   # * depending on whether sales or purchase the amount has to have the correct sign (so Gutschriften don't work?)

+  my $proposal_threshold = 5;
+  my @otherproposals = grep {
+       ($_->{agreement} >= $proposal_threshold)
+    && (1 == scalar @{ $_->{proposals} })
+    && (@{ $_->{proposals} }[0]->is_sales ? abs(@{ $_->{proposals} }[0]->amount - $_->amount) < 0.01
+                                          : abs(@{ $_->{proposals} }[0]->amount + $_->amount) < 0.01)
+  } @{ $bank_transactions };

 
 

-  my @proposals = grep { $_->{agreement} >= 5
-                         and 1 == scalar @{ $_->{proposals} }
-                         and (@{ $_->{proposals} }[0]->is_sales ? abs(@{ $_->{proposals} }[0]->amount - $_->amount) < 0.01  : abs(@{ $_->{proposals} }[0]->amount + $_->amount) < 0.01) } @{ $bank_transactions };
+  push ( @proposals, @otherproposals);

 
 

-  #Sort bank transactions by quality of proposal
+  # sort bank transaction proposals by quality (score) of proposal

   $bank_transactions = [ sort { $a->{agreement} <=> $b->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 1;
   $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 0;
 
   $bank_transactions = [ sort { $a->{agreement} <=> $b->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 1;
   $bank_transactions = [ sort { $b->{agreement} <=> $a->{agreement} } @{ $bank_transactions } ] if $::form->{sort_by} eq 'proposal' and $::form->{sort_dir} == 0;
 

-
+  $::request->layout->add_javascripts("kivi.BankTransaction.js");

   $self->render('bank_transactions/list',
   $self->render('bank_transactions/list',

-                title             => t8('List of bank transactions'),
+                title             => t8('Bank transactions MT940'),

                 BANK_TRANSACTIONS => $bank_transactions,
                 PROPOSALS         => \@proposals,
                 BANK_TRANSACTIONS => $bank_transactions,
                 PROPOSALS         => \@proposals,

-                bank_account      => SL::DB::Manager::BankAccount->find_by(id => $::form->{filter}{bank_account}) );
+                bank_account      => $bank_account,
+                ui_tab            => scalar(@proposals) > 0?1:0,
+              );

 }
 
 }
 

-sub check_string {
-    my $bankstring = shift;
-    my $namestring = shift;
-    return 0 unless $bankstring and $namestring;
-
-    my @bankwords = grep(/^\w+$/, split(/\b/,$bankstring));
-
-    my $match = 0;
-    foreach my $bankword ( @bankwords ) {
-        # only try to match strings with more than 2 characters
-        next unless length($bankword)>2; 
-        if ( $namestring =~ /\b$bankword\b/i ) {
-            $match++;
-        };
-    };
-    return $match;
-};
-

 sub action_assign_invoice {
   my ($self) = @_;
 
   $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
 
 sub action_assign_invoice {
   my ($self) = @_;
 
   $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
 

-  $self->render('bank_transactions/assign_invoice', { layout  => 0 },
-                title      => t8('Assign invoice'),);
+  $self->render('bank_transactions/assign_invoice',
+                { layout => 0 },
+                title => t8('Assign invoice'),);

 }
 
 sub action_create_invoice {
   my ($self) = @_;
   my %myconfig = %main::myconfig;
 
 }
 
 sub action_create_invoice {
   my ($self) = @_;
   my %myconfig = %main::myconfig;
 

-  $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
-  my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
-
-  my $drafts = SL::DB::Manager::Draft->get_all(where => [ module => 'ap'] , with_objects => 'employee');
+  $self->transaction(SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id}));

 
 

-  my @filtered_drafts;
+  my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->transaction->{remote_account_number});
+  my $use_vendor_filter     = $self->transaction->{remote_account_number} && $vendor_of_transaction;

 
 

-  foreach my $draft ( @{ $drafts } ) {
-    my $draft_as_object = YAML::Load($draft->form);
-    my $vendor = SL::DB::Manager::Vendor->find_by(id => $draft_as_object->{vendor_id});
-    $draft->{vendor} = $vendor->name;
-    $draft->{vendor_id} = $vendor->id;
-    push @filtered_drafts, $draft;
-  }
+  my $templates             = SL::DB::Manager::RecordTemplate->get_all(
+    where        => [ template_type => 'ap_transaction' ],
+    with_objects => [ qw(employee vendor) ],
+  );

 
 

-  #Filter drafts
-  @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $vendor_of_transaction;
-
-  my $all_vendors = SL::DB::Manager::Vendor->get_all();
-
-  $self->render('bank_transactions/create_invoice', { layout  => 0 },
-      title      => t8('Create invoice'),
-      DRAFTS     => \@filtered_drafts,
-      vendor_id  => $vendor_of_transaction ? $vendor_of_transaction->id : undef,
-      vendor_name => $vendor_of_transaction ? $vendor_of_transaction->name : undef,
-      ALL_VENDORS => $all_vendors,
-      limit      => $myconfig{vclimit},
-      callback   => $self->url_for(action                => 'list',
-                                   'filter.bank_account' => $::form->{filter}->{bank_account},
-                                   'filter.todate'       => $::form->{filter}->{todate},
-                                   'filter.fromdate'     => $::form->{filter}->{fromdate}),
-      );
+  #Filter templates
+  $templates = [ grep { $_->vendor_id == $vendor_of_transaction->id } @{ $templates } ] if $use_vendor_filter;
+
+  $self->callback($self->url_for(
+    action                => 'list',
+    'filter.bank_account' => $::form->{filter}->{bank_account},
+    'filter.todate'       => $::form->{filter}->{todate},
+    'filter.fromdate'     => $::form->{filter}->{fromdate},
+  ));
+
+  $self->render(
+    'bank_transactions/create_invoice',
+    { layout => 0 },
+    title       => t8('Create invoice'),
+    TEMPLATES   => $templates,
+    vendor_id   => $use_vendor_filter ? $vendor_of_transaction->id   : undef,
+    vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
+  );

 }
 
 }
 

-sub action_filter_drafts {
+sub action_ajax_payment_suggestion {

   my ($self) = @_;
 
   my ($self) = @_;
 

-  $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
-  my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
+  # based on a BankTransaction ID and a Invoice or PurchaseInvoice ID passed via $::form,
+  # create an HTML blob to be used by the js function add_invoices in templates/webpages/bank_transactions/list.html
+  # and return encoded as JSON

 
 

-  my $drafts = SL::DB::Manager::Draft->get_all(with_objects => 'employee');
+  my $bt      = SL::DB::Manager::BankTransaction->find_by( id => $::form->{bt_id} );
+  my $invoice = SL::DB::Manager::Invoice->find_by( id => $::form->{prop_id} ) || SL::DB::Manager::PurchaseInvoice->find_by( id => $::form->{prop_id} );

 
 

-  my @filtered_drafts;
+  die unless $bt and $invoice;

 
 

-  foreach my $draft ( @{ $drafts } ) {
-    my $draft_as_object = YAML::Load($draft->form);
-    my $vendor = SL::DB::Manager::Vendor->find_by(id => $draft_as_object->{vendor_id});
-    $draft->{vendor} = $vendor->name;
-    $draft->{vendor_id} = $vendor->id;
-    push @filtered_drafts, $draft;
-  }
+  my @select_options = $invoice->get_payment_select_options_for_bank_transaction($::form->{bt_id});
+
+  my $html;
+  $html = $self->render(
+    'bank_transactions/_payment_suggestion', { output => 0 },
+    bt_id          => $::form->{bt_id},
+    prop_id        => $::form->{prop_id},
+    invoice        => $invoice,
+    SELECT_OPTIONS => \@select_options,
+  );

 
 

-  my $vendor_name = $::form->{vendor};
-  my $vendor_id = $::form->{vendor_id};
+  $self->render(\ SL::JSON::to_json( { 'html' => "$html" } ), { layout => 0, type => 'json', process => 0 });
+};

 
 

-  #Filter drafts
-  @filtered_drafts = grep { $_->{vendor_id} == $vendor_id } @filtered_drafts if $vendor_id;
-  @filtered_drafts = grep { $_->{vendor} =~ /$vendor_name/i } @filtered_drafts if $vendor_name;
+sub action_filter_templates {
+  my ($self) = @_;

 
 

-  my $output  = $self->render(
-      'bank_transactions/filter_drafts',
-      { output      => 0 },
-      DRAFTS => \@filtered_drafts,
-      );
+  $self->{transaction}      = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
+  my $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});

 
 

-  my %result = ( count => 0, html => $output );
+  my @filter;
+  push @filter, ('vendor.id'   => $::form->{vendor_id})                       if $::form->{vendor_id};
+  push @filter, ('vendor.name' => { ilike => '%' . $::form->{vendor} . '%' }) if $::form->{vendor};

 
 

-  $self->render(\to_json(\%result), { type => 'json', process => 0 });
+  my $templates = SL::DB::Manager::RecordTemplate->get_all(
+    where        => [ template_type => 'ap_transaction', (or => \@filter) x !!@filter ],
+    with_objects => [ qw(employee vendor) ],
+  );
+
+  $::form->{filter} //= {};
+
+  $self->callback($self->url_for(
+    action                => 'list',
+    'filter.bank_account' => $::form->{filter}->{bank_account},
+    'filter.todate'       => $::form->{filter}->{todate},
+    'filter.fromdate'     => $::form->{filter}->{fromdate},
+  ));
+
+  my $output  = $self->render(
+    'bank_transactions/_template_list',
+    { output => 0 },
+    TEMPLATES => $templates,
+  );
+
+  $self->render(\to_json({ html => $output }), { type => 'json', process => 0 });

 }
 
 sub action_ajax_add_list {
 }
 
 sub action_ajax_add_list {


@@ -332,8 +385,8 @@ sub action_ajax_add_list {
   my @where_purchase = (amount => { ne => \'paid' });
 
   if ($::form->{invnumber}) {
   my @where_purchase = (amount => { ne => \'paid' });
 
   if ($::form->{invnumber}) {

-    push @where_sale,     (invnumber => { ilike => '%' . $::form->{invnumber} . '%'});
-    push @where_purchase, (invnumber => { ilike => '%' . $::form->{invnumber} . '%'});
+    push @where_sale,     (invnumber => { ilike => like($::form->{invnumber})});
+    push @where_purchase, (invnumber => { ilike => like($::form->{invnumber})});

   }
 
   if ($::form->{amount}) {
   }
 
   if ($::form->{amount}) {


@@ -342,43 +395,46 @@ sub action_ajax_add_list {
   }
 
   if ($::form->{vcnumber}) {
   }
 
   if ($::form->{vcnumber}) {

-    push @where_sale,     ('customer.customernumber' => { ilike => '%' . $::form->{vcnumber} . '%'});
-    push @where_purchase, ('vendor.vendornumber'     => { ilike => '%' . $::form->{vcnumber} . '%'});
+    push @where_sale,     ('customer.customernumber' => { ilike => like($::form->{vcnumber})});
+    push @where_purchase, ('vendor.vendornumber'     => { ilike => like($::form->{vcnumber})});

   }
 
   if ($::form->{vcname}) {
   }
 
   if ($::form->{vcname}) {

-    push @where_sale,     ('customer.name' => { ilike => '%' . $::form->{vcname} . '%'});
-    push @where_purchase, ('vendor.name'   => { ilike => '%' . $::form->{vcname} . '%'});
+    push @where_sale,     ('customer.name' => { ilike => like($::form->{vcname})});
+    push @where_purchase, ('vendor.name'   => { ilike => like($::form->{vcname})});

   }
 
   if ($::form->{transdatefrom}) {
   }
 
   if ($::form->{transdatefrom}) {

-    my $fromdate = $::locale->parse_date_to_object(\%::myconfig, $::form->{transdatefrom});
-    push @where_sale,     ('transdate' => { ge => $fromdate});
-    push @where_purchase, ('transdate' => { ge => $fromdate});
+    my $fromdate = $::locale->parse_date_to_object($::form->{transdatefrom});
+    if ( ref($fromdate) eq 'DateTime' ) {
+      push @where_sale,     ('transdate' => { ge => $fromdate});
+      push @where_purchase, ('transdate' => { ge => $fromdate});
+    };

   }
 
   if ($::form->{transdateto}) {
   }
 
   if ($::form->{transdateto}) {

-    my $todate = $::locale->parse_date_to_object(\%::myconfig, $::form->{transdateto});
-    $todate->add(days => 1);
-    push @where_sale,     ('transdate' => { lt => $todate});
-    push @where_purchase, ('transdate' => { lt => $todate});
+    my $todate = $::locale->parse_date_to_object($::form->{transdateto});
+    if ( ref($todate) eq 'DateTime' ) {
+      $todate->add(days => 1);
+      push @where_sale,     ('transdate' => { lt => $todate});
+      push @where_purchase, ('transdate' => { lt => $todate});
+    };

   }
 
   }
 

-  my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => \@where_sale, with_objects => 'customer');
+  my $all_open_ar_invoices = SL::DB::Manager::Invoice        ->get_all(where => \@where_sale,     with_objects => 'customer');

   my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => \@where_purchase, with_objects => 'vendor');
 
   my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => \@where_purchase, with_objects => 'vendor');
 

-  my @all_open_invoices;
-  push @all_open_invoices, @{ $all_open_ar_invoices };
-  push @all_open_invoices, @{ $all_open_ap_invoices };
+  my @all_open_invoices = @{ $all_open_ar_invoices };
+  # add ap invoices, filtering out subcent open amounts
+  push @all_open_invoices, grep { abs($_->amount - $_->paid) >= 0.01 } @{ $all_open_ap_invoices };

 
   @all_open_invoices = sort { $a->id <=> $b->id } @all_open_invoices;
 
   @all_open_invoices = sort { $a->id <=> $b->id } @all_open_invoices;

-  #my $all_open_invoices = SL::DB::Manager::Invoice->get_all(where => \@where);

 
   my $output  = $self->render(
 
   my $output  = $self->render(

-      'bank_transactions/add_list',
-      { output      => 0 },
-      INVOICES => \@all_open_invoices,
-      );
+    'bank_transactions/add_list',
+    { output => 0 },
+    INVOICES => \@all_open_invoices,
+  );

 
   my %result = ( count => 0, html => $output );
 
 
   my %result = ( count => 0, html => $output );
 


@@ -390,115 +446,310 @@ sub action_ajax_accept_invoices {
 
   my @selected_invoices;
   foreach my $invoice_id (@{ $::form->{invoice_id} || [] }) {
 
   my @selected_invoices;
   foreach my $invoice_id (@{ $::form->{invoice_id} || [] }) {

-    my $invoice_object = SL::DB::Manager::Invoice->find_by(id => $invoice_id);
-    $invoice_object ||= SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id);
-
+    my $invoice_object = SL::DB::Manager::Invoice->find_by(id => $invoice_id) || SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id);

     push @selected_invoices, $invoice_object;
   }
 
     push @selected_invoices, $invoice_object;
   }
 

-  $self->render('bank_transactions/invoices', { layout => 0 },
-                INVOICES => \@selected_invoices,
-                bt_id    => $::form->{bt_id} );
+  $self->render(
+    'bank_transactions/invoices',
+    { layout => 0 },
+    INVOICES => \@selected_invoices,
+    bt_id    => $::form->{bt_id},
+  );
+}
+
+sub save_invoices {
+  my ($self) = @_;
+
+  return 0 if !$::form->{invoice_ids};
+
+  my %invoice_hash = %{ delete $::form->{invoice_ids} };  # each key (the bt line with a bt_id) contains an array of invoice_ids
+
+  # e.g. three partial payments with bt_ids 54, 55 and 56 for invoice with id 74:
+  # $invoice_hash = {
+  #         '55' => [
+  #                 '74'
+  #               ],
+  #         '54' => [
+  #                 '74'
+  #               ],
+  #         '56' => [
+  #                 '74'
+  #               ]
+  #       };
+  #
+  # or if the payment with bt_id 44 is used to pay invoices with ids 50, 51 and 52
+  # $invoice_hash = {
+  #           '44' => [ '50', '51', 52' ]
+  #         };
+
+  $::form->{invoice_skontos} ||= {}; # hash of arrays containing the payment types, could be empty
+
+  # a bank_transaction may be assigned to several invoices, i.e. a customer
+  # might pay several open invoices with one transaction
+
+  $self->problems([]);
+
+  my $count = 0;
+
+  if ( $::form->{proposal_ids} ) {
+    foreach (@{ $::form->{proposal_ids} }) {
+      my  $bank_transaction_id = $_;
+      my  $invoice_ids = $invoice_hash{$_};
+      push @{ $self->problems }, $self->save_single_bank_transaction(
+        bank_transaction_id => $bank_transaction_id,
+        invoice_ids         => $invoice_ids,
+        sources             => ($::form->{sources} // {})->{$_},
+        memos               => ($::form->{memos}   // {})->{$_},
+      );
+      $count += scalar( @{$invoice_ids} );
+    }
+  } else {
+    while ( my ($bank_transaction_id, $invoice_ids) = each(%invoice_hash) ) {
+      push @{ $self->problems }, $self->save_single_bank_transaction(
+        bank_transaction_id => $bank_transaction_id,
+        invoice_ids         => $invoice_ids,
+        sources             => [  map { $::form->{"sources_${bank_transaction_id}_${_}"} } @{ $invoice_ids } ],
+        memos               => [  map { $::form->{"memos_${bank_transaction_id}_${_}"}   } @{ $invoice_ids } ],
+      );
+      $count += scalar( @{$invoice_ids} );
+    }
+  }
+  foreach (@{ $self->problems }) {
+    $count-- if $_->{result} eq 'error';
+  }
+  return $count;

 }
 
 sub action_save_invoices {
   my ($self) = @_;
 }
 
 sub action_save_invoices {
   my ($self) = @_;

+  my $count = $self->save_invoices();
+
+  flash('ok', t8('#1 invoice(s) saved.', $count));
+
+  $self->action_list();
+}
+
+sub action_save_proposals {
+  my ($self) = @_;
+
+  if ( $::form->{proposal_ids} ) {
+    my $propcount = scalar(@{ $::form->{proposal_ids} });
+    if ( $propcount > 0 ) {
+      my $count = $self->save_invoices();
+
+      flash('ok', t8('#1 proposal(s) with #2 invoice(s) saved.',  $propcount, $count));
+    }
+  }
+  $self->action_list();
+
+}
+
+sub is_collective_transaction {
+  my ($self, $bt) = @_;
+  return $bt->transaction_code eq "191";
+}
+
+sub save_single_bank_transaction {
+  my ($self, %params) = @_;
+
+  my %data = (
+    %params,
+    bank_transaction => SL::DB::Manager::BankTransaction->find_by(id => $params{bank_transaction_id}),
+    invoices         => [],
+  );
+
+  if (!$data{bank_transaction}) {
+    return {
+      %data,
+      result => 'error',
+      message => $::locale->text('The ID #1 is not a valid database ID.', $data{bank_transaction_id}),
+    };
+  }

 
 

-  my $invoice_hash = delete $::form->{invoice_ids};
+  my (@warnings);

 
 

-  while ( my ($bt_id, $invoice_ids) = each(%$invoice_hash) ) {
-    my $bank_transaction = SL::DB::Manager::BankTransaction->find_by(id => $bt_id);
-    my $sign = $bank_transaction->amount < 0 ? -1 : 1;
+  my $worker = sub {
+    my $bt_id                 = $data{bank_transaction_id};
+    my $bank_transaction      = $data{bank_transaction};
+    my $sign                  = $bank_transaction->amount < 0 ? -1 : 1;

     my $amount_of_transaction = $sign * $bank_transaction->amount;
     my $amount_of_transaction = $sign * $bank_transaction->amount;

+    my $payment_received      = $bank_transaction->amount > 0;
+    my $payment_sent          = $bank_transaction->amount < 0;
+
+
+    foreach my $invoice_id (@{ $params{invoice_ids} }) {
+      my $invoice = SL::DB::Manager::Invoice->find_by(id => $invoice_id) || SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id);
+      if (!$invoice) {
+        return {
+          %data,
+          result  => 'error',
+          message => $::locale->text("The ID #1 is not a valid database ID.", $invoice_id),
+        };
+      }
+      push @{ $data{invoices} }, $invoice;
+    }

 
 

-    my @invoices;
-    foreach my $invoice_id (@{ $invoice_ids }) {
-      push @invoices, (SL::DB::Manager::Invoice->find_by(id => $invoice_id) || SL::DB::Manager::PurchaseInvoice->find_by(id => $invoice_id));
+    if (   $payment_received
+        && any {    ( $_->is_sales && ($_->amount < 0))
+                 || (!$_->is_sales && ($_->amount > 0))
+               } @{ $data{invoices} }) {
+      return {
+        %data,
+        result  => 'error',
+        message => $::locale->text("Received payments can only be posted for sales invoices and purchase credit notes."),
+      };
+    }
+
+    if (   $payment_sent
+        && any {    ( $_->is_sales && ($_->amount > 0))
+                 || (!$_->is_sales && ($_->amount < 0) && ($_->invoice_type eq 'purchase_invoice'))
+               } @{ $data{invoices} }) {
+      return {
+        %data,
+        result  => 'error',
+        message => $::locale->text("Sent payments can only be posted for purchase invoices and sales credit notes."),
+      };

     }
     }

-    @invoices = sort { return 1 if ($a->is_sales and $a->amount > 0);
-                          return 1 if (!$a->is_sales and $a->amount < 0);
-                          return -1; } @invoices                if $bank_transaction->amount > 0;
-    @invoices = sort { return -1 if ($a->is_sales and $a->amount > 0);
-                       return -1 if (!$a->is_sales and $a->amount < 0);
-                       return 1; } @invoices                    if $bank_transaction->amount < 0;
-
-    foreach my $invoice (@invoices) {
-      if ($amount_of_transaction == 0) {
-        flash('warning',  $::locale->text('There are invoices which could not be payed by bank transaction #1 (Account number: #2, bank code: #3)!',
-                                            $bank_transaction->purpose,
-                                            $bank_transaction->remote_account_number,
-                                            $bank_transaction->remote_bank_code));
-        last;
+
+    my $max_invoices = scalar(@{ $data{invoices} });
+    my $n_invoices   = 0;
+
+    foreach my $invoice (@{ $data{invoices} }) {
+      my $source = ($data{sources} // [])->[$n_invoices];
+      my $memo   = ($data{memos}   // [])->[$n_invoices];
+
+      $n_invoices++ ;
+
+      # Check if bank_transaction already has a link to the invoice, may only be linked once per invoice
+      # This might be caused by the user reloading a page and resending the form
+      if (_existing_record_link($bank_transaction, $invoice)) {
+        return {
+          %data,
+          result  => 'error',
+          message => $::locale->text("Bank transaction with id #1 has already been linked to #2.", $bank_transaction->id, $invoice->displayable_name),
+        };
+      }
+
+      if (!$amount_of_transaction && $invoice->open_amount) {
+        return {
+          %data,
+          result  => 'error',
+          message => $::locale->text("A payment can only be posted for multiple invoices if the amount to post is equal to or bigger than the sum of the open amounts of the affected invoices."),
+        };

       }
       }

-      #pay invoice or go to the next bank transaction if the amount is not sufficiently high
-      if ($invoice->amount <= $amount_of_transaction) {
-        $invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id, trans_id => $invoice->id, amount => $invoice->amount, transdate => $bank_transaction->transdate);
+
+      my $payment_type;
+      if ( defined $::form->{invoice_skontos}->{"$bt_id"} ) {
+        $payment_type = shift(@{ $::form->{invoice_skontos}->{"$bt_id"} });
+      } else {
+        $payment_type = 'without_skonto';
+      };
+
+
+      # pay invoice or go to the next bank transaction if the amount is not sufficiently high
+      if ($invoice->open_amount <= $amount_of_transaction && $n_invoices < $max_invoices) {
+        my $open_amount = ($payment_type eq 'with_skonto_pt'?$invoice->amount_less_skonto:$invoice->open_amount);
+        # first calculate new bank transaction amount ...

         if ($invoice->is_sales) {
         if ($invoice->is_sales) {

-          $amount_of_transaction -= $sign * $invoice->amount;
-          $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->amount);
+          $amount_of_transaction -= $sign * $open_amount;
+          $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $open_amount);

         } else {
         } else {

-          $amount_of_transaction += $sign * $invoice->amount if (!$invoice->is_sales);
-          $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->amount);
+          $amount_of_transaction += $sign * $open_amount;
+          $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $open_amount);

         }
         }

+        # ... and then pay the invoice
+        $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
+                              trans_id     => $invoice->id,
+                              amount       => $open_amount,
+                              payment_type => $payment_type,
+                              source       => $source,
+                              memo         => $memo,
+                              transdate    => $bank_transaction->transdate->to_kivitendo);

       } else {
       } else {

-        $invoice->pay_invoice(chart_id => $bank_transaction->local_bank_account->chart_id, trans_id => $invoice->id, amount => $amount_of_transaction, transdate => $bank_transaction->transdate);
-        $bank_transaction->invoice_amount($bank_transaction->amount) if $invoice->is_sales;
-        $bank_transaction->invoice_amount($bank_transaction->amount) if !$invoice->is_sales;
+        # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary
+
+        # this catches credit_notes and negative sales invoices
+        if ( $invoice->is_sales && $invoice->amount < 0 ) {
+          # $invoice->open_amount     is negative for credit_notes
+          # $bank_transaction->amount is negative for outgoing transactions
+          # so $amount_of_transaction is negative but needs positive
+          $amount_of_transaction *= -1;
+
+        } elsif (!$invoice->is_sales && $invoice->invoice_type eq 'ap_transaction' ) {
+          # $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
+          # but amount of transaction is for both positive
+          $amount_of_transaction *= -1 if $invoice->open_amount == - $amount_of_transaction;
+        }
+
+        my $overpaid_amount = $amount_of_transaction - $invoice->open_amount;
+        $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
+                              trans_id     => $invoice->id,
+                              amount       => $amount_of_transaction,
+                              payment_type => $payment_type,
+                              source       => $source,
+                              memo         => $memo,
+                              transdate    => $bank_transaction->transdate->to_kivitendo);
+        $bank_transaction->invoice_amount($bank_transaction->amount);

         $amount_of_transaction = 0;
         $amount_of_transaction = 0;

-      }

 
 

-      #Record a link from the bank transaction to the invoice
+        if ($overpaid_amount >= 0.01) {
+          push @warnings, {
+            %data,
+            result  => 'warning',
+            message => $::locale->text('Invoice #1 was overpaid by #2.', $invoice->invnumber, $::form->format_amount(\%::myconfig, $overpaid_amount, 2)),
+          };
+        }
+      }
+      # Record a record link from the bank transaction to the invoice

       my @props = (
       my @props = (

-          from_table => 'bank_transactions',
-          from_id    => $bt_id,
-          to_table   => $invoice->is_sales ? 'ar' : 'ap',
-          to_id      => $invoice->id,
-          );
+        from_table => 'bank_transactions',
+        from_id    => $bt_id,
+        to_table   => $invoice->is_sales ? 'ar' : 'ap',
+        to_id      => $invoice->id,
+      );
+
+      SL::DB::RecordLink->new(@props)->save;

 
 

-      my $existing = SL::DB::Manager::RecordLink->get_all(where => \@props, limit => 1)->[0];
+      # "close" a sepa_export_item if it exists
+      # code duplicated in action_save_proposals!
+      # currently only works, if there is only exactly one open sepa_export_item
+      if ( my $seis = $invoice->find_sepa_export_items({ executed => 0 }) ) {
+        if ( scalar @$seis == 1 ) {
+          # moved the execution and the check for sepa_export into a method,
+          # this isn't part of a transaction, though
+          $seis->[0]->set_executed if $invoice->id == $seis->[0]->arap_id;
+        }
+      }

 
 

-      SL::DB::RecordLink->new(@props)->save if !$existing;

     }
     $bank_transaction->save;
     }
     $bank_transaction->save;

-  }
-
-  $self->action_list();
-}
-
-sub action_save_proposals {
-  my ($self) = @_;

 
 

-  foreach my $bt_id (@{ $::form->{proposal_ids} }) {
-    #mark bt as booked
-    my $bt = SL::DB::Manager::BankTransaction->find_by(id => $bt_id);
-    $bt->invoice_amount($bt->amount);
-    $bt->save;
-
-    #pay invoice
-    my $arap = SL::DB::Manager::Invoice->find_by(id => $::form->{"proposed_invoice_$bt_id"});
-    $arap    = SL::DB::Manager::PurchaseInvoice->find_by(id => $::form->{"proposed_invoice_$bt_id"}) if not defined $arap;
-    $arap->pay_invoice(chart_id  => $bt->local_bank_account->chart_id,
-                       trans_id  => $arap->id,
-                       amount    => $arap->amount,
-                       transdate => $bt->transdate);
-    $arap->save;
-
-    #create record link
-    my @props = (
-        from_table => 'bank_transactions',
-        from_id    => $bt_id,
-        to_table   => $arap->is_sales ? 'ar' : 'ap',
-        to_id      => $arap->id,
-        );
-
-    my $existing = SL::DB::Manager::RecordLink->get_all(where => \@props, limit => 1)->[0];
-
-    SL::DB::RecordLink->new(@props)->save if !$existing;
-  }
+    # 'undef' means 'no error' here.
+    return undef;
+  };
+
+  my $error;
+  my $rez = $data{bank_transaction}->db->with_transaction(sub {
+    eval {
+      $error = $worker->();
+      1;
+
+    } or do {
+      $error = {
+        %data,
+        result  => 'error',
+        message => $@,
+      };
+    };

 
 

-  flash('ok', t8('#1 proposal(s) saved.', scalar @{ $::form->{proposal_ids} }));
+    # Rollback Fehler nicht weiterreichen
+    # die if $error;
+  });

 
 

-  $self->action_list();
+  return grep { $_ } ($error, @warnings);

 }
 
 #
 }
 
 #


@@ -520,12 +771,12 @@ sub make_filter_summary {
   my @filter_strings;
 
   my @filters = (
   my @filter_strings;
 
   my @filters = (

-    [ $filter->{"transdate:date::ge"},  $::locale->text('Transdate') . " " . $::locale->text('From Date') ],
-    [ $filter->{"transdate:date::le"},  $::locale->text('Transdate') . " " . $::locale->text('To Date')   ],
-    [ $filter->{"valutadate:date::ge"}, $::locale->text('Valutadate') . " " . $::locale->text('From Date') ],
-    [ $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->{"transdate:date::ge"},      $::locale->text('Transdate')  . " " . $::locale->text('From Date') ],
+    [ $filter->{"transdate:date::le"},      $::locale->text('Transdate')  . " " . $::locale->text('To Date')   ],
+    [ $filter->{"valutadate:date::ge"},     $::locale->text('Valutadate') . " " . $::locale->text('From Date') ],
+    [ $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')                              ],

   );
 
   for (@filters) {
   );
 
   for (@filters) {


@@ -543,24 +794,25 @@ sub prepare_report {
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 

-  my @columns     = qw(transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose local_account_number local_bank_code id);
-  my @sortable    = qw(transdate valudate remote_name remote_account_number remote_bank_code amount                                  purpose local_account_number local_bank_code);
+  my @columns     = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount invoice_amount invoices currency purpose local_account_number local_bank_code id);
+  my @sortable    = qw(local_bank_name transdate valudate remote_name remote_account_number remote_bank_code amount                                  purpose local_account_number local_bank_code);

 
   my %column_defs = (
 
   my %column_defs = (

-    transdate             => { sub => sub { $_[0]->transdate_as_date } },
-    valutadate            => { sub => sub { $_[0]->valutadate_as_date } },
+    transdate             => { sub   => sub { $_[0]->transdate_as_date } },
+    valutadate            => { sub   => sub { $_[0]->valutadate_as_date } },

     remote_name           => { },
     remote_account_number => { },
     remote_bank_code      => { },
     remote_name           => { },
     remote_account_number => { },
     remote_bank_code      => { },

-    amount                => { sub => sub { $_[0]->amount_as_number },
+    amount                => { sub   => sub { $_[0]->amount_as_number },

                                align => 'right' },
                                align => 'right' },

-    invoice_amount        => { sub => sub { $_[0]->invoice_amount_as_number },
+    invoice_amount        => { sub   => sub { $_[0]->invoice_amount_as_number },

                                align => 'right' },
                                align => 'right' },

-    invoices              => { sub => sub { $_[0]->linked_invoices } },
-    currency              => { sub => sub { $_[0]->currency->name } },
+    invoices              => { sub   => sub { $_[0]->linked_invoices } },
+    currency              => { sub   => sub { $_[0]->currency->name } },

     purpose               => { },
     purpose               => { },

-    local_account_number  => { sub => sub { $_[0]->local_bank_account->account_number } },
-    local_bank_code       => { sub => sub { $_[0]->local_bank_account->bank_code } },
+    local_account_number  => { sub   => sub { $_[0]->local_bank_account->account_number } },
+    local_bank_code       => { sub   => sub { $_[0]->local_bank_account->bank_code } },
+    local_bank_name       => { sub   => sub { $_[0]->local_bank_account->name } },

     id                    => {},
   );
 
     id                    => {},
   );
 


@@ -577,29 +829,44 @@ sub prepare_report {
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
   );
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);

-  $report->set_export_options(qw(list filter));
+  $report->set_export_options(qw(list_all filter));

   $report->set_options_from_form;
   $report->set_options_from_form;

-  $self->models->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+  $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;

   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
 
   $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
 

-  my $bank_accounts = SL::DB::Manager::BankAccount->get_all();
-  my $label_sub = sub { t8('#1 - Account number #2, bank code #3, #4', $_[0]->name, $_[0]->account_number, $_[0]->bank_code, $_[0]->bank )};
+  my $bank_accounts = SL::DB::Manager::BankAccount->get_all_sorted();

 
   $report->set_options(
 
   $report->set_options(

-    raw_top_info_text     => $self->render('bank_transactions/report_top',    { output => 0 }, BANK_ACCOUNTS => $bank_accounts, label_sub => $label_sub),
+    raw_top_info_text     => $self->render('bank_transactions/report_top',    { output => 0 }, BANK_ACCOUNTS => $bank_accounts),

     raw_bottom_info_text  => $self->render('bank_transactions/report_bottom', { output => 0 }),
   );
 }
 
     raw_bottom_info_text  => $self->render('bank_transactions/report_bottom', { output => 0 }),
   );
 }
 

+sub _existing_record_link {
+  my ($bt, $invoice) = @_;
+
+  # check whether a record link from banktransaction $bt already exists to
+  # invoice $invoice, returns 1 if that is the case
+
+  die unless $bt->isa("SL::DB::BankTransaction") && ( $invoice->isa("SL::DB::Invoice") || $invoice->isa("SL::DB::PurchaseInvoice") );
+
+  my $linked_record_to_table = $invoice->is_sales ? 'Invoice' : 'PurchaseInvoice';
+  my $linked_records = $bt->linked_records( direction => 'to', to => $linked_record_to_table, query => [ id => $invoice->id ]  );
+
+  return @$linked_records ? 1 : 0;
+};
+
+sub init_problems { [] }
+

 sub init_models {
   my ($self) = @_;
 
   SL::Controller::Helper::GetModels->new(
     controller => $self,
 sub init_models {
   my ($self) = @_;
 
   SL::Controller::Helper::GetModels->new(
     controller => $self,

-    sorted => {
+    sorted     => {

       _default => {
       _default => {

-        by    => 'transdate',
-        dir   => 1,
+        by  => 'transdate',
+        dir => 0,   # 1 = ASC, 0 = DESC : default sort is newest at top

       },
       transdate             => t8('Transdate'),
       remote_name           => t8('Remote name'),
       },
       transdate             => t8('Transdate'),
       remote_name           => t8('Remote name'),


@@ -613,9 +880,120 @@ sub init_models {
       purpose               => t8('Purpose'),
       local_account_number  => t8('Local account number'),
       local_bank_code       => t8('Local bank code'),
       purpose               => t8('Purpose'),
       local_account_number  => t8('Local account number'),
       local_bank_code       => t8('Local bank code'),

+      local_bank_name       => t8('Bank account'),

     },
     with_objects => [ 'local_bank_account', 'currency' ],
   );
 }
 
     },
     with_objects => [ 'local_bank_account', 'currency' ],
   );
 }
 

+sub load_ap_record_template_url {
+  my ($self, $template) = @_;
+
+  return $self->url_for(
+    controller                           => 'ap.pl',
+    action                               => 'load_record_template',
+    id                                   => $template->id,
+    'form_defaults.amount_1'             => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+    'form_defaults.transdate'            => $self->transaction->transdate_as_date,
+    'form_defaults.duedate'              => $self->transaction->transdate_as_date,
+    'form_defaults.no_payment_bookings'  => 1,
+    'form_defaults.paid_1_suggestion'    => $::form->format_amount(\%::myconfig, -1 * $self->transaction->amount, 2),
+    'form_defaults.AP_paid_1_suggestion' => $self->transaction->local_bank_account->chart->accno,
+    'form_defaults.callback'             => $self->callback,
+  );
+}
+
+sub setup_search_action_bar {
+  my ($self, %params) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Filter'),
+        submit    => [ '#search_form', { action => 'BankTransaction/list' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+
+sub setup_list_all_action_bar {
+  my ($self, %params) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Filter'),
+        submit    => [ '#filter_form', { action => 'BankTransaction/list_all' } ],
+        accesskey => 'enter',
+      ],
+    );
+  }
+}
+

 1;
 1;

+__END__
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+SL::Controller::BankTransaction - Posting payments to invoices from
+bank transactions imported earlier
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<save_single_bank_transaction %params>
+
+Takes a bank transaction ID (as parameter C<bank_transaction_id> and
+tries to post its amount to a certain number of invoices (parameter
+C<invoice_ids>, an array ref of database IDs to purchase or sales
+invoice objects).
+
+The whole function is wrapped in a database transaction. If an
+exception occurs the bank transaction is not posted at all. The same
+is true if the code detects an error during the execution, e.g. a bank
+transaction that's already been posted earlier. In both cases the
+database transaction will be rolled back.
+
+If warnings but not errors occur the database transaction is still
+committed.
+
+The return value is an error object or C<undef> if the function
+succeeded. The calling function will collect all warnings and errors
+and display them in a nicely formatted table if any occurred.
+
+An error object is a hash reference containing the following members:
+
+=over 2
+
+=item * C<result> — can be either C<warning> or C<error>. Warnings are
+displayed slightly different than errors.
+
+=item * C<message> — a human-readable message included in the list of
+errors meant as the description of why the problem happened
+
+=item * C<bank_transaction_id>, C<invoice_ids> — the same parameters
+that the function was called with
+
+=item * C<bank_transaction> — the database object
+(C<SL::DB::BankTransaction>) corresponding to C<bank_transaction_id>
+
+=item * C<invoices> — an array ref of the database objects (either
+C<SL::DB::Invoice> or C<SL::DB::PurchaseInvoice>) corresponding to
+C<invoice_ids>
+
+=back
+
+=back
+
+=head1 AUTHOR
+
+Niclas Zimmermann E<lt>niclas@kivitendo-premium.deE<gt>,
+Geoffrey Richardson E<lt>information@richardson-bueren.deE<gt>
+
+=cut