Bankauszug verbuchen: Warnungen/Fehler anzeigen; pro Zeile eine DB-Transaktion

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

diff --git a/SL/Controller/BankTransaction.pm b/SL/Controller/BankTransaction.pm
index a8d424c2daa355af73fa46db89af9d8f80a9a2ff..c16173537beb2a872ebdc414ebf92cfd26bb6b0d 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -23,12 +23,13 @@ use SL::DB::AccTransaction;
 use SL::DB::Tax;
 use SL::DB::Draft;
 use SL::DB::BankAccount;
 use SL::DB::Tax;
 use SL::DB::Draft;
 use SL::DB::BankAccount;

+use SL::DBUtils qw(like);

 use SL::Presenter;
 use List::Util qw(max);
 
 use Rose::Object::MakeMethods::Generic
 (
 use SL::Presenter;
 use List::Util qw(max);
 
 use Rose::Object::MakeMethods::Generic
 (

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

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


@@ -78,18 +79,24 @@ sub action_list {
   push @where, (transdate => { lt => $todate })   if ($todate);
   my $bank_account = SL::DB::Manager::BankAccount->find_by( id => $::form->{filter}{bank_account} );
   # bank_transactions no younger than starting date,
   push @where, (transdate => { lt => $todate })   if ($todate);
   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 ) {
   # but OPEN invoices to be matched may be from before
   if ( $bank_account->reconciliation_starting_date ) {

-    push @where, (transdate => { gt => $bank_account->reconciliation_starting_date });
+    push @where, (transdate => { ge => $bank_account->reconciliation_starting_date });

   };
 
   };
 

-  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 $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
+    ],
+  );

 
 

-  my $all_open_ar_invoices = SL::DB::Manager::Invoice->get_all(where => [amount => { gt => \'paid' }], with_objects => 'customer');
+  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 @all_open_invoices;
   my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => [amount => { gt => \'paid' }], with_objects => 'vendor');
 
   my @all_open_invoices;


@@ -144,9 +151,12 @@ sub action_list {
   # * 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?)
   my $proposal_threshold = 5;
   # * 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?)
   my $proposal_threshold = 5;

-  my @proposals = grep { $_->{agreement} >= $proposal_threshold
-                         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 };
+  my @proposals = 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 };

 
   # 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;
 
   # 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;


@@ -165,8 +175,9 @@ sub action_assign_invoice {
 
   $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
 
 
   $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 {
 }
 
 sub action_create_invoice {


@@ -176,6 +187,8 @@ sub action_create_invoice {
   $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});
 
   $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 $use_vendor_filter = $self->{transaction}->{remote_account_number} && $vendor_of_transaction;
+

   my $drafts = SL::DB::Manager::Draft->get_all(where => [ module => 'ap'] , with_objects => 'employee');
 
   my @filtered_drafts;
   my $drafts = SL::DB::Manager::Draft->get_all(where => [ module => 'ap'] , with_objects => 'employee');
 
   my @filtered_drafts;


@@ -189,22 +202,25 @@ sub action_create_invoice {
   }
 
   #Filter drafts
   }
 
   #Filter drafts

-  @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $vendor_of_transaction;
+  @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $use_vendor_filter;

 
   my $all_vendors = SL::DB::Manager::Vendor->get_all();
 
   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',
