From 070f157f08df8da60ce4cdc221e6c8bf90293151 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 19 Jan 2012 23:31:37 +0100
Subject: [PATCH] Fix: Delete bank account

---
 htdocs/compta/bank/class/account.class.php | 18 +++++++++++++++---
 htdocs/compta/bank/fiche.php               |  7 ++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 724664ee403c3..08093a8f6fd23 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -89,13 +89,15 @@ class Account extends CommonObject
 
 
     /**
-     *  Constructeur
+     *  Constructor
+     *
+     *  @param	DoliDB		$db		Database handler
      */
-    function Account($DB)
+    function Account($db)
     {
         global $langs;
 
-        $this->db = $DB;
+        $this->db = $db;
 
         $this->clos = 0;
         $this->solde = 0;
@@ -113,6 +115,7 @@ function Account($DB)
 
     /**
      *  Return if a bank account need to be conciliated
+     *
      *  @return     int         1 if need to be concialiated, < 0 otherwise.
      */
     function canBeConciliated()
@@ -126,6 +129,7 @@ function canBeConciliated()
 
     /**
      *      Add a link between bank line record and its source
+     *
      *      @param      line_id     Id ecriture bancaire
      *      @param      url_id      Id parametre url
      *      @param      url         Url
@@ -166,6 +170,7 @@ function add_url_line($line_id, $url_id, $url, $label, $type)
     /**
      * 		TODO Move this into AccountLine
      *      Return array with links from llx_bank_url
+     *
      *      @param      fk_bank         To search using bank transaction id
      *      @param		url_id          To search using link to
      *      @param      type            To search using type
@@ -218,6 +223,7 @@ function get_url($fk_bank='', $url_id='', $type='')
 
     /**
      *  Add an entry into table ".MAIN_DB_PREFIX."bank
+     *
      *  @param		$date			Date operation
      *  @param		$oper			1,2,3,4... (deprecated) or TYP,VIR,PRE,LIQ,VAD,CB,CHQ...
      *  @param		$label			Descripton
@@ -336,6 +342,7 @@ function addline($date, $oper, $label, $amount, $num_chq='', $categorie='', $use
 
     /**
      *      Create bank account into database
+     *
      *      @param      user        Object user making action
      *      @return     int        < 0 if KO, > 0 if OK
      */
@@ -444,6 +451,7 @@ function create($user='')
 
     /**
      *    	Update bank account card
+     *
      *    	@param      user        Object user making action
      *		@return		int			<0 si ko, >0 si ok
      */
@@ -508,6 +516,7 @@ function update($user='')
 
     /**
      *    	Update BBAN (RIB) account fields
+     *
      *    	@param      user        Object user making update
      *		@return		int			<0 if KO, >0 if OK
      */
@@ -561,6 +570,7 @@ function update_bban($user='')
 
     /**
      *      Load a bank account into memory from database
+     *
      *      @param      id      	Id of bank account to get
      *      @param      ref     	Ref of bank account to get
      *      @param		ref_ext		External ref of bank account to get
@@ -658,6 +668,7 @@ function fetch($id,$ref='',$ref_ext='')
 
     /**
      *    Delete bank account from database
+     *
      *    @return      int         <0 if KO, >0 if OK
      */
     function delete()
@@ -682,6 +693,7 @@ function delete()
 
     /**
      *    Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+     *
      *    @param      mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
      *    @return     string        Libelle
      */
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index aad626de33db8..41af6721d52fa 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -173,9 +173,10 @@
 
 if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
 {
-    // Modification
-    $account = new Account($db, $_GET["id"]);
-    $account->delete($_GET["id"]);
+    // Delete
+    $account = new Account($db);
+    $account->fetch($_GET["id"]);
+    $account->delete();
 
     header("Location: ".DOL_URL_ROOT."/compta/bank/index.php");
     exit;