NEW Use small photo of user on all user links

htdocs/expensereport/card.php

@@ -1262,7 +1262,7 @@ else
 					print '<td>';
 					$userfee=new User($db);
 					$userfee->fetch($object->fk_user_valid);
-					print $userfee->getNomUrl(1);
+					print $userfee->getNomUrl(-1);
 					print '</td></tr>';
 				}
 
@@ -1271,7 +1271,7 @@ else
 				print '<td>';
 				$userfee=new User($db);
 				$userfee->fetch($object->fk_user_author);
-				print $userfee->getNomUrl(1);
+				print $userfee->getNomUrl(-1);
 				print '</td></tr>';
 				if ($object->fk_statut==6)
 				{
@@ -1280,7 +1280,7 @@ else
 					print '<td>';
 					$userfee=new User($db);
 					$userfee->fetch($user->id);
-					print $userfee->getNomUrl(1);
+					print $userfee->getNomUrl(-1);
 					print '</td></tr>';
 
 				}
@@ -1504,7 +1504,7 @@ else
 					$userauthor=new User($db);
 					$result=$userauthor->fetch($object->fk_user_author);
 					if ($result < 0) dol_print_error('',$userauthor->error);
-					print $userauthor->getNomUrl(1);
+					print $userauthor->getNomUrl(-1);
 				}
 				print '</td></tr>';
 
