From: Thomas Heck <theck@linet-services.de>
Date: Fri, 14 Dec 2012 15:31:26 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.1.0beta1~778
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/d7c4629da258777b4adfeda0ea92b5d27f21e872?hp=1725e45ad587ba8d7f637d3e8e00221e959424d1

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/BankAccount.pm b/SL/BankAccount.pm
index 4194d5c5c..f17ec1ede 100644
--- a/SL/BankAccount.pm
+++ b/SL/BankAccount.pm
@@ -57,6 +57,28 @@ sub retrieve {
   return $account;
 }
 
+sub delete {
+  $::lxdebug->enter_sub();
+
+  my $self     = shift;
+  my %params   = @_;
+
+  Common::check_params(\%params, qw(id));
+
+  my $dbh = $params{dbh} || $::form->get_standard_dbh(%::myconfig);
+
+  my $query = '
+    DELETE
+    FROM bank_accounts
+    WHERE id = ?';
+
+  do_query($::form, $dbh, $query, conv_i($params{id}));
+
+  $dbh->commit();
+
+  $::lxdebug->leave_sub();
+}
+
 sub list {
   $main::lxdebug->enter_sub();
 
diff --git a/bin/mozilla/bankaccounts.pl b/bin/mozilla/bankaccounts.pl
index 3155e2558..a11fb6bb6 100644
--- 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();
 
diff --git a/templates/webpages/bankaccounts/bank_account_display_form.html b/templates/webpages/bankaccounts/bank_account_display_form.html
index 7642d4f93..ef4febeb9 100644
--- a/templates/webpages/bankaccounts/bank_account_display_form.html
+++ b/templates/webpages/bankaccounts/bank_account_display_form.html
@@ -59,7 +59,7 @@
 
 [%- IF account.id %]
    <input type="submit" name="action_bank_account_save" value="[% 'Save' | $T8 %]">
-   <!-- <input type="submit" name="action_bank_account_delete" value="[% 'Delete' | $T8 %]"> -->
+   <input type="submit" name="action_bank_account_delete" value="[% 'Delete' | $T8 %]">
 [%- ELSE %]
    <input type="submit" name="action_bank_account_save" value="[% 'Add' | $T8 %]">
 [%- END %]