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 50c151902d95b56ca6861e5c89d7a4a14c202775..c16173537beb2a872ebdc414ebf92cfd26bb6b0d 100644 (file)
--- a/SL/Controller/BankTransaction.pm
+++ b/SL/Controller/BankTransaction.pm
@@ -29,7 +29,7 @@ use List::Util qw(max);
 
 use Rose::Object::MakeMethods::Generic
 (
 
 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');


@@ -85,13 +85,18 @@ sub action_list {
     push @where, (transdate => { ge => $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;


@@ -146,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;


@@ -167,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 {


@@ -196,19 +205,22 @@ sub action_create_invoice {
   @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $use_vendor_filter;
 
   my $all_vendors = SL::DB::Manager::Vendor->get_all();
   @filtered_drafts = grep { $_->{vendor_id} == $vendor_of_transaction->id } @filtered_drafts if $use_vendor_filter;
 
   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  => $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   => $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 {


@@ -227,12 +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');

-  # better in template code - but how to ajax this
-  $html .= SL::Presenter->escape(t8('Invno.') . ': ' . $invoice->invnumber . ' ');
+  $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->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 .= 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});
 


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


@@ -319,7 +334,7 @@ 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_invoices = @{ $all_open_ar_invoices };
   my $all_open_ap_invoices = SL::DB::Manager::PurchaseInvoice->get_all(where => \@where_purchase, with_objects => 'vendor');
 
   my @all_open_invoices = @{ $all_open_ar_invoices };


@@ -329,10 +344,10 @@ sub action_ajax_add_list {
   @all_open_invoices = sort { $a->id <=> $b->id } @all_open_invoices;
 
   my $output  = $self->render(
   @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 );
 


@@ -348,9 +363,12 @@ sub action_ajax_accept_invoices {
     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 {
 }
 
 sub action_save_invoices {


@@ -376,20 +394,64 @@ sub action_save_invoices {
   #           '44' => [ '50', '51', 52' ]
   #         };
 
   #           '44' => [ '50', '51', 52' ]
   #         };
 

-  my $skonto_hash  = delete $::form->{invoice_skontos} || {}; # array containing the payment type, could be empty
+  $::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
 
 
   # a bank_transaction may be assigned to several invoices, i.e. a customer
   # might pay several open invoices with one transaction
 

-  while ( my ($bt_id, $invoice_ids) = each(%$invoice_hash) ) {
-    my $bank_transaction      = SL::DB::Manager::BankTransaction->find_by(id => $bt_id);
+  $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 $sign                  = $bank_transaction->amount < 0 ? -1 : 1;
     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;

     }
     }

+
+    $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 = sort { return 1 if ( $a->is_sales and $a->amount > 0);
                        return 1 if (!$a->is_sales and $a->amount < 0);
                        return -1;


@@ -407,22 +469,31 @@ sub action_save_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
       $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

-      die t8("Bank transaction with id #1 has already been linked to #2.", $bank_transaction->id, $invoice->displayable_name)
-        if _existing_record_link($bank_transaction, $invoice);
+      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->open_amount <= $amount_of_transaction && $n_invoices < $max_invoices) {
         # first calculate new bank transaction amount ...
       # 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 ...


@@ -451,11 +522,11 @@ sub action_save_invoices {
 
       # Record a record link from the bank transaction to the invoice
       my @props = (
 
       # Record a record link from the bank transaction to the invoice
       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;
 
 
       SL::DB::RecordLink->new(@props)->save;
 


@@ -467,14 +538,34 @@ sub action_save_invoices {
           # 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;
           # 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;

-        };
-      };
+        }
+      }

 
     }
     $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 {
 }
 
 sub action_save_proposals {


@@ -504,11 +595,11 @@ 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,
-        );
+      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;
 
 
     SL::DB::RecordLink->new(@props)->save;
 


@@ -520,8 +611,8 @@ sub action_save_proposals {
         # 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;
         # 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} }));


@@ -548,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) {


@@ -575,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                    => {},
   );
 


@@ -633,16 +724,17 @@ sub _existing_record_link {
   return @$linked_records ? 1 : 0;
 };
 
   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'),