+  my $callback    = $self->url_for(action                => 'list',

                                    'filter.bank_account' => $::form->{filter}->{bank_account},
                                    'filter.todate'       => $::form->{filter}->{todate},
                                    'filter.bank_account' => $::form->{filter}->{bank_account},
                                    'filter.todate'       => $::form->{filter}->{todate},

-                                   'filter.fromdate'     => $::form->{filter}->{fromdate}),
-      );
+                                   'filter.fromdate'     => $::form->{filter}->{fromdate});
+
+  $self->render(
+    'bank_transactions/create_invoice',
+    { layout => 0 },
+    title       => t8('Create invoice'),
+    DRAFTS      => \@filtered_drafts,
+    vendor_id   => $use_vendor_filter ? $vendor_of_transaction->id   : undef,
+    vendor_name => $use_vendor_filter ? $vendor_of_transaction->name : undef,
+    ALL_VENDORS => $all_vendors,
+    limit       => $myconfig{vclimit},
+    callback    => $callback,
+  );

 }
 
 sub action_ajax_payment_suggestion {
 }
 
 sub action_ajax_payment_suggestion {


@@ -214,9 +230,8 @@ sub action_ajax_payment_suggestion {
   # 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
 
   # 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 $bt = SL::DB::Manager::BankTransaction->find_by( id => $::form->{bt_id} );
-  my $invoice = SL::DB::Manager::Invoice->find_by( id => $::form->{prop_id} );
-  $invoice = SL::DB::Manager::PurchaseInvoice->find_by( id => $::form->{prop_id} ) unless $invoice;
+  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} );

 
   die unless $bt and $invoice;
 
 
   die unless $bt and $invoice;
 


@@ -224,10 +239,13 @@ sub action_ajax_payment_suggestion {
 
   my $html;
   $html .= SL::Presenter->input_tag('invoice_ids.' . $::form->{bt_id} . '[]', $::form->{prop_id} , type => 'hidden');
 
   my $html;
   $html .= SL::Presenter->input_tag('invoice_ids.' . $::form->{bt_id} . '[]', $::form->{prop_id} , type => 'hidden');

-  $html .= SL::Presenter->escape( $invoice->invnumber );
-  $html .= SL::Presenter->select_tag('invoice_skontos.' . $::form->{bt_id} . '[]', \@select_options,
-                                              value_key => 'payment_type',
-                                              title_key => 'display' ) if @select_options;
+  $html .= SL::Presenter->escape(t8('Invno.')      . ': ' . $invoice->invnumber . ' ');
+  $html .= SL::Presenter->escape(t8('Open amount') . ': ' . $::form->format_amount(\%::myconfig, $invoice->open_amount, 2) . ' ');
+  $html .= SL::Presenter->select_tag('invoice_skontos.' . $::form->{bt_id} . '[]',
+                                     \@select_options,
+                                     value_key => 'payment_type',
+                                     title_key => 'display' )
+    if @select_options;

   $html .= '<a href=# onclick="delete_invoice(' . $::form->{bt_id} . ',' . $::form->{prop_id} . ');">x</a>';
   $html = SL::Presenter->html_tag('div', $html, id => $::form->{bt_id} . '.' . $::form->{prop_id});
 
   $html .= '<a href=# onclick="delete_invoice(' . $::form->{bt_id} . ',' . $::form->{prop_id} . ');">x</a>';
   $html = SL::Presenter->html_tag('div', $html, id => $::form->{bt_id} . '.' . $::form->{prop_id});
 


@@ -237,33 +255,36 @@ sub action_ajax_payment_suggestion {
 sub action_filter_drafts {
   my ($self) = @_;
 
 sub action_filter_drafts {
   my ($self) = @_;
 

-  $self->{transaction} = SL::DB::Manager::BankTransaction->find_by(id => $::form->{bt_id});
+  $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 $vendor_of_transaction = SL::DB::Manager::Vendor->find_by(account_number => $self->{transaction}->{remote_account_number});
 

-  my $drafts = SL::DB::Manager::Draft->get_all(with_objects => 'employee');
+  my $drafts                = SL::DB::Manager::Draft->get_all(with_objects => 'employee');

 
   my @filtered_drafts;
 
   foreach my $draft ( @{ $drafts } ) {
     my $draft_as_object = YAML::Load($draft->form);
 
   my @filtered_drafts;
 
   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;
+    next unless $draft_as_object->{vendor_id};  # we cannot filter for vendor name, if this is a gl draft
+
+    my $vendor          = SL::DB::Manager::Vendor->find_by(id => $draft_as_object->{vendor_id});
+    $draft->{vendor}    = $vendor->name;

     $draft->{vendor_id} = $vendor->id;
     $draft->{vendor_id} = $vendor->id;

+

     push @filtered_drafts, $draft;
   }
 
   my $vendor_name = $::form->{vendor};
     push @filtered_drafts, $draft;
   }
 
   my $vendor_name = $::form->{vendor};

-  my $vendor_id = $::form->{vendor_id};
+  my $vendor_id   = $::form->{vendor_id};

 
   #Filter drafts
 
   #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;
+  @filtered_drafts = grep { $_->{vendor_id} == $vendor_id      } @filtered_drafts if $vendor_id;
+  @filtered_drafts = grep { $_->{vendor}    =~ /$vendor_name/i } @filtered_drafts if $vendor_name;

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

-      'bank_transactions/filter_drafts',
-      { output      => 0 },
-      DRAFTS => \@filtered_drafts,
-      );
+    'bank_transactions/filter_drafts',
+    { output => 0 },
+    DRAFTS => \@filtered_drafts,
+  );

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


@@ -277,8 +298,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}) {


@@ -287,13 +308,13 @@ 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}) {


@@ -313,20 +334,20 @@ sub action_ajax_add_list {
     };
   }
 
     };
   }
 

