Minor fix

htdocs/categories/index.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Matthieu Valleton    <mv@seeschloss.org>
  * Copyright (C) 2005      Éric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2006-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
  * Copyright (C) 2005-2008 Regis Houssin        <regis@dolibarr.fr>
  *
@@ -29,20 +29,21 @@
 
 require("./pre.inc.php");
 
-$type=$_GET['type'];
+$type=isset($_GET['type'])?$_GET['type']:$_POST['type'];
 
 if (!$user->rights->categorie->lire) accessforbidden();
 
 
 
-/**
+
- * Affichage page accueil
+/*
+ * View
  */
 
 $c = new Categorie($db);
 $html = new Form($db);
 
-if (! $type)    $title=$langs->trans("ProductsCategoriesArea");
+if ($type == 0) $title=$langs->trans("ProductsCategoriesArea");
 if ($type == 1) $title=$langs->trans("SuppliersCategoriesArea");
 if ($type == 2) $title=$langs->trans("CustomersCategoriesArea");
 
@@ -59,8 +60,8 @@ print '<tr><td valign="top" width="30%" class="notopnoleft">';
 /*
  * Zone recherche produit/service
  */
-print '<form method="post" action="index.php?type='.$_GET['type'].'">';
+print '<form method="post" action="index.php?type='.$type.'">';
-print '<input type="hidden" name="type" value="'.$_GET['type'].'">';
+print '<input type="hidden" name="type" value="'.$type.'">';
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("Search").'</td>';
@@ -118,7 +119,6 @@ $cate_arbo = $c->get_full_arbo($_GET['type']);
 * Catégories en javascript
 */
 
-
 if ($conf->use_javascript_ajax)
 {
 	print '<table class="noborder" width="100%">';
@@ -127,12 +127,12 @@ if ($conf->use_javascript_ajax)
 	if ($_GET["expand"] != 'all')
 	{
 		print '<a href="'.$_SERVER["PHP_SELF"].'?expand=all&type='.$_GET['type'].'">'.$langs->trans("ExpandAll").'</a>';
-		print '</td><td width="18"><img border="0" src="'.DOL_URL_ROOT.'/includes/treemenu/images/folder-expanded.gif">';
+		print '</td><td width="18"><img border="0" src="'.DOL_URL_ROOT.'/theme/common/treemenu/folder-expanded.gif">';
 	}
 	if ($_GET["expand"] && $_GET["expand"] != 'none')
 	{
 		print '<a href="'.$_SERVER["PHP_SELF"].'?expand=none&type='.$_GET['type'].'">'.$langs->trans("UndoExpandAll").'</a>';
-		print '</td><td width="18"><img border="0" src="'.DOL_URL_ROOT.'/includes/treemenu/images/folder.gif">';
+		print '</td><td width="18"><img border="0" src="'.DOL_URL_ROOT.'/theme/common/treemenu/folder.gif">';
 	}
 	print '</td>';
 	print '</tr>';

htdocs/categories/viewcat.php

@@ -109,6 +109,7 @@ print '<table border="0" width="100%" class="border">';
 print '<tr><td width="20%" class="notopnoleft">';
 $ways = $c->print_all_ways ();
 print $langs->trans("Ref").'</td><td>';
+print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 foreach ($ways as $way)
 {
   print $way."<br />\n";

htdocs/conf/conf.class.php

@@ -47,7 +47,9 @@ class Conf
 
 	var $monnaie;	// Used to store current currency
 	var $css;		// Used to store current css (from theme)
-
+	var $top_menu;
+	var $left_menu;
+	
 	var $css_modules=array();
 	var $tabs_modules=array();
 	

htdocs/langs/en_US/main.lang

@@ -464,6 +464,7 @@ ForCustomer=For customer
 Signature=Signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
+Root=Root
 # Week day
 Monday=Monday
 Tuesday=Tuesday

htdocs/langs/fr_FR/main.lang

@@ -465,6 +465,7 @@ ForCustomer=Pour le client
 Signature=Sign
 HidePassword=Afficher commande avec mot de passe masqué
 UnHidePassword=Afficher commande réelle avec mot de passe en clair
+Root=Racine
 # Week day
 Monday=Lundi
 Tuesday=Mardi

htdocs/lib/functions.lib.php

@@ -1572,6 +1572,7 @@ function dol_print_error($db='',$error='')
 		print "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";;
 		print "<b>".$langs->trans("RequestedUrl").":</b> ".$_SERVER["REQUEST_URI"]."<br>\n";;
 		print "<b>".$langs->trans("Referer").":</b> ".$_SERVER["HTTP_REFERER"]."<br>\n";;
+		print "<b>".$langs->trans("MenuManager").":</b> ".$conf->left_menu.'/'.$conf->top_menu."<br>\n";
 		$syslog.="url=".$_SERVER["REQUEST_URI"];
 		$syslog.=", query_string=".$_SERVER["QUERY_STRING"];
 	}

htdocs/task.class.php

@@ -309,6 +309,9 @@ class Task // extends CommonObject
 		global $conf, $langs;
 		$error=0;
 		
+		// TODO. Refused if there is some child.
+		
+		
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
 		$sql.= " WHERE rowid=".$this->id;