From 3be5c66cd736fa8007bbab5df29d59e022dbf7e5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 8 Jun 2006 09:46:25 +0000
Subject: [PATCH] =?UTF-8?q?d=E9but=20ajout=20option=20:=20confirmation=20d?=
 =?UTF-8?q?e=20suppression=20d'une=20ligne=20produit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/produit.php      | 4 ++--
 htdocs/comm/propal.php        | 2 +-
 htdocs/langs/en_US/admin.lang | 1 +
 htdocs/langs/fr_FR/admin.lang | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/produit.php b/htdocs/admin/produit.php
index 585ebf72fe4..6a0e04ce964 100644
--- a/htdocs/admin/produit.php
+++ b/htdocs/admin/produit.php
@@ -133,13 +133,13 @@ else if ($_GET["action"] == 'disable_sousproduits')
     Header("Location: produit.php");
     exit;
 }
-else if ($_GET["action"] == 'activate_confirmdelete')
+else if ($_GET["action"] == 'activate_confirmdeleteline')
 {
     dolibarr_set_const($db, "PRODUIT_CONFIRM_DELETE_LINE", "1");
     Header("Location: produit.php");
     exit;
 }
-else if ($_GET["action"] == 'disable_confirmdelete')
+else if ($_GET["action"] == 'disable_confirmdeleteline')
 {
 	dolibarr_del_const($db, "PRODUIT_CONFIRM_DELETE_LINE");
     Header("Location: produit.php");
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index a2aa08a18b7..932067b50c0 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -96,7 +96,7 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes
     	$propal->delete_product($_GET['ligne']);
     	propale_pdf_create($db, $_GET['propalid'], $propal->modelpdf);
     }
-    Header('Location: '.$_SERVER["PHP_SELF"]);
+    Header('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET['propalid']);
     exit;
 }
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d65261e536e..31b16004012 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -461,6 +461,7 @@ LDAPSetupForVersion2=LDAP server configured for version 2
 ##### Products #####
 ProductSetup=Products module setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
+ConfirmDeleteProductLineAbility=Confirmation of removal of a line produces in the forms 
 ##### Sendings #####
 SendingsSetup=Sending module setup
 SendingsReceiptModel=Sending receipt model
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 54a51268efc..5ebe6d9faef 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -461,6 +461,7 @@ LDAPSetupForVersion2=Serveur LDAP configur
 ##### Products #####
 ProductSetup=Configuration du module Produits
 NumberOfProductShowInSelect=Nombre de produits max dans les listes déroulantes (0=aucune limite)
+ConfirmDeleteProductLineAbility=Confirmation de suppression d'une ligne produit dans les formulaires
 ##### Sendings #####
 SendingsSetup=Configuration du module Expéditions/Livraisons
 SendingsReceiptModel=Modèle du bordereau d'expédition