-  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;
-  # filter out subcent differences from 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;
 
   my $output  = $self->render(
   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;
 
   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 );
 


@@ -338,108 +359,234 @@ 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 action_save_invoices {
   my ($self) = @_;
 
   my $invoice_hash = delete $::form->{invoice_ids}; # each key (the bt line with a bt_id) contains an array of invoice_ids
 }
 
 sub action_save_invoices {
   my ($self) = @_;
 
   my $invoice_hash = delete $::form->{invoice_ids}; # each key (the bt line with a bt_id) contains an array of invoice_ids

-  my $skonto_hash  = delete $::form->{invoice_skontos} || {}; # array containing the payment type, could be empty

 
 

-  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;
+  # 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([]);
+
+  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,
+    );
+  }
+
+  $self->action_list();
+}
+
+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 (@warnings);
+
+  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 @invoices;
     my $amount_of_transaction = $sign * $bank_transaction->amount;
 
     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));
+    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 @invoices, $invoice;

     }
     }

-    @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);
+
+    $data{invoices} = \@invoices;
+
+    @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 if (!$a->is_sales and $a->amount < 0);

-                       return 1; } @invoices                    if $bank_transaction->amount < 0;
+                       return 1;
+                     } @invoices if $bank_transaction->amount < 0;
+
+    my $max_invoices = scalar(@invoices);
+    my $n_invoices   = 0;

 
     foreach my $invoice (@invoices) {
 
     foreach my $invoice (@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 == 0) {
+        push @warnings, {
+          %data,
+          result  => 'warning',
+          message => $::locale->text('There are invoices which could not be paid 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 $payment_type;
       my $payment_type;

-      if ( defined $skonto_hash->{"$bt_id"} ) {
-        $payment_type = shift(@{ $skonto_hash->{"$bt_id"} });
+      if ( defined $::form->{invoice_skontos}->{"$bt_id"} ) {
+        $payment_type = shift(@{ $::form->{invoice_skontos}->{"$bt_id"} });

       } else {
         $payment_type = 'without_skonto';
       };
       } else {
         $payment_type = 'without_skonto';
       };

-      if ($amount_of_transaction == 0) {
-        flash('warning',  $::locale->text('There are invoices which could not be paid by bank transaction #1 (Account number: #2, bank code: #3)!',
-                                            $bank_transaction->purpose,
-                                            $bank_transaction->remote_account_number,
-                                            $bank_transaction->remote_bank_code));
-        last;
-      }
-      #pay invoice or go to the next bank transaction if the amount is not sufficiently high
-      if ($invoice->amount <= $amount_of_transaction) {
+
+      # 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) {
+        # first calculate new bank transaction amount ...
+        if ($invoice->is_sales) {
+          $amount_of_transaction -= $sign * $invoice->open_amount;
+          $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->open_amount);
+        } else {
+          $amount_of_transaction += $sign * $invoice->open_amount;
+          $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->open_amount);
+        }
+        # ... and then pay the invoice

         $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
                               trans_id     => $invoice->id,
         $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
                               trans_id     => $invoice->id,

-                              amount       => $invoice->amount,
+                              amount       => $invoice->open_amount,

                               payment_type => $payment_type,
                               transdate    => $bank_transaction->transdate->to_kivitendo);
                               payment_type => $payment_type,
                               transdate    => $bank_transaction->transdate->to_kivitendo);

-        if ($invoice->is_sales) {
-          $amount_of_transaction -= $sign * $invoice->amount;
-          $bank_transaction->invoice_amount($bank_transaction->invoice_amount + $invoice->amount);
-        } else {
-          $amount_of_transaction += $sign * $invoice->amount if (!$invoice->is_sales);
-          $bank_transaction->invoice_amount($bank_transaction->invoice_amount - $invoice->amount);
-        }
-      } else {
+      } else { # use the whole amount of the bank transaction for the invoice, overpay the invoice if necessary

         $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
                               trans_id     => $invoice->id,
                               amount       => $amount_of_transaction,
                               payment_type => $payment_type,
                               transdate    => $bank_transaction->transdate->to_kivitendo);
         $invoice->pay_invoice(chart_id     => $bank_transaction->local_bank_account->chart_id,
                               trans_id     => $invoice->id,
                               amount       => $amount_of_transaction,
                               payment_type => $payment_type,
                               transdate    => $bank_transaction->transdate->to_kivitendo);

