From 706914c4e9412bb798bbcafbb4b343857b33af8c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 19 Dec 2006 20:33:32 +0000
Subject: [PATCH] =?UTF-8?q?bugfix:=20la=20cat=E9gorie=20m=E8re=20n'=E9tait?=
 =?UTF-8?q?=20pas=20r=E9cup=E9r=E9e=20lors=20de=20l'=E9dition=20d'une=20ca?=
 =?UTF-8?q?t=E9gorie=20fille?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/categories/categorie.class.php |  1 -
 htdocs/categories/edit.php            | 81 ++++++++++++---------------
 htdocs/html.form.class.php            |  4 +-
 3 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/htdocs/categories/categorie.class.php b/htdocs/categories/categorie.class.php
index 0b188b3a841..95d813cae61 100644
--- a/htdocs/categories/categorie.class.php
+++ b/htdocs/categories/categorie.class.php
@@ -90,7 +90,6 @@ class Categorie
 		{
 			$res = $this->db->fetch_array($resql);
 			$this->id_mere = $res['fk_categorie_mere'];
-
 		}
 		else
 		{
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 34d15923011..c5fdcbaa383 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2005 Matthieu Valleton    <mv@seeschloss.org>
- * Copyright (C) 2006 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005      Matthieu Valleton    <mv@seeschloss.org>
+ * Copyright (C) 2006      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2006 Regis Houssin        <regis.houssin@cap-networks.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,54 +91,42 @@ print '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="id" value="'.$categorie->id.'">';
 
-?>
-<table class="border" width="100%">
-	<tr>
-		<td><?php print $langs->trans("Label"); ?>&nbsp;:</td>
+print '<table class="border" width="100%">';
+print '<tr><td>';
+print $langs->trans("Label").' :</td>';
+print '<td><input type="text" size="25" id="nom" name ="nom" value="'.$categorie->label.'" />';
+print '</tr>';
 
-		<td><input type='text' size='25' id='nom' name ='nom' value="<?php 
-				print $categorie->label; 
-			?>" />
-	</tr>
-<?php
-	print '<tr>';
-	print '<td width="25%">'.$langs->trans("Description").':</td>';
-	print '<td>';
+print '<tr>';
+print '<td width="25%">'.$langs->trans("Description").':</td>';
+print '<td>';
 
-		if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
-		{
-	    	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
-			$doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes');
-			$doleditor->Create();
-		}
-		else
-		{
-			print '<textarea name="description" rows="'.ROWS_6.'" cols="50">';
-			print $categorie->description;
-			print '</textarea>';
-		}
+if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
+{
+ 	require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
+	$doleditor=new DolEditor('description',$categorie->description,200,'dolibarr_notes');
+	$doleditor->Create();
+}
+else
+{
+	print '<textarea name="description" rows="'.ROWS_6.'" cols="50">';
+	print $categorie->description;
+	print '</textarea>';
+}
 
-	print '</td>';
-	print '</tr>';
-?>
-	
-	<tr><td><?php print $langs->trans ("AddIn"); ?></td><td>
-	<?php print $html->select_all_categories($categorie->id_mere);?>
-	</td></tr>
-	
-	<tr><td><?php print $langs->trans ("ContentsVisibleByAll"); ?></td><td>
-	<?php print $html->selectyesnonum("visible",$categorie->visible);?>
-	</td></tr>
+print '</td></tr>';
+
+print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
+print $html->select_all_categories($categorie->id_mere);
+print '</td></tr>';
+
+print '<tr><td>'.$langs->trans("ContentsVisibleByAll").'</td><td>';
+print $html->selectyesnonum("visible",$categorie->visible);
+print '</td></tr>';
 		
-	
-	<tr>
-		<td colspan="2" align="center"><input type="submit" class="button" value='<?php print $langs->trans ("Modify"); ?>'></td>
-	</tr>
-</table>
-</form>
-		
-	<?php
-
+print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print '</td></tr>';
+print '</table></form>';
 
 print '</td></tr></table>';
 
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 6b66d49ea01..27e566897ca 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1243,7 +1243,7 @@ class Form
 
 		if ($select_name=="") $select_name="catMere";
 
-        $cat = new Categorie ($this -> db);
+    $cat = new Categorie ($this -> db);
 		$cate_arbo = $cat->get_full_arbo();
 
 		$output = '<select name="'.$select_name.'">';
@@ -1253,7 +1253,7 @@ class Form
 		{
 			foreach($cate_arbo as $key => $value)
 			{
-				if ($cate_arbo[$key]['fulllabel'] == $selected)
+				if ($cate_arbo[$key]['id'] == $selected)
 				{
 					$add = "selected='true' ";
 				}