Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop

ChangeLog

@@ -6,15 +6,27 @@ English Dolibarr ChangeLog
 For users:
 - New: Some performance enhancements.
 - New: Can attach files onto trip and expenses modules.
-- New: Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
-- New: Can define a hierarchical responsible on user
-- New: Merge tab customer and prospect
-- New: Add ES formated address country rule
-
+- New: Add option MAIN_PDF_TITLE_BACKGROUND_COLOR.
+- New: Merge tab customer and prospect.
+- New: Add ES formated address country rule.
+- New: Can define a hierarchical responsible on user.
+- New: Add a hierarchical view for users.
+- New: Can expand/collapse menus, categories and users list.
+- New: extra parameters are supported into ODT templates.
+- New: total per vat rate are available as tags for ODT templates.
+- New: Add more types for extra parameters (lists, phone, emails, checkbox, prices)
+- New: Some part of interface use more CSS3 (ie: agenda)
+  
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 
 - An external module can force its theme.
 - Add function dol_set_focus('#xxx').
+- A mymodule can bring its own core/modules/mymodule/modules_mymodule.php file.
+- Removed not used libraries.
+- More web services. 
+- Renamed some french fields into english.
+- First change to manage margins on contracts.
+- Add hook getFormMail.
 
 For translators:
 - Update language files.

htdocs/admin/menus/index.php

@@ -209,8 +209,8 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 $form=new Form($db);
 $formadmin=new FormAdmin($db);
 
-$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js?lang='.$langs->defaultlang);
-$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css?lang='.$langs->defaultlang);
+$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
 llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);
 
@@ -271,10 +271,12 @@ print '<table class="border" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("TreeMenuPersonalized").'</td>';
+print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
+print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
 print '</tr>';
 
 print '<tr>';
-print '<td>';
+print '<td colspan="2">';
 
 // ARBORESCENCE
 
@@ -316,7 +318,23 @@ if ($conf->use_javascript_ajax)
 		{
 			if (! empty($menu['langs'])) $langs->load($menu['langs']);
 			$titre = $langs->trans($menu['titre']);
-			$data[] = array('rowid'=>$menu['rowid'],'fk_menu'=>$menu['fk_menu'],'title'=>$titre,'mainmenu'=>$menu['mainmenu'],'leftmenu'=>$menu['leftmenu'],'fk_mainmenu'=>$menu['fk_mainmenu'],'fk_leftmenu'=>$menu['fk_leftmenu']);
+			$data[] = array(
+				'rowid'=>$menu['rowid'],
+				'fk_menu'=>$menu['fk_menu'],
+				'title'=>$titre,
+				'mainmenu'=>$menu['mainmenu'],
+				'leftmenu'=>$menu['leftmenu'],
+				'fk_mainmenu'=>$menu['fk_mainmenu'],
+				'fk_leftmenu'=>$menu['fk_leftmenu'],
+				'entry'=>'<table class="nobordernopadding centpercent"><tr><td>'.
+						'<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.$titre.'</a></strong>'.
+						'</td><td align="right">'.
+						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default',0,'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> '.
+						'<a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default',0,'class="menuNew" id="new'.$menu['rowid'].'"').'</a> '.
+						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default',0,'class="menuDel" id="del'.$menu['rowid'].'"').'</a> '.
+						'<a href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Monter","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Descendre","1downarrow").'</a>'.
+						'</td></tr></table>'
+			);
 			$i++;
 		}
 	}

htdocs/categories/index.php

@@ -52,7 +52,11 @@ elseif ($type == 2) $title=$langs->trans("CustomersCategoriesArea");
 elseif ($type == 3) $title=$langs->trans("MembersCategoriesArea");
 else $title=$langs->trans("CategoriesArea");
 
-llxHeader("","",$title);
+$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
+
+llxHeader('',$title,'','',0,0,$arrayofjs,$arrayofcss);
+
 
 print_fiche_titre($title);
 
