From 3d8f6923553ac45f5662206cd70913e41682f76a Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Tue, 5 May 2015 01:34:50 +0200
Subject: [PATCH 1/2] Fix : missing link to category into product card.

---
 htdocs/product/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 21c12e6d31d..069b4360134 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1586,7 +1586,7 @@ else
 
 			// Categories
 			print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
-			print $form->showCategories($object->id,'product');
+			print $form->showCategories($object->id,'product',1);
 			print "</td></tr>";
 
             print "</table>\n";

From e698c3b64aa6ad8b31d962e2032c110e9bccda5f Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Tue, 5 May 2015 01:43:39 +0200
Subject: [PATCH 2/2] Fix into category edit page

Rename $nom into $label
Add missing html class to show description as required
---
 htdocs/categories/edit.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 32bc33938f5..c3acb807e01 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -37,7 +37,7 @@ $action=GETPOST('action');
 $confirm=GETPOST('confirm');
 
 $socid=GETPOST('socid','int');
-$nom=GETPOST('nom');
+$label=GETPOST('label');
 $description=GETPOST('description');
 $visible=GETPOST('visible');
 $parent=GETPOST('parent');
@@ -66,7 +66,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
 	$categorie = new Categorie($db);
 	$result=$categorie->fetch($id);
 
-	$categorie->label          = $nom;
+	$categorie->label          = $label;
 	$categorie->description    = dol_htmlcleanlastbr($description);
 	$categorie->socid          = ($socid ? $socid : 'null');
 	$categorie->visible        = $visible;
@@ -138,13 +138,13 @@ print '<table class="border" width="100%">';
 // Ref
 print '<tr><td class="fieldrequired">';
 print $langs->trans("Ref").'</td>';
-print '<td><input type="text" size="25" id="nom" name ="nom" value="'.$object->label.'" />';
+print '<td><input type="text" size="25" id="label" name ="label" value="'.$object->label.'" />';
 print '</tr>';
 
 // Description
 print '<tr>';
-print '<td width="25%">'.$langs->trans("Description").'</td>';
-print '<td>';
+print '<td class="fieldrequired" width="25%">'.$langs->trans("Description").'</td>';
+print '<td >';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50);
 $doleditor->Create();