From 0a80d74153c0bf628450ec0afceedf857118ff2e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 25 Mar 2006 17:21:20 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20bouton=20de=20retour=20au=20produit=20a?=
 =?UTF-8?q?pr=E8s=20cr=E9ation=20de=20la=20cat=E9gorie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/categories/fiche.php        | 8 ++++----
 htdocs/langs/en_US/categories.lang | 3 ++-
 htdocs/langs/fr_FR/categories.lang | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php
index 882ae9bd265..cfecbba58e1 100644
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -41,9 +41,9 @@ else
 	$nbcats = 1;
 }
 
-if ($_GET['origin'])
+if ($_REQUEST['origin'])
 {
-	$idprodorigin = $_GET['origin'];
+	$idprodorigin = $_REQUEST['origin'];
 }
 
 llxHeader("","",$langs->trans("Categories"));
@@ -88,9 +88,9 @@ if ($_POST["action"] == 'add' && $user->rights->categorie->creer)
                 print '<tr><td valign="top" width="30%">';
                 print '<p>'.$langs->trans("TheCategorie").' '.$categorie->label.' '.$langs->trans("WasAddedSuccessfully").'</p>';
                 
-                if ($_GET['idprodorigin'])
+                if ($_REQUEST['idprodorigin'])
                 {
-                	$idprodorigin = $_GET['idprodorigin'];
+                	$idprodorigin = $_REQUEST['idprodorigin'];
                 	print '<p><a class="butAction" href="'.DOL_URL_ROOT.'/product/categorie.php?id='.$idprodorigin.'">'.$langs->trans("ReturnInProduct").'</a></p>';
                 }
                 
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 33f47b28c16..e0c5bb252a0 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -33,4 +33,5 @@ ImpossibleAddCat=Impossible to add the category
 ImpossibleAssociateCategory=Impossible to associate the category to
 WasAddedSuccessfully=was added successfully.
 ProductIsInCategories=Product/Service is in following categories
-ClassifyInCategory=Classify in category
\ No newline at end of file
+ClassifyInCategory=Classify in category
+ReturnInProduct=Return in product/service
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index b22b1192ce6..42c8f06aba7 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -36,3 +36,4 @@ ProductIsInCategories=Ce produit/service est dans les cat
 ClassifyInCategory=Classer dans la catégorie
 NoneCategory=Aucune
 CategoryExistsAtSameLevel=Cette catégorie existe déjà au même endroit
+ReturnInProduct=Retour fiche produit/service