From 241c6a6836395052e79ee4a47ad8e1d4e876e6cd Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Fri, 12 Sep 2003 12:58:58 +0000
Subject: [PATCH] Ajout suppression

---
 htdocs/comm/propal.php | 56 ++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 85a446b966b..ae1fd6ff096 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -53,12 +53,24 @@ if ($user->societe_id > 0)
   $socidp = $user->societe_id;
 }
 
-llxHeader();
-
 /******************************************************************************/
 /*                     Actions                                                */
 /******************************************************************************/
 
+if ($HTTP_POST_VARS["action"] == 'confirm_delete' && $HTTP_POST_VARS["confirm"] == yes)
+{
+  if ($user->rights->propale->supprimer ) 
+    {
+      $propal = new Propal($db, 0, $propalid);
+      $propal->delete();
+      $propalid = 0;
+      $brouillon = 1;
+    }
+
+  Header("Location: propal.php");
+}
+
+
 if ($action == 'add') 
 {
   $propal = new Propal($db, $socidp);
@@ -182,32 +194,6 @@ if ($action == 'del_ligne' && $user->rights->propale->creer)
   
 }
 
-if ( $action == 'delete' && $user->rights->propale->supprimer ) 
-{
-  $sql = "DELETE FROM llx_propal WHERE rowid = $propalid;";
-  if ( $db->query($sql) ) 
-    {
-
-      $sql = "DELETE FROM llx_propaldet WHERE fk_propal = $propalid ;";
-      if ( $db->query($sql) ) 
-	{
-	  print "<b><font color=\"red\">Propal supprimée</font></b>";
-	}
-      else
-	{
-	  print $db->error();
-	  print "<p>$sql";
-	} 
-    }
-  else
-    {
-      print $db->error();
-      print "<p>$sql";
-    }
-  $propalid = 0;
-  $brouillon = 1;
-}
-
 if ($valid == 1 && $user->rights->propale->valider)
 {
   $propal = new Propal($db);
@@ -218,6 +204,8 @@ if ($valid == 1 && $user->rights->propale->valider)
 }
 
 
+llxHeader();
+
 /******************************************************************************/
 /*                   Fin des  Actions                                         */
 /******************************************************************************/
@@ -229,6 +217,8 @@ if ($valid == 1 && $user->rights->propale->valider)
  */
 if ($propalid)
 {
+  $html = new Form($db);
+
   $propal = new Propal($db);
   $propal->fetch($propalid);
 
@@ -238,6 +228,15 @@ if ($propalid)
   print "<table width=\"100%\">";
   print "<tr><td><div class=\"titre\">Proposition commerciale : $propal->ref</div></td>";
   print "</table>";
+
+  /*
+   * Confirmation de la suppression de l'adhérent
+   *
+   */
+  if ($action == 'delete')
+    {
+      $html->form_confirm("$PHP_SELF?propalid=$propalid","Supprimer la proposition","Etes-vous sûr de vouloir modifier cette proposition ?","confirm_delete");
+    }
   /*
    *
    */
@@ -444,7 +443,6 @@ if ($propalid)
 	       * Produits génériques
 	       *
 	       */
-	      $html = new Form($db);
 	      $var=!$var;
 	      print '<form action="propal.php?propalid='.$propalid.'" method="post">';
 	      print '<input type="hidden" name="action" value="addproduct">';