@@ -1527,7 +1527,7 @@ else
 					{
 						$userfee=new User($db);
 						$userfee->fetch($object->fk_user_validator);
-						print $userfee->getNomUrl(1);
+						print $userfee->getNomUrl(-1);
 						if (empty($userfee->email) || ! isValidEmail($userfee->email)) 
 						{
 						    $langs->load("errors");
@@ -1545,7 +1545,7 @@ else
 					{
 						$userfee=new User($db);
 						$userfee->fetch($object->fk_user_cancel);
-						print $userfee->getNomUrl(1);
+						print $userfee->getNomUrl(-1);
 					}
 					print '</td></tr>';
 					print '<tr>';
@@ -1566,7 +1566,7 @@ else
 					{
 						$userapp=new User($db);
 						$userapp->fetch($object->fk_user_approve);
-						print $userapp->getNomUrl(1);
+						print $userapp->getNomUrl(-1);
 					}
 					print '</td></tr>';
 					print '<tr>';
@@ -1582,7 +1582,7 @@ else
 					print '<td>';
 					$userfee=new User($db);
 					$userfee->fetch($object->fk_user_refuse);
-					print $userfee->getNomUrl(1);
+					print $userfee->getNomUrl(-1);
 					print '</td></tr>';
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
@@ -1600,7 +1600,7 @@ else
 					print '<td>';
 					$userfee=new User($db);
 					$userfee->fetch($object->fk_user_paid);
-					print $userfee->getNomUrl(1);
+					print $userfee->getNomUrl(-1);
 					print '</td></tr>';
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';

htdocs/expensereport/index.php

@@ -142,7 +142,7 @@ $max=10;
 
 $langs->load("boxes");
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE u.rowid = d.fk_user_author";
@@ -183,9 +183,12 @@ if ($result)
             $userstatic->id=$obj->uid;
             $userstatic->lastname=$obj->lastname;
             $userstatic->firstname=$obj->firstname;
+            $userstatic->login=$obj->login;
+            $userstatic->statut=$obj->statut;
+            $userstatic->photo=$obj->photo;
             print '<tr '.$bc[$var].'>';
             print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
-            print '<td>'.$userstatic->getNomUrl(1).'</td>';
+            print '<td>'.$userstatic->getNomUrl(-1).'</td>';
             print '<td align="right">'.price($obj->total_ht).'</td>';
             print '<td align="right">'.price($obj->total_ttc).'</td>';
             print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';

htdocs/expensereport/list.php

@@ -20,7 +20,7 @@
  */
 
 /**
- *	    \file       htdocs/expensereport/index.php
+ *	    \file       htdocs/expensereport/list.php
  *      \ingroup    expensereport
  *		\brief      list of expense reports
  */
@@ -130,7 +130,7 @@ $pagenext = $page + 1;
 
 $sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
 $sql.= " d.date_debut, d.date_fin, d.date_valid,";
-$sql.= " u.rowid as id_user, u.firstname, u.lastname";
+$sql.= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.statut, u.photo";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
 $sql.= " WHERE d.entity = ".$conf->entity;
@@ -314,19 +314,20 @@ if ($resql)
 	$total_total_tva = 0;
 	
 	$expensereportstatic=new ExpenseReport($db);
-
+	$usertmp = new User($db);
+	
 	if ($num > 0)
 	{
 		while ($i < min($num,$limit))
 		{
-			$objp = $db->fetch_object($resql);
-			
-			$expensereportstatic->id=$objp->rowid;
-			$expensereportstatic->ref=$objp->ref;
-			$expensereportstatic->status=$objp->status;
-			$expensereportstatic->valid=$objp->date_valid;
-			$expensereportstatic->date_debut=$objp->date_debut;
-			$expensereportstatic->date_fin=$objp->date_fin;
+			$obj = $db->fetch_object($resql);
+
+			$expensereportstatic->id=$obj->rowid;
+			$expensereportstatic->ref=$obj->ref;
+			$expensereportstatic->status=$obj->status;
+			$expensereportstatic->valid=$obj->date_valid;
+			$expensereportstatic->date_debut=$obj->date_debut;
+			$expensereportstatic->date_fin=$obj->date_fin;
 
 			$var=!$var;
 			print "<tr ".$bc[$var].">";
@@ -335,12 +336,20 @@ if ($resql)
 			if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
 			if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
 			print '</td>';
-			print '<td align="center">'.($objp->date_debut > 0 ? dol_print_date($objp->date_debut, 'day') : '').'</td>';
-			print '<td align="center">'.($objp->date_fin > 0 ? dol_print_date($objp->date_fin, 'day') : '').'</td>';
-			print '<td align="left"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->id_user.'">'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($objp->firstname, $objp->lastname).'</a></td>';
-			print '<td align="right">'.price($objp->total_ht).'</td>';
-			print '<td align="right">'.price($objp->total_tva).'</td>';
-			print '<td align="right">'.price($objp->total_ttc).'</td>';
+			print '<td align="center">'.($obj->date_debut > 0 ? dol_print_date($obj->date_debut, 'day') : '').'</td>';
+			print '<td align="center">'.($obj->date_fin > 0 ? dol_print_date($obj->date_fin, 'day') : '').'</td>';
+			print '<td align="left">';
+			$usertmp->id=$obj->id_user;
+			$usertmp->lastname=$obj->lastname;
+			$usertmp->firstname=$obj->firstname;
+			$usertmp->login=$obj->login;
+			$usertmp->statut=$obj->statut;
+			$usertmp->photo=$obj->photo;
+			print $usertmp->getNomUrl(-1);
+			print '</td>';
+			print '<td align="right">'.price($obj->total_ht).'</td>';
+			print '<td align="right">'.price($obj->total_tva).'</td>';
+			print '<td align="right">'.price($obj->total_ttc).'</td>';
 			print '<td align="right">';
 			print $expensereportstatic->getLibStatut(5);
 			print '</td>';
@@ -349,9 +358,9 @@ if ($resql)
 
 			print "</tr>\n";
 
-			$total_total_ht = $total_total_ht + $objp->total_ht;
-			$total_total_tva = $total_total_tva + $objp->total_tva;
-			$total_total_ttc = $total_total_ttc + $objp->total_ttc;
+			$total_total_ht = $total_total_ht + $obj->total_ht;
+			$total_total_tva = $total_total_tva + $obj->total_tva;
+			$total_total_ttc = $total_total_ttc + $obj->total_ttc;
 
 			$i++;
 		}

htdocs/holiday/card.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
- * Copyright (C) 2012-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016	Regis Houssin		<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
@@ -1010,7 +1010,7 @@ else
 
                 print '<td>'.$langs->trans("User").'</td>';
         		print '<td>';
-        		print $userRequest->getNomUrl(1, 'leave');
+        		print $userRequest->getNomUrl(-1, 'leave');
         		print '</td></tr>';
 
 		        // Type
@@ -1120,14 +1120,14 @@ else
                 	$userCreate->fetch($cp->fk_user_create);
 	                print '<tr>';
 	                print '<td>'.$langs->trans('RequestByCP').'</td>';
-	                print '<td>'.$userCreate->getNomUrl(1).'</td>';
+	                print '<td>'.$userCreate->getNomUrl(-1).'</td>';
 	                print '</tr>';
                 }
 
                 if (!$edit) {
                     print '<tr>';
                     print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
-                    print '<td>'.$valideur->getNomUrl(1).'</td>';
+                    print '<td>'.$valideur->getNomUrl(-1).'</td>';
                     print '</tr>';
                 } else {
                     print '<tr>';

htdocs/holiday/class/holiday.class.php

@@ -298,11 +298,17 @@ class Holiday extends CommonObject
         $sql.= " cp.detail_refuse,";
 
 		$sql.= " uu.lastname as user_lastname,";
-        $sql.= " uu.firstname as user_firstname,";
-
+		$sql.= " uu.firstname as user_firstname,";
+		$sql.= " uu.login as user_login,";
+		$sql.= " uu.statut as user_statut,";
+		$sql.= " uu.photo as user_photo,";
+		
         $sql.= " ua.lastname as validator_lastname,";
-        $sql.= " ua.firstname as validator_firstname";
-
+        $sql.= " ua.firstname as validator_firstname,";
+        $sql.= " ua.login as validator_login,";
+        $sql.= " ua.statut as validator_statut,";
+        $sql.= " ua.photo as validator_photo";
+        
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
         $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
 		$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@@ -360,10 +366,16 @@ class Holiday extends CommonObject
 
                 $tab_result[$i]['user_firstname'] = $obj->user_firstname;
                 $tab_result[$i]['user_lastname'] = $obj->user_lastname;
-
+                $tab_result[$i]['user_login'] = $obj->user_login;
+                $tab_result[$i]['user_statut'] = $obj->user_statut;
+                $tab_result[$i]['user_photo'] = $obj->user_photo;
+                
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
-
+                $tab_result[$i]['validator_login'] = $obj->validator_login;
+                $tab_result[$i]['validator_statut'] = $obj->validator_statut;
+                $tab_result[$i]['validator_photo'] = $obj->validator_photo;
+                
                 $i++;
             }
 
@@ -412,10 +424,16 @@ class Holiday extends CommonObject
 
         $sql.= " uu.lastname as user_lastname,";
         $sql.= " uu.firstname as user_firstname,";
-
+        $sql.= " uu.login as user_login,";
+        $sql.= " uu.statut as user_statut,";
+        $sql.= " uu.photo as user_photo,";
+        
         $sql.= " ua.lastname as validator_lastname,";
-        $sql.= " ua.firstname as validator_firstname";
-
+        $sql.= " ua.firstname as validator_firstname,";
+        $sql.= " ua.login as validator_login,";
+        $sql.= " ua.statut as validator_statut,";
+        $sql.= " ua.photo as validator_photo";
+        
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
         $sql.= " WHERE cp.entity IN (".getEntity('holiday', 1).")";
         $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
@@ -473,10 +491,16 @@ class Holiday extends CommonObject
 
                 $tab_result[$i]['user_firstname'] = $obj->user_firstname;
                 $tab_result[$i]['user_lastname'] = $obj->user_lastname;
-
+                $tab_result[$i]['user_login'] = $obj->user_login;
+                $tab_result[$i]['user_statut'] = $obj->user_statut;
+                $tab_result[$i]['user_photo'] = $obj->user_photo;
+                
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
-
+                $tab_result[$i]['validator_login'] = $obj->validator_login;
+                $tab_result[$i]['validator_statut'] = $obj->validator_statut;
+                $tab_result[$i]['validator_photo'] = $obj->validator_photo;
+                
                 $i++;
             }
             // Retourne 1 et ajoute le tableau à la variable

htdocs/holiday/document.php

@@ -121,14 +121,14 @@ if ($object->id)
 
     print '<td>'.$langs->trans("User").'</td>';
     print '<td>';
-    print $userRequest->getNomUrl(1);
+    print $userRequest->getNomUrl(-1);
     print '</td></tr>';
 
     // Type
     print '<tr>';
     print '<td>'.$langs->trans("Type").'</td>';
     print '<td>';
-    $typeleaves=$object->getTypes(1,1);
+    $typeleaves=$object->getTypes(1,-1);
     print $typeleaves[$object->fk_type]['label'];
     print '</td>';
     print '</tr>';

htdocs/holiday/list.php

@@ -404,12 +404,18 @@ if (! empty($holiday->holiday))
 		$userstatic->id=$infos_CP['fk_user'];
 		$userstatic->lastname=$infos_CP['user_lastname'];
 		$userstatic->firstname=$infos_CP['user_firstname'];
-
+		$userstatic->login=$infos_CP['user_login'];
+		$userstatic->statut=$infos_CP['user_statut'];
+		$userstatic->photo=$infos_CP['user_photo'];
+		
 		// Valideur
 		$approbatorstatic->id=$infos_CP['fk_validator'];
 		$approbatorstatic->lastname=$infos_CP['validator_lastname'];
 		$approbatorstatic->firstname=$infos_CP['validator_firstname'];
-
+		$approbatorstatic->login=$infos_CP['validator_login'];
+		$approbatorstatic->statut=$infos_CP['validator_statut'];
+		$approbatorstatic->photo=$infos_CP['validator_photo'];
+		
 		$date = $infos_CP['date_create'];
 
 		print '<tr '.$bc[$var].'>';
@@ -419,8 +425,8 @@ if (! empty($holiday->holiday))
 		print $holidaystatic->getNomUrl(1);
 		print '</td>';
 		print '<td style="text-align: center;">'.dol_print_date($date,'day').'</td>';
-		print '<td>'.$userstatic->getNomUrl('1', 'leave').'</td>';
-		print '<td>'.$approbatorstatic->getNomUrl('1').'</td>';
+		print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+		print '<td>'.$approbatorstatic->getNomUrl(-1).'</td>';
 		print '<td>';
 		$label=$alltypeleaves[$infos_CP['fk_type']]['label'];
 		print $label?$label:$infos_CP['fk_type'];

htdocs/holiday/view_log.php

@@ -100,8 +100,8 @@ foreach($cp->logs as $logs_CP)
    	print '<tr '.$bc[$var].'>';
    	print '<td>'.$logs_CP['rowid'].'</td>';
    	print '<td style="text-align: center;">'.$logs_CP['date_action'].'</td>';
-   	print '<td>'.$user_action->getNomUrl(1).'</td>';
-   	print '<td>'.$user_update->getNomUrl(1).'</td>';
+   	print '<td>'.$user_action->getNomUrl(-1).'</td>';
+   	print '<td>'.$user_update->getNomUrl(-1).'</td>';
    	print '<td>'.$logs_CP['type_action'].'</td>';
    	print '<td>';
 	$label=$alltypeleaves[$logs_CP['fk_type']]['label'];

htdocs/hrm/index.php

@@ -145,7 +145,7 @@ $langs->load("boxes");
 // Last leave requests
 if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
 {
-    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
+    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.photo, u.statut, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
     $sql.= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
     $sql.= " WHERE u.rowid = x.fk_user";
     $sql.= " AND x.entity = ".$conf->entity;
@@ -187,9 +187,12 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
                 $userstatic->id=$obj->uid;
                 $userstatic->lastname=$obj->lastname;
                 $userstatic->firstname=$obj->firstname;
+                $userstatic->login=$obj->login;
+                $userstatic->photo=$obj->photo;
+                $userstatic->statut=$obj->statut;
                 print '<tr '.$bc[$var].'>';
                 print '<td>'.$holidaystatic->getNomUrl(1).'</td>';
-                print '<td>'.$userstatic->getNomUrl(1, 'leave').'</td>';
+                print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
                 print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
                 
                 $starthalfday=($obj->halfday == -1 || $obj->halfday == 2)?'afternoon':'morning';
@@ -218,7 +221,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
 // Last expense report (old module)
 if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 {
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
 	$sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
 	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE u.rowid = d.fk_user";
@@ -258,9 +261,12 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 				$userstatic->id=$obj->uid;
 				$userstatic->lastname=$obj->lastname;
 				$userstatic->firstname=$obj->firstname;
+				$userstatic->login=$obj->login;
+				$userstatic->statut=$obj->statut;
+				$userstatic->photo=$obj->photo;
 				print '<tr '.$bc[$var].'>';
 				print '<td>'.$deplacementstatic->getNomUrl(1).'</td>';
-				print '<td>'.$userstatic->getNomUrl(1).'</td>';
+				print '<td>'.$userstatic->getNomUrl(-1).'</td>';
 				print '<td align="right">'.$obj->km.'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
 				print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut,3).'</td>';
@@ -282,7 +288,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 // Last expense report (new module)
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut, u.photo, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
 	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE u.rowid = x.fk_user_author";
@@ -322,9 +328,12 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 				$userstatic->id=$obj->uid;
 				$userstatic->lastname=$obj->lastname;
 				$userstatic->firstname=$obj->firstname;
+				$userstatic->login=$obj->login;
+				$userstatic->statut=$obj->statut;
+				$userstatic->photo=$obj->photo;
 				print '<tr '.$bc[$var].'>';
 				print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
-				print '<td>'.$userstatic->getNomUrl(1).'</td>';
+				print '<td>'.$userstatic->getNomUrl(-1).'</td>';
 				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
 				print '<td>'.$expensereportstatic->LibStatut($obj->status,3).'</td>';

htdocs/societe/class/societe.class.php

@@ -1696,7 +1696,7 @@ class Societe extends CommonObject
 
         $reparray=array();
 
-        $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.email, u.statut, u.entity";
+        $sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
         if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
         {
@@ -1724,6 +1724,8 @@ class Societe extends CommonObject
                 $reparray[$i]['email']=$obj->email;
                 $reparray[$i]['statut']=$obj->statut;
                 $reparray[$i]['entity']=$obj->entity;
+                $reparray[$i]['login']=$obj->login;
+                $reparray[$i]['photo']=$obj->photo;
                 $i++;
             }
             return $reparray;

htdocs/societe/commerciaux.php

@@ -137,7 +137,7 @@ if (! empty($socid))
 	print '<tr><td>'.$langs->trans("SalesRepresentatives").'</td>';
 	print '<td colspan="3">';
 
-	$sql = "SELECT DISTINCT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity";
+	$sql = "SELECT DISTINCT u.rowid, u.login, u.fk_soc, u.lastname, u.firstname, u.statut, u.entity, u.photo";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " , ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
@@ -184,7 +184,8 @@ if (! empty($socid))
       		$tmpuser->login = $obj->login;
       		$tmpuser->entity = $obj->entity;
       		$tmpuser->societe_id = $obj->fk_soc;
-      		print $tmpuser->getNomUrl(1);
+      		$tmpuser->photo = $obj->photo;
+      		print $tmpuser->getNomUrl(-1);
       		
 			/*print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->rowid.'">';
 			print img_object($langs->trans("ShowUser"),"user").' ';
@@ -227,7 +228,7 @@ if (! empty($socid))
 		$langs->load("users");
 		$title=$langs->trans("ListOfUsers");
 
-		$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.login, u.email, u.statut, u.fk_soc";
+		$sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.login, u.email, u.statut, u.fk_soc, u.photo";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
 		{
@@ -273,10 +274,11 @@ if (! empty($socid))
 				$tmpuser->login=$obj->login;
 				$tmpuser->email=$obj->email;
 				$tmpuser->societe_id=$obj->fk_soc;
-				print $tmpuser->getNomUrl(1);
+				$tmpuser->photo=$obj->photo;
+				print $tmpuser->getNomUrl(-1);
 				print '</td>';
 				print '<td>'.$obj->login.'</td>';
-				print '<td>'.User::LibStatut($obj->statut,0).'</td>';
+				print '<td>'.$tmpuser->getLibStatut(2).'</td>';
 				print '<td><a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;commid='.$obj->rowid.'">'.$langs->trans("Add").'</a></td>';
 
 				print '</tr>'."\n";

htdocs/societe/tpl/linesalesrepresentative.tpl.php

@@ -27,10 +27,12 @@
             foreach($listsalesrepresentatives as $val)
             {
                 $userstatic->id=$val['id'];
+                $userstatic->login=$val['login'];
                 $userstatic->lastname=$val['lastname'];
                 $userstatic->firstname=$val['firstname'];
                 $userstatic->statut=$val['statut'];
-                print $userstatic->getNomUrl(1);
+                $userstatic->photo=$val['photo'];
+                print $userstatic->getNomUrl(-1);
                 $i++;
                 if ($i < $nbofsalesrepresentative) print ', ';
             }

htdocs/user/group/card.php

@@ -450,7 +450,7 @@ else
 
             		print "<tr ".$bc[$var].">";
             		print '<td>';
-            		print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$useringroup->id.'">'.img_object($langs->trans("ShowUser"),"user").' '.$useringroup->login.'</a>';
+            		print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
             		if ($useringroup->admin  && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar');
             		else if ($useringroup->admin) print img_picto($langs->trans("Administrator"),'star');
             		print '</td>';

htdocs/user/home.php

@@ -139,7 +139,7 @@ if ($resql)
         $fuserstatic->email = $obj->email;
         $fuserstatic->skype = $obj->skype;
         $fuserstatic->societe_id = $obj->fk_soc;
-        print $fuserstatic->getNomUrl(1);
+        print $fuserstatic->getNomUrl(-1);
 		if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"),'redstar');