Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3

htdocs/categories/class/categorie.class.php

@@ -47,6 +47,7 @@ class Categorie
 	var $import_key;
 
 	var $cats=array();			// Tableau en memoire des categories
+	var $motherof=array();
 
 
 	/**
@@ -542,6 +543,40 @@ class Categorie
 		return ($n[0] > 0);
 	}
 
+
+	/**
+	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
+	 *
+	 *	@return		int		<0 if KO, >0 if OK
+	 */
+	private function load_motherof()
+	{
+		global $conf;
+
+		$this->motherof=array();
+
+		// Load array[child]=parent
+		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql.= " WHERE fk_parent != 0";
+		$sql.= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj= $this->db->fetch_object($resql))
+			{
+				$this->motherof[$obj->id_son]=$obj->id_parent;
+			}
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
 	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau
@@ -554,13 +589,16 @@ class Categorie
 	 *				fullpath = chemin complet compose des id
 	 *
 	 *	@param      string	$type		      Type of categories (0=product, 1=suppliers, 2=customers, 3=members)
-     *  @param      int		$markafterid      Mark all categories after this leaf in category tree.
+     *  @param      int		$markafterid      Removed all categories including the leaf $markafterid in category tree.
-	 *	@return		array		      		  Array of categories
+	 *	@return		array		      		  Array of categories. this->cats and this->motherof are set.
 	 */
 	function get_full_arbo($type,$markafterid=0)
 	{
 		$this->cats = array();
 
+		// Init this->motherof that is array(id_son=>id_parent, ...)
+		$this->load_motherof();
+
 		// Init $this->cats array
 		$sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.fk_parent";	// Distinct reduce pb with old tables with duplicates
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c";
@@ -592,10 +630,11 @@ class Categorie
 		dol_syslog(get_class($this)."::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);
 		foreach($this->cats as $key => $val)
 		{
+			//print 'key='.$key.'<br>'."\n";
 			$this->build_path_from_id_categ($key,0);	// Process a branch from the root category key (this category has no parent)
 		}
 
-        // Exclude tree for $markafterid
+        // Exclude leaf including $markafterid from tree
         if ($markafterid)
         {
             //print "Look to discard category ".$markafterid."\n";
@@ -608,8 +647,6 @@ class Categorie
                 if (preg_match('/'.$keyfilter1.'/',$val['fullpath']) || preg_match('/'.$keyfilter2.'/',$val['fullpath'])
                 || preg_match('/'.$keyfilter3.'/',$val['fullpath']) || preg_match('/'.$keyfilter4.'/',$val['fullpath']))
                 {
-                    //print "Categ discarded ".$this->cats[$key]['fullpath']."\n";
-                    //$this->cats[$key]['marked']=1;
                     unset($this->cats[$key]);
                 }
             }
@@ -630,51 +667,38 @@ class Categorie
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop
 	 *	@return		void
 	 */
-	function build_path_from_id_categ($id_categ,$protection=0)
+	function build_path_from_id_categ($id_categ,$protection=1000)
 	{
 		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
 
-		//if (! empty($this->cats[$id_categ]['fullpath']))
+		if (! empty($this->cats[$id_categ]['fullpath']))
-		//{
+		{
-		// Already defined
+			// Already defined
-		//	dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);
+			dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);
-		//	return;
+			return;
-		//}
+		}
+
+		// First build full array $motherof
+		//$this->load_motherof();	// Disabled because already done by caller of build_path_from_id_categ
 
 		// Define fullpath and fulllabel
-		if (! empty($this->cats[$id_categ]['fk_parent']))
+		$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
+		$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
+		$i=0; $cursor_categ=$id_categ;
+		//print 'Work for id_categ='.$id_categ.'<br>'."\n";
+		while ((empty($protection) || $i < $protection) && ! empty($this->motherof[$cursor_categ]))
 		{
-			$this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['fk_parent']]['fullpath'];
+			//print '&nbsp; cursor_categ='.$cursor_categ.' i='.$i.' '.$this->motherof[$cursor_categ].'<br>'."\n";
-			$this->cats[$id_categ]['fullpath'].= '_'.$id_categ;
+			$this->cats[$id_categ]['fullpath'] = '_'.$this->motherof[$cursor_categ].$this->cats[$id_categ]['fullpath'];
-			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['fk_parent']]['fulllabel'];
+			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->motherof[$cursor_categ]]['label'].' >> '.$this->cats[$id_categ]['fulllabel'];
-			$this->cats[$id_categ]['fulllabel'].= ' >> '.$this->cats[$id_categ]['label'];
+			//print '&nbsp; Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].' '.$this->cats[$id_categ]['fulllabel'].'<br>'."\n";
-		}
+			$i++; $cursor_categ=$this->motherof[$cursor_categ];
-		else
-		{
-			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
-			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
 		}
+		//print 'Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].'<br>'."\n";
+
 		// We count number of _ to have level
 		$this->cats[$id_categ]['level']=dol_strlen(preg_replace('/[^_]/i','',$this->cats[$id_categ]['fullpath']));
 
-		/*
-		// Process all childs on several levels of this category
-		$protection++;
-		if ($protection > 10) return;	// On ne traite pas plus de 10 niveaux de profondeurs
-		if (empty($this->cats[$id_categ]['id_children'])) return;
-		foreach($this->cats[$id_categ]['id_children'] as $key => $idchild)
-		{
-			// Protection when a category has itself as a child (should not happen)
-			if ($idchild == $id_categ)
-			{
-				dol_syslog(get_class($this)."::build_path_from_id_categ bad couple (".$idchild.",".$id_categ.") in association table: An entry should not have itself has child", LOG_WARNING);
-				continue;
-			}
-
-			$this->build_path_from_id_categ($idchild,$protection);
-		}
-		*/
-
 		return;
 	}
 

htdocs/categories/index.php

@@ -209,12 +209,15 @@ foreach($fulltree as $key => $val)
 	// 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)
 	{

htdocs/comm/propal/tpl/linkedobjectblock.tpl.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011  Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -37,6 +38,7 @@ print_titre($langs->trans('RelatedCommercialProposals'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;

htdocs/commande/tpl/linkedobjectblock.tpl.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -38,6 +39,7 @@ print_titre($langs->trans('RelatedOrders'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;

htdocs/compta/facture/tpl/linkedobjectblock.tpl.php

@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -38,6 +39,7 @@ else print_titre($langs->trans("RelatedBill"));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;

htdocs/ecm/class/ecmdirectory.class.php

@@ -479,13 +479,13 @@ class EcmDirectory // extends CommonObject
 
 		$this->motherof=array();
 
-		// Charge tableau des meres
+		// Load array[child]=parent
 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
 		$sql.= " FROM ".MAIN_DB_PREFIX."ecm_directories";
 		$sql.= " WHERE fk_parent != 0";
 		$sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog(get_class($this)."::get_full_arbo sql=".$sql);
+		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{

htdocs/user/fiche.php

@@ -1360,7 +1360,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1372,7 +1372,7 @@ else
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
@@ -1385,7 +1385,7 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
                     print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
                 }
@@ -1395,7 +1395,7 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
                     if ($object->email) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
                     else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
@@ -1404,19 +1404,19 @@ else
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{