From 3a694a2a8d18a1ce7e5124e7fc5f9128be555bd7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 4 Feb 2007 14:05:54 +0000
Subject: [PATCH] =?UTF-8?q?Tache=206462:=20Ajout=20message=20confirmation?=
 =?UTF-8?q?=20sur=20suppression=20ligne=20=E9criture=20bancaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/bank/account.php | 41 +++++++++++++++++++++-------------
 htdocs/langs/en_US/banks.lang  |  2 ++
 htdocs/langs/fr_FR/banks.lang  |  2 ++
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index de6b552d31c..0af409eefac 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -48,7 +48,7 @@ $page=isset($_GET["page"])?$_GET["page"]:0;
 * Action
 */
 
-if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]))
+if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]) && $user->rights->banque->modifier)
 {
     if ($_POST["credit"] > 0)
     {
@@ -79,10 +79,11 @@ if ($_POST["action"] == 'add' && $account && ! isset($_POST["cancel"]))
         dolibarr_print_error($db,$acct->error);
     }
 }
-if ($_GET["action"] == 'del' && $account && $user->rights->banque->modifier)
+if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"]=='yes' && $user->rights->banque->modifier)
 {
-    $acct=new Account($db,$account);
-    $acct->deleteline($_GET["rowid"]);
+    $acct=new Account($db);
+	$acct->id=$account;
+    $result=$acct->deleteline($_GET["rowid"]);
 }
 
 
@@ -92,6 +93,8 @@ if ($_GET["action"] == 'del' && $account && $user->rights->banque->modifier)
 
 llxHeader();
 
+$html = new Form($db);
+
 if ($account > 0)
 {
 	if ($vline)
@@ -185,9 +188,14 @@ if ($account > 0)
 		$limitsql = $nbline;
 	}
 
+
+	// Onglets
+	$head=bank_prepare_head($acct);
+	dolibarr_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0);
+	
+
 	/**
-	* Formulaire de recherche
-	*
+	* Bandeau recherche
 	*/
 	$mesg='';
 
@@ -201,20 +209,23 @@ if ($account > 0)
 	{
 		$mesg.= '<a href="account.php?account='.$acct->id.'&amp;page='.($page-1).'">'.img_next().'</a>';
 	}
-
-
-	// Onglets
-	$head=bank_prepare_head($acct);
-	dolibarr_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0);
-	
-	if (! $_GET["action"]=='addline')
+	if (! $_GET["action"]=='addline' && ! $_GET["action"]=='delete')
 	{
 		$titre=$langs->trans("FinancialAccount")." : ".$acct->label;
 		print_fiche_titre($titre,$mesg);
 	}
+
+	if ($_GET["action"]=='delete')
+	{
+		$text=$langs->trans('ConfirmDeleteTransaction');
+		$html->form_confirm($_SERVER['PHP_SELF'].'?account='.$acct->id.'&amp;rowid='.$_GET["rowid"],$langs->trans('DeleteTransaction'),$text,'confirm_delete');
+		print '<br />';
+	}
+
 	
 	print '<table class="notopnoleftnoright" width="100%">';
 
+	
 	/*
 	* Affiche tableau des transactions bancaires
 	*
@@ -335,7 +346,7 @@ if ($account > 0)
 	/*
 	*  Boutons actions
 	*/
-	if ($_GET["action"] != 'addline')
+	if ($_GET["action"] != 'addline' && $_GET["action"] != 'delete')
 	{
 		print '<div class="tabsAction">';
 
@@ -502,7 +513,7 @@ function _print_lines($db,$result,$sql,$acct)
                     print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
                     print img_edit();
                     print '</a> &nbsp;';
-                    print '<a href="account.php?action=del&amp;rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
+                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?action=delete&amp;rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
                     print img_delete();
                     print '</a></td>';
                 }
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 7d0dee4cd43..fbbe3dfff66 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -96,3 +96,5 @@ TransferDesc=Transfer from one account to another one, Dolibarr will write two r
 TransferFrom=From
 TransferTo=To
 CheckTransmitter=Transmitter
+DeleteTransaction=Delete transaction
+ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 1786a9bba54..5d6e8d0f0f7 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -100,3 +100,5 @@ ValidateCheckReceipt=Valider ce bordereau de remise ?
 DeleteCheckReceipt=Supprimer ce bordereau de remise ?
 BankChecks=Chèques
 BankChecksToReceipt=Chèques à déposer
+DeleteTransaction=Supprimer la transaction
+ConfirmDeleteTransaction=Etes Vous sur de vouloir supprimer cette transaction ?