Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / bin / mozilla / bankaccounts.pl

diff --git a/bin/mozilla/bankaccounts.pl b/bin/mozilla/bankaccounts.pl
index 3155e25..941e407 100644 (file)
--- a/bin/mozilla/bankaccounts.pl
+++ b/bin/mozilla/bankaccounts.pl
@@ -32,6 +32,16 @@ sub bank_account_edit {
   $main::lxdebug->leave_sub();
 }
 
+sub bank_account_delete {
+  $::lxdebug->enter_sub();
+
+  SL::BankAccount->delete(id => $::form->{account}{id});
+
+  print $::form->redirect_header('bankaccounts.pl?action=bank_account_list');
+
+  $::lxdebug->leave_sub();
+}
+
 sub bank_account_display_form {
   $main::lxdebug->enter_sub();
 
@@ -63,9 +73,9 @@ sub bank_account_save {
 
   my $account = $form->{account} && (ref $form->{account} eq 'HASH') ? $form->{account} : { };
 
-  if (any { !$account->{$_} } qw(account_number bank_code iban bic)) {
+  if (any { !$account->{$_} } qw(name account_number bank_code iban bic)) {
     bank_account_display_form('account' => $account,
-                              'error'   => $locale->text('You have to fill in at least an account number, the bank code, the IBAN and the BIC.'));
+                              'error'   => $locale->text('You have to fill in at least a name, an account number, the bank code, the IBAN and the BIC.'));
 
     $main::lxdebug->leave_sub();
     return;
@@ -105,6 +115,7 @@ sub bank_account_list {
   my $href           = build_std_url('action=bank_account_list');
 
   my %column_defs = (
+    'name'           => { 'text' => $locale->text('Name'), },
     'account_number' => { 'text' => $locale->text('Account number'), },
     'bank_code'      => { 'text' => $locale->text('Bank code'), },
     'bank'           => { 'text' => $locale->text('Bank'), },
@@ -112,7 +123,7 @@ sub bank_account_list {
     'iban'           => { 'text' => $locale->text('IBAN'), },
   );
 
-  my @columns = qw(account_number bank bank_code bic iban);
+  my @columns = qw(name account_number bank bank_code bic iban);
 
   foreach my $name (@columns) {
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};