@@ -128,187 +132,56 @@ $cate_arbo = $categstatic->get_full_arbo($type);
 // Define fulltree array
 $fulltree=$cate_arbo;
 
-print '<table class="liste" width="100%">';
-print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td colspan="3">'.$langs->trans("Description").'</td></tr>';
-
-
-// ----- This section will show a tree from a fulltree array -----
-// $section must also be defined
-// ---------------------------------------------------------------
-
-
-// Root title line
-print '<tr><td>';
-print '<table class="nobordernopadding"><tr class="nobordernopadding">';
-print '<td align="left" width="24">';
-print img_picto_common('','treemenu/base.gif');
-print '</td><td align="left">'.$langs->trans("AllCats");
-print '</td>';
-print '</tr></table></td>';
-print '<td align="right">&nbsp;</td>';
-print '<td align="right">&nbsp;</td>';
-//print '<td align="right">&nbsp;</td>';
-print '</tr>';
-
-
-
-// Define fullpathselected ( _x_y_z ) of $section parameter
-$fullpathselected='';
-if (! empty($section))
-{
-	foreach($fulltree as $key => $val)
-	{
-		//print $val['id']."-".$section."<br>";
-		if ($val['id'] == $section)
-		{
-			$fullpathselected=$val['fullpath'];
-			break;
-		}
-	}
-}
-//print "fullpathselected=".$fullpathselected."<br>";
-
-// Update expandedsectionarray in session
-$expandedsectionarray=array();
-if (isset($_SESSION['dol_catexpandedsectionarray'.$type])) $expandedsectionarray=explode(',',$_SESSION['dol_catexpandedsectionarray'.$type]);
-
-if (! empty($section) && $_GET['sectionexpand'] == 'true')
-{
-	// We add all sections that are parent of opened section
-	$pathtosection=explode('_',$fullpathselected);
-	foreach($pathtosection as $idcursor)
-	{
-		if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
-		{
-			$expandedsectionarray[]=$idcursor;
-		}
-	}
-	$_SESSION['dol_catexpandedsectionarray'.$type]=join(',',$expandedsectionarray);
-}
-if (! empty($section) && $_GET['sectionexpand'] == 'false')
-{
-	// We removed all expanded sections that are child of the closed section
-	$oldexpandedsectionarray=$expandedsectionarray;
-	$expandedsectionarray=array();
-	foreach($oldexpandedsectionarray as $sectioncursor)
-	{
-		// is_in_subtree(fulltree,sectionparent,sectionchild)
-		if ($sectioncursor && ! is_in_subtree($fulltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
-	}
-	$_SESSION['dol_catexpandedsectionarray'.$type]=join(',',$expandedsectionarray);
-}
-//print $_SESSION['dol_catexpandedsectionarray'.$type].'<br>';
-
-$nbofentries=0;
-$oldvallevel=0;
-$var=true;
-foreach($fulltree as $key => $val)
+// Define data (format for treeview)
+$data=array();
+$data[] = array('rowid'=>0,'fk_menu'=>-1,'title'=>"racine",'mainmenu'=>'','leftmenu'=>'','fk_mainmenu'=>'','fk_leftmenu'=>'');
+foreach($fulltree as $key => $val)
 {
-	//$fullpathparent=preg_replace('/_[^_]+$/i','',$val['fullpath']);
+	$categstatic->id=$val['id'];
+	$categstatic->ref=$val['label'];
+	$categstatic->type=$type;
+	$li=$categstatic->getNomUrl(1,'',60);
+
+	$data[] = array(
+	'rowid'=>$val['rowid'],
+	'fk_menu'=>$val['fk_parent'],
+	'entry'=>'<table class="nobordernopadding centpercent"><tr><td>'.$li.
+	'</td><td width="50%">'.
+	' '.$val['description'].'</td>'.
+	'<td align="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td>'.
+	'</tr></table>'
+	);
+}
 
-	// Define showline
-	$showline=0;
-
-	//var_dump($expandedsectionarray);
-
-	// If directory is son of expanded directory, we show line
-	if (isset($val['fk_parent']) && in_array($val['fk_parent'],$expandedsectionarray)) $showline=4;
-	// If directory is parent of selected directory or is selected directory, we show line
-	elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
-	// If we are level one we show line
-	elseif ($val['level'] < 2) $showline=1;
-	//print 'xxx '.$val['level'].' - '.$fullpathselected.' - '.$val['fullpath'].' - '.$val['fk_parent'].' showline='.$showline.'<br>'."\n";
-
-	if ($showline)
-	{
-        $var=!$var;
-
-	    if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
-		else $option='indexnotexpanded';
-		//print $option;
-
-        print "<tr ".$bc[$var].">";
-
-		// Show tree graph pictos
-		print '<td align="left">';
-		print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>';
-		$resarray=tree_showpad($fulltree,$key);
-		$a=$resarray[0];
-		$nbofsubdir=$resarray[1];
-		$nboffilesinsubdir=$resarray[2];
-		print '</td>';
-
-		// Show picto
-		print '<td valign="top">';
-		//print $val['fullpath']."(".$showline.")";
-		$n='2';
-		if (! in_array($val['id'],$expandedsectionarray)) $n='3';
-		if (! in_array($val['id'],$expandedsectionarray)) $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/plustop'.$n.'.gif','',1);
-		else $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/minustop'.$n.'.gif','',1);
-		if ($option == 'indexexpanded') $lien = '<a href="'.$_SERVER["PHP_SELF"].'?section='.$val['id'].'&amp;type='.$type.'&amp;sectionexpand=false">';
-    	if ($option == 'indexnotexpanded') $lien = '<a href="'.$_SERVER["PHP_SELF"].'?section='.$val['id'].'&amp;type='.$type.'&amp;sectionexpand=true">';
-    	$newref=str_replace('_',' ',$ref);
-    	$lienfin='</a>';
-    	print $lien.$newref.$lienfin;
-		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">';
-		//if ($section == $val['id']) print ' <u>';
-		// We don't want a link ... why ?
-		$categstatic->id=$val['id'];
-		$categstatic->ref=$val['label'];
-		$categstatic->type=$type;
-		print ' &nbsp;'.$categstatic->getNomUrl(0,'',60);
-
-		//print ' &nbsp;'.dol_trunc($val['label'],28);
-		//if ($section == $val['id']) print '</u>';
-		print '</td>';
-		print '</tr></table>';
-		print "</td>\n";
 
-		// Description
-		print '<td>';
-		print dol_trunc($val['description'],48);
-		print '</td>';
-
-		// Link to category card
-		print '<td align="right"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td>';
-
-		// Add link
-		//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
-		//print '<td align="right">&nbsp;</td>';
-
-		print "</tr>\n";
-	}
-
-	$oldvallevel=$val['level'];
-	$nbofentries++;
-}
+print '<table class="liste" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td>'.$langs->trans("Description").'</td><td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
+print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td></tr>';
 
+$nbofentries=(count($data) - 1);
 
-// If nothing to show
-if ($nbofentries == 0)
+if ($nbofentries > 0)
 {
-	print '<tr>';
-	print '<td class="left"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
-	print '<td>'.img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/minustop3.gif','',1).'</td>';
-	print '<td valign="middle">';
-	print $langs->trans("NoCategoryYet");
-	print '</td>';
-	print '<td>&nbsp;</td>';
-	print '</table></td>';
-	print '<td colspan="4">&nbsp;</td>';
-	print '</tr>';
+	print '<tr><td colspan="3">';
+	tree_recur($data,$data[0],0);
+	print '</td></tr>';
 }
-
-// ----- End of section -----
-// --------------------------
+else
+{
+	print '<tr>';
+	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+	print '<td valign="middle">';
+	print $langs->trans("NoCategoryYet");
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</table></td>';
+	print '</tr>';
+}
 
 print "</table>";
 
 
 llxFooter();
+
 $db->close();
 ?>

htdocs/comm/action/index.php

@@ -88,6 +88,7 @@ if (GETPOST('viewday'))  {
     $action='show_day'; $day=($day?$day:date("d"));
 }                                  // View by day
 
+$langs->load("agenda");
 $langs->load("other");
 $langs->load("commercial");
 

htdocs/comm/action/rapport/index.php

@@ -30,7 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php';
 
-$langs->load("commercial");
+$langs->load("agenda");
+$langs->load("commercial");
 
 $action=GETPOST('action','alpha');
 $month=GETPOST('month');
@@ -103,7 +104,7 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Date").'</td>';
 	print '<td align="center">'.$langs->trans("EventsNb").'</td>';
-	print '<td>'.$langs->trans("Action").'</td>';
+	print '<td align="center">'.$langs->trans("Action").'</td>';
 	print '<td align="center">'.$langs->trans("PDF").'</td>';
 	print '<td align="center">'.$langs->trans("Date").'</td>';
 	print '<td align="center">'.$langs->trans("Size").'</td>';
@@ -121,7 +122,7 @@ if ($resql)
 			print "<td>".$obj->df."</td>\n";
 			print '<td align="center">'.$obj->cc.'</td>';
 
-			print '<td>';
+			print '<td align="center">';
 			print '<a href="'.$_SERVER["PHP_SELF"].'?action=builddoc&amp;page='.$page.'&amp;month='.$obj->month.'&amp;year='.$obj->year.'">'.img_picto($langs->trans('GenerateReport'),'filenew').'</a>';
 			print '</td>';
 

htdocs/core/lib/treeview.lib.php

@@ -23,55 +23,7 @@
  */
 
 
-// ------------------------------- Used by category tree view -----------------
-
-/**
- * Return if a child id is in descendance of parentid
- *
- * @param	array	 $fulltree		Full tree. Tree must be an array of records that looks like:
- *									id = id record
- *									id_mere = id record mother
- *									id_children = array of direct child id
- *									label = record label
- * 									fullpath = Full path of id
- * 									level =	Level of record
- * @param	int		$parentid		Parent id
- * @param	int		$childid		Child id
- * @return	int						1=Yes, 0=No
- */
-function is_in_subtree($fulltree,$parentid,$childid)
-{
-	if ($parentid == $childid) return 1;
-
-	// Get fullpath of parent
-	$fullpathparent='';
-	foreach($fulltree as $key => $val)
-	{
-		//print $val['id']."-".$section."<br>";
-		if ($val['id'] == $parentid)
-		{
-			$fullpathparent=$val['fullpath'];
-			break;
-		}
-	}
-	//print '> parent='.$parentid.' - child='.$childid.' - '.$fullpathparent.'<br>';
-
-	foreach($fulltree as $record)
-	{
-		if ($record['id'] == $childid)
-		{
-			//print $record['fullpath'].'_'.' - '.$fullpathparent.'_';
-			if (preg_match('/'.$fullpathparent.'_/i',$record['fullpath'].'_'))
-			{
-				//print 'DEL='.$childid;
-				return 1;
-			}
-		}
-	}
-
-	return 0;
-}
-
+// ------------------------------- Used by ajax tree view -----------------
 
 /**
  * Show indent and picto of a tree line. Return array with information of line.
@@ -145,55 +97,38 @@ function tree_showpad(&$fulltree,$key,$silent=0)
 // ------------------------------- Used by menu editor -----------------
 
 /**
- *  Show an element with correct offset
- *
- *  @param	array	$tab    	Array of element
- *  @param  int	    $rang   	Level of offset
- *  @return	void
- */
-function tree_showline($tab,$rang)
-{
-	global $conf, $rangLast, $idLast, $menu_handler;
-
-	// Content of line
-	print '<table class="nobordernopadding centpercent"><tr><td>';
-	print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler.'&action=edit&menuId='.$tab['rowid'].'">'.$tab['title'].'</a></strong>';
-	print '</td><td align="right">';
-	print '<a href="edit.php?menu_handler='.$menu_handler.'&action=edit&menuId='.$tab['rowid'].'">'.img_edit('default',0,'class="menuEdit" id="edit'.$tab['rowid'].'"').'</a> ';
-	print '<a href="edit.php?menu_handler='.$menu_handler.'&action=create&menuId='.$tab['rowid'].'">'.img_edit_add('default',0,'class="menuNew" id="new'.$tab['rowid'].'"').'</a> ';
-	print '<a href="index.php?menu_handler='.$menu_handler.'&action=delete&menuId='.$tab['rowid'].'">'.img_delete('default',0,'class="menuDel" id="del'.$tab['rowid'].'"').'</a> ';
-	print '<a href="index.php?menu_handler='.$menu_handler.'&action=up&menuId='.$tab['rowid'].'">'.img_picto("Monter","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler.'&action=down&menuId='.$tab['rowid'].'">'.img_picto("Descendre","1downarrow").'</a>';
-	print '</td></tr></table>';
-
-	$rangLast = $rang;
-	$idLast = $tab['rowid'];
-}
-
-
-/**
- *  Recursive function to output menu tree
+ *  Recursive function to output menu tree. <ul id="iddivjstree"><li>...</li></ul>
+ *  Note: To have this function working, check you have loaded the js and css for treeview.
+ *  $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
+ *                   '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+ *	$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
  *
- *  @param	array	$tab    Array of all elements
- *  @param  int	    $pere   Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)
- *  @param  int	    $rang   Level of element
+ *  @param	array	$tab    		Array of all elements
+ *  @param  int	    $pere   		Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)
+ *  @param  int	    $rang   		Level of element
+ *  @param	string	$iddivjstree	Id to use for parent ul element
  *  @return	void
  */
-function tree_recur($tab,$pere,$rang)
+function tree_recur($tab, $pere, $rang, $iddivjstree='iddivjstree')
 {
-	if (empty($pere['rowid'])) 
+	if (empty($pere['rowid']))
 	{
-		// Test also done with jstree and dynatree (not able to have <a> inside label) 
+		// Test also done with jstree and dynatree (not able to have <a> inside label)
 		print '<script type="text/javascript" language="javascript">
 		$(document).ready(function(){
-			$("#iddivjstree").treeview({
+			$("#'.$iddivjstree.'").treeview({
 				collapsed: true,
 				animated: "fast",
-				persist: "location"
+				persist: "cookie",
+				control: "#'.$iddivjstree.'control",
+				toggle: function() {
+					/* window.console && console.log("%o was toggled", this); */
+				}
 			});
 		})
 		</script>';
-		
-		print '<ul id="iddivjstree" style="min-height:300px;">';
+
+		print '<ul id="'.$iddivjstree.'">';
 	}
 
 	if ($rang > 10)	return;	// Protection contre boucle infinie
@@ -207,29 +142,25 @@ function tree_recur($tab,$pere,$rang)
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
-			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; } 
+			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; }
 			print "\n".'<li>';
-			// We shot it with an offset
-			tree_showline($tab[$x],$rang);
-
+			print $tab[$x]['entry'];
 			// And now we search all its sons of lower level
 			tree_recur($tab,$tab[$x],$rang+1);
 			print '</li>';
 		}
 		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
-			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; } 
+			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; }
 			print "\n".'<li>';
-			// We shot it with an offset
-			tree_showline($tab[$x],$rang);
-
+			print $tab[$x]['entry'];
 			// And now we search all its sons of lower level
 			tree_recur($tab,$tab[$x],$rang+1);
 			print '</li>';
 		}
 	}
 	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
-	
+
 	if (empty($pere['rowid'])) print '</ul>';
 }