Fix: Bad link to category

Missing picto for categories

htdocs/categories/categorie.class.php

@@ -969,12 +969,11 @@ class Categorie
 		$result='';
 
 		$lien = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.'">';
-		$label=$this->label;
+		$label=$langs->trans("ShowCategory").': '.$this->label;
 		$lienfin='</a>';
 
 		$picto='category';
 
-		$label=$langs->trans("ShowCategory").': '.$this->ref;
 
 		if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
 		if ($withpicto && $withpicto != 2) $result.=' ';

htdocs/categories/index.php

@@ -244,8 +244,8 @@ foreach($fulltree as $key => $val)
     	$newref=str_replace('_',' ',$ref);
     	$lienfin='</a>';
     	print $lien.$newref.$lienfin;
-		if (! in_array($val['id'],$expandedsectionarray)) print img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/folder.gif','',1);
-		else print img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/folder-expanded.gif','',1);
+		if (! in_array($val['id'],$expandedsectionarray)) print img_picto('','object_category');
+		else print img_picto('','object_category-expanded');
 		print '</td>';
 		// Show link
 		print '<td valign="middle">';
@@ -256,7 +256,7 @@ foreach($fulltree as $key => $val)
 		$categstatic->type=$type;
 		print $categstatic->getNomUrl(0,'',28);
 		*/
-		print dol_trunc($val['label'],28);
+		print ' &nbsp;'.dol_trunc($val['label'],28);
 		//if ($section == $val['id']) print '</u>';
 		print '</td>';
 		print '</tr></table>';

htdocs/categories/photos.php

@@ -114,7 +114,7 @@ if ($_GET["id"] || $_GET["ref"])
 		if ($type == 1) $title=$langs->trans("SuppliersCategoryShort");
 		if ($type == 2) $title=$langs->trans("CustomersCategoryShort");
 
-		dol_fiche_head($head, 'photos', $title);
+		dol_fiche_head($head, 'photos', $title, 0, 'category');
 
 		/*
 		 * Confirmation de la suppression de photo

htdocs/categories/viewcat.php

@@ -28,24 +28,29 @@
 
 require("./pre.inc.php");
 
-if ($_REQUEST['id'] == "")
-{
-	dol_print_error('','Missing parameter id');
-	exit();
-}
-
-$mesg = '';
-$type=$_REQUEST['type'];
-
 // Security check
 if (! $user->rights->categorie->lire)
 {
 	accessforbidden();
 }
 
-$c = new Categorie($db);
-$c->fetch($_REQUEST['id']);
+$mesg = '';
 
+if ($_REQUEST['id'] == "")
+{
+	dol_print_error('','Missing parameter id');
+	exit();
+}
+
+$c = new Categorie($db);
+$result=$c->fetch($_REQUEST['id']);
+if ($result <= 0)
+{
+	dol_print_error($db,$c->error);
+	exit;
+}
+
+$type=$c->type;
 
 
 /*
@@ -96,7 +101,7 @@ if ($type == 0) $title=$langs->trans("ProductsCategoryShort");
 if ($type == 1) $title=$langs->trans("SuppliersCategoryShort");
 if ($type == 2) $title=$langs->trans("CustomersCategoryShort");
 
-dol_fiche_head($head, 'card', $title);
+dol_fiche_head($head, 'card', $title, 0, 'category');
 
 
 /*

htdocs/fourn/index.php

@@ -28,6 +28,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.commande.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/fournisseur.facture.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/categories/categorie.class.php');
 
 $langs->load("suppliers");
 $langs->load("orders");
@@ -96,9 +97,7 @@ else
 }
 
 
-/*
- * Commandes brouillons
- */
+// Draft orders
 if ($conf->fournisseur->enabled)
 {
 	$langs->load("orders");
@@ -153,9 +152,7 @@ if ($conf->fournisseur->enabled)
 	}
 }
 
-/**
- * Factures brouillons
- */
+// Draft invoices
 if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire)
 {
 	$sql  = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,";
@@ -221,8 +218,7 @@ print "</td>\n";
 print '<td valign="top" width="70%" class="notopnoleft">';
 
 /*
- * Liste des 10 derniers saisis
- *
+ * List last modified supliers
  */
 $max=10;
 $sql = "SELECT s.rowid as socid, s.nom, s.ville, s.datec, s.datea, s.tms, st.libelle as stcomm, s.prefix_comm";
@@ -273,9 +269,10 @@ else
 
 
 /*
- * List of categories
+ * List of suppliers categories
  */
 $companystatic->LoadSupplierCateg();
+$categstatic=new Categorie($db);
 
 if (sizeof($companystatic->SupplierCategories))
 {
@@ -291,7 +288,11 @@ if (sizeof($companystatic->SupplierCategories))
 	{
 		$var=!$var;
 		print "<tr $bc[$var]>\n";
-		print '<td><a href="liste.php?cat='.$rowid.'">'.stripslashes($label).'</a>';
+		print '<td>';
+		$categstatic->id=$rowid;
+		$categstatic->ref=$label;
+		$categstatic->label=$label;
+		print $categstatic->getNomUrl(1);
 		print '</td><td align="right">';
 		print '<a href="stats.php?cat='.$rowid.'">('.$langs->trans("Stats").')</a>';
 		print "</tr>\n";