-        $bank_transaction->invoice_amount($bank_transaction->amount) if $invoice->is_sales;
-        $bank_transaction->invoice_amount($bank_transaction->amount) if !$invoice->is_sales;
+        $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
+      # 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,
+      );

 
 

-      my $existing = SL::DB::Manager::RecordLink->get_all(where => \@props, limit => 1)->[0];
+      SL::DB::RecordLink->new(@props)->save;
+
+      # "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();
+    # '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 => $@,
+      };
+    };
+
+    die if $error;
+  });
+
+  return grep { $_ } ($error, @warnings);

 }
 
 sub action_save_proposals {
   my ($self) = @_;
 
   foreach my $bt_id (@{ $::form->{proposal_ids} }) {
 }
 
 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);
     my $bt = SL::DB::Manager::BankTransaction->find_by(id => $bt_id);

+
+    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;
+
+    # check for existing record_link for that $bt and $arap
+    # do this before any changes to $bt are made
+    die t8("Bank transaction with id #1 has already been linked to #2.", $bt->id, $arap->displayable_name)
+      if _existing_record_link($bt, $arap);
+
+    #mark bt as booked

     $bt->invoice_amount($bt->amount);
     $bt->save;
 
     #pay invoice
     $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,
     $arap->pay_invoice(chart_id  => $bt->local_bank_account->chart_id,
                        trans_id  => $arap->id,
                        amount    => $arap->amount,


@@ -448,15 +595,24 @@ sub action_save_proposals {
 
     #create record link
     my @props = (
 
     #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;
+      from_table => 'bank_transactions',
+      from_id    => $bt_id,
+      to_table   => $arap->is_sales ? 'ar' : 'ap',
+      to_id      => $arap->id,
+    );
+
+    SL::DB::RecordLink->new(@props)->save;
+
+    # code duplicated in action_save_invoices!
+    # "close" a sepa_export_item if it exists
+    # currently only works, if there is only exactly one open sepa_export_item
+    if ( my $seis = $arap->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 $arap->id == $seis->[0]->arap_id;
+      }
+    }

   }
 
   flash('ok', t8('#1 proposal(s) saved.', scalar @{ $::form->{proposal_ids} }));
   }
 
   flash('ok', t8('#1 proposal(s) saved.', scalar @{ $::form->{proposal_ids} }));


@@ -483,12 +639,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) {


@@ -510,21 +666,21 @@ sub prepare_report {
   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 @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 = (

-    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_bank_name       => { sub => sub { $_[0]->local_bank_account->name } },
+    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                    => {},
   );
 


@@ -554,15 +710,31 @@ sub prepare_report {
   );
 }
 
   );
 }
 

+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   => 0,   # 1 = ASC, 0 = DESC : default sort is newest at top
+        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'),