';
@@ -432,7 +432,7 @@ if (! empty($conf->categorie->enabled))
// If the user can view user other than himself
$moreforfilter.='
';
-$moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ': ';
+$moreforfilter.='
'.$langs->trans('User'). '
';
$includeonly='hierachyme';
if (empty($user->rights->user->user->lire)) $includeonly=array($user->id);
$moreforfilter.=$form->select_dolusers($search_usertoprocessid?$search_usertoprocessid:$usertoprocess->id, 'search_usertoprocessid', $user->rights->user->user->lire?0:0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 37624b49b2c..0252ab58f36 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -58,7 +58,8 @@ if ($action == 'setmainoptions')
if (GETPOST('PROJECT_USE_OPPORTUNITIES')) dolibarr_set_const($db, "PROJECT_USE_OPPORTUNITIES",GETPOST('PROJECT_USE_OPPORTUNITIES'),'chaine',0,'',$conf->entity);
else dolibarr_del_const($db, "PROJECT_USE_OPPORTUNITIES", $conf->entity);
- if (GETPOST('PROJECT_USE_TASKS')) dolibarr_del_const($db, "PROJECT_HIDE_TASKS", $conf->entity);
+ // Warning, the constant saved and used in code is PROJECT_HIDE_TASKS
+ if (GETPOST('PROJECT_USE_TASKS')) dolibarr_del_const($db, "PROJECT_USE_TASKS", $conf->entity);
else dolibarr_set_const($db, "PROJECT_HIDE_TASKS",1,'chaine',0,'',$conf->entity);
}
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 8c919b5d213..e29bd4555a8 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -3,7 +3,7 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p, ".MAIN_DB_PREFIX."c_lead_status as cls";
- $sql.= " WHERE p.entity = ".$conf->entity;
+ $sql.= " WHERE p.entity IN (".getEntity('project').")";
$sql.= " AND p.fk_opp_status = cls.rowid";
$sql.= " AND p.fk_statut = 1"; // Opend projects only
if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 4f11119d44f..190659628f2 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -26,18 +26,16 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
// Load translations files required by page
-$langs->load("resource");
-$langs->load("companies");
-$langs->load("other");
+$langs->loadLangs(array("resource","companies","other"));
// Get parameters
-$id = GETPOST('id','int');
+$id = GETPOST('id','int');
$action = GETPOST('action','alpha');
-$lineid = GETPOST('lineid','int');
-$element = GETPOST('element','alpha');
-$element_id = GETPOST('element_id','int');
-$resource_id = GETPOST('resource_id','int');
+$lineid = GETPOST('lineid','int');
+$element = GETPOST('element','alpha');
+$element_id = GETPOST('element_id','int');
+$resource_id = GETPOST('resource_id','int');
$sortorder = GETPOST('sortorder','alpha');
$sortfield = GETPOST('sortfield','alpha');
@@ -89,7 +87,7 @@ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&con
$hookmanager->initHooks(array('resource_list'));
if (empty($sortorder)) $sortorder="ASC";
-if (empty($sortfield)) $sortfield="t.rowid";
+if (empty($sortfield)) $sortfield="t.ref";
if (empty($arch)) $arch = 0;
$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 9fdad8916e1..fa3fdc6b18e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -647,14 +647,17 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
$error++;
}
+ // Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
+ if (!empty($user->rights->categorie->lire))
+ {
+ // Customer categories association
+ $categories = GETPOST( 'custcats', 'array' );
+ $object->setCategories($categories, 'customer');
- // Customer categories association
- $categories = GETPOST('custcats', 'array');
- $object->setCategories($categories, 'customer');
-
- // Supplier categories association
- $categories = GETPOST('suppcats', 'array');
- $object->setCategories($categories, 'supplier');
+ // Supplier categories association
+ $categories = GETPOST('suppcats', 'array');
+ $object->setCategories($categories, 'supplier');
+ }
// Logo/Photo save
$dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index ae2c73d8752..e43404777b6 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1833,7 +1833,7 @@ class SupplierProposal extends CommonObject
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- $sql.= " WHERE p.entity = ".$conf->entity;
+ $sql.= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
$sql.= " AND p.fk_soc = s.rowid";
$sql.= " AND p.fk_statut = c.id";
if (! $user->rights->societe->client->voir && ! $socid) //restriction
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3d3d5b2c63e..95910558311 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2800,6 +2800,12 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
{
height: 26px !important;
}
+div.colorback
+{
+ background: rgb();
+ padding: 10px;
+ margin-top: 5px;
+}
div.liste_titre_bydiv, .liste_titre div.tagtr, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
{
background: rgb();
@@ -3607,7 +3613,7 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
.cal_event a:active { color: #111111; font-size: 11px; font-weight: normal !important; }
.cal_event_busy a:hover { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
.cal_event_busy { }
-.cal_peruserviewname { max-width: 100px; height: 22px; }
+.cal_peruserviewname { max-width: 140px; height: 22px; }
/* ============================================================================== */
@@ -4604,7 +4610,7 @@ dl.dropdown {
position:absolute;
top:2px;
list-style:none;
- max-height: 270px;
+ max-height: 264px;
overflow: auto;
}
.dropdown span.value {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d53d47d1637..79d17292234 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2491,6 +2491,12 @@ td.border, div.tagtable div div.border {
.ficheaddleft table.noborder {
margin: 0px 0px 0px 0px;
}
+div.colorback
+{
+ background: rgb();
+ padding: 10px;
+ margin-top: 5px;
+}
.liste_titre_bydiv {
border-right: 1px solid #ccc;
border-left: 1px solid #ccc;
@@ -3658,7 +3664,7 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
.cal_event a:active { color: #111111; font-size: 11px; font-weight: normal !important; }
.cal_event_busy a:hover { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
.cal_event_busy { }
-.cal_peruserviewname { max-width: 100px; height: 22px; }
+.cal_peruserviewname { max-width: 140px; height: 22px; }
.topmenuimage {
background-size: 28px auto;
@@ -4614,7 +4620,7 @@ dl.dropdown {
position:absolute;
top:2px;
list-style:none;
- max-height: 270px;
+ max-height: 264px;
overflow: auto;
}
.dropdown span.value {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 84665839c6b..ba327e7c9f1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1231,7 +1231,7 @@ else
if ($mode == 'employee') // For HRM module development
{
$title = $langs->trans("Employee");
- $linkback = '
'.$langs->trans("BackToList").'';
+ $linkback = '
'.$langs->trans("BackToList").'';
}
else
{
@@ -1239,7 +1239,7 @@ else
$linkback = '';
if ($user->rights->user->user->lire || $user->admin) {
- $linkback = '
'.$langs->trans("BackToList").'';
+ $linkback = '
'.$langs->trans("BackToList").'';
}
}
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 6032489b9c7..2e0cd0376c6 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -1,10 +1,10 @@
- * Copyright (c) 2005-2013 Laurent Destailleur
- * Copyright (c) 2005-2012 Regis Houssin
- * Copyright (C) 2012 Florian Henry
- * Copyright (C) 2014 Juanjo Menent
- * Copyright (C) 2014 Alexis Algoud
+/* Copyright (c) 2005 Rodolphe Quiedeville
+ * Copyright (c) 2005-2018 Laurent Destailleur
+ * Copyright (c) 2005-2018 Regis Houssin
+ * Copyright (C) 2012 Florian Henry
+ * Copyright (C) 2014 Juanjo Menent
+ * Copyright (C) 2014 Alexis Algoud
*
* 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
@@ -40,6 +40,8 @@ class UserGroup extends CommonObject
public $picto='group';
public $entity; // Entity of group
+
+ public $name; // Name of group
/**
* @deprecated
* @see name
@@ -48,6 +50,7 @@ class UserGroup extends CommonObject
public $globalgroup; // Global group
public $datec; // Creation date of group
public $datem; // Modification date of group
+ public $note; // Description
public $members=array(); // Array of users
public $nb_rights; // Number of rights granted to the user
@@ -786,6 +789,78 @@ class UserGroup extends CommonObject
return '';
}
+ /**
+ * Return a link to the user card (with optionaly the picto)
+ * Use this->id,this->lastname, this->firstname
+ *
+ * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto, -1=Include photo into link, -2=Only picto photo, -3=Only photo very small)
+ * @param string $option On what the link point to ('nolink', )
+ * @param integer $notooltip 1=Disable tooltip on picto and name
+ * @param string $morecss Add more css on link
+ * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+ * @return string String with URL
+ */
+ function getNomUrl($withpicto=0, $option='', $notooltip=0, $morecss='', $save_lastsearch_value=-1)
+ {
+ global $langs, $conf, $db, $hookmanager;
+ global $dolibarr_main_authentication, $dolibarr_main_demo;
+ global $menumanager;
+
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto=0;
+
+ $result=''; $label='';
+ $link=''; $linkstart=''; $linkend='';
+
+ $label.= '';
+ $label.= '' . $langs->trans("Group") . '
';
+ $label.= '' . $langs->trans('Name') . ': ' . $this->name;
+ $label.= '
' . $langs->trans("Description").': '.$this->note;
+ $label.='
';
+
+ $url = DOL_URL_ROOT.'/user/group/card.php?id='.$this->id;
+
+ if ($option != 'nolink')
+ {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+ if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ }
+
+ $linkclose="";
+ if (empty($notooltip))
+ {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $langs->load("users");
+ $label=$langs->trans("ShowGroup");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose.= ' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+ }
+ if (! is_object($hookmanager))
+ {
+ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+ $hookmanager=new HookManager($this->db);
+ }
+ $hookmanager->initHooks(array('groupdao'));
+ $parameters=array('id'=>$this->id);
+ $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+
+ $linkstart = '';
+ $linkend='';
+
+ $result = $linkstart;
+ if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= $this->name;
+ $result .= $linkend;
+
+ return $result;
+ }
+
/**
* Retourne chaine DN complete dans l'annuaire LDAP pour l'objet
*
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 5a68dd1391b..8f99fa1bb81 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -330,7 +330,9 @@ else
{
dol_fiche_head($head, 'group', $title, -1, 'group');
- dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+ $linkback = ''.$langs->trans("BackToList").'';
+
+ dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
print '';
print '
';
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 0a7b32062e2..284a7fb289a 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -1,8 +1,8 @@
- * Copyright (C) 2004-2011 Laurent Destailleur
- * Copyright (C) 2005-2017 Regis Houssin
- * Copyright (C) 2011 Herve Prot
+/* Copyright (C) 2002-2003 Rodolphe Quiedeville
+ * Copyright (C) 2004-2018 Laurent Destailleur
+ * Copyright (C) 2005-2018 Regis Houssin
+ * Copyright (C) 2011 Herve Prot
*
* 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
@@ -25,6 +25,7 @@
*/
require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
{
@@ -98,7 +99,7 @@ if (empty($reshook))
llxHeader();
-$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
+$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
@@ -114,7 +115,7 @@ if (! empty($search_group))
$sql .= " AND (g.nom LIKE '%".$db->escape($search_group)."%' OR g.note LIKE '%".$db->escape($search_group)."%')";
}
if ($sall) $sql.= " AND (g.nom LIKE '%".$db->escape($sall)."%' OR g.note LIKE '%".$db->escape($sall)."%')";
-$sql.= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
+$sql.= " GROUP BY g.rowid, g.nom, g.note, g.entity, g.datec";
$sql.= $db->order($sortfield,$sortorder);
$resql = $db->query($sql);
@@ -174,14 +175,19 @@ if ($resql)
print_liste_field_titre("DateCreationShort",$_SERVER["PHP_SELF"],"g.datec",$param,"",'align="right"',$sortfield,$sortorder);
print "\n";
- $var=True;
+ $grouptemp = new UserGroup($db);
+
while ($i < $num)
{
$obj = $db->fetch_object($resql);
+ $grouptemp->id = $obj->rowid;
+ $grouptemp->name = $obj->name;
+ $grouptemp->note = $obj->note;
print '';
- print '| '.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'';
+ print ' | ';
+ print $grouptemp->getNomUrl(1);
if (! $obj->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index ae0d974be9a..baf30a02399 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -105,7 +105,9 @@ $head = group_prepare_head($object);
dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group');
-dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+$linkback = ''.$langs->trans("BackToList").'';
+
+dol_banner_tab($object,'id',$linback,$user->rights->user->user->lire || $user->admin);
print '';
print ' ';
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 3b6d7037229..740b106c728 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -191,8 +191,9 @@ if ($object->id > 0)
dol_print_error($db);
}
+ $linkback = ' '.$langs->trans("BackToList").'';
- dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+ dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
print ' ';
print ' ';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 7c464ce2e45..6600d262002 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2005-2015 Regis Houssin
+/* Copyright (C) 2005-2018 Laurent Destailleur
+ * Copyright (C) 2005-2018 Regis Houssin
*
* 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
@@ -22,6 +22,7 @@
*/
require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
if (! $user->rights->user->user->lire && ! $user->admin)
{
@@ -118,26 +119,30 @@ if ($resql)
$num = $db->num_rows($resql);
print '';
print '| '.$langs->trans("LastUsersCreated",min($num,$max)).' | ';
- $var = true;
$i = 0;
while ($i < $num && $i < $max)
{
$obj = $db->fetch_object($resql);
-
+
+ $fuserstatic->id = $obj->rowid;
+ $fuserstatic->statut = $obj->statut;
+ $fuserstatic->lastname = $obj->lastname;
+ $fuserstatic->firstname = $obj->firstname;
+ $fuserstatic->login = $obj->login;
+ $fuserstatic->photo = $obj->photo;
+ $fuserstatic->admin = $obj->admin;
+ $fuserstatic->email = $obj->email;
+ $fuserstatic->skype = $obj->skype;
+ $fuserstatic->societe_id = $obj->fk_soc;
+
+ $companystatic->id=$obj->fk_soc;
+ $companystatic->name=$obj->name;
+ $companystatic->code_client = $obj->code_client;
+ $companystatic->canvas=$obj->canvas;
print '';
print '| ';
- $fuserstatic->id = $obj->rowid;
- $fuserstatic->statut = $obj->statut;
- $fuserstatic->lastname = $obj->lastname;
- $fuserstatic->firstname = $obj->firstname;
- $fuserstatic->login = $obj->login;
- $fuserstatic->photo = $obj->photo;
- $fuserstatic->admin = $obj->admin;
- $fuserstatic->email = $obj->email;
- $fuserstatic->skype = $obj->skype;
- $fuserstatic->societe_id = $obj->fk_soc;
print $fuserstatic->getNomUrl(-1);
if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity)
{
@@ -152,10 +157,6 @@ if ($resql)
print " | ";
if ($obj->fk_soc)
{
- $companystatic->id=$obj->fk_soc;
- $companystatic->name=$obj->name;
- $companystatic->code_client = $obj->code_client;
- $companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1);
}
else
@@ -231,16 +232,21 @@ if ($canreadperms)
$num = $db->num_rows($resql);
print '';
print '| '.$langs->trans("LastGroupsCreated",($num ? $num : $max)).' | ';
- $var = true;
$i = 0;
+ $grouptemp = new UserGroup($db);
+
while ($i < $num && (! $max || $i < $max))
{
$obj = $db->fetch_object($resql);
-
+
+ $grouptemp->id = $obj->rowid;
+ $grouptemp->name = $obj->name;
+ $grouptemp->note = $obj->note;
print '';
- print '| '.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'';
+ print ' | ';
+ print $grouptemp->getNomUrl(1);
if (! $obj->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index b2cdd9e3dc6..6f9ac1f638a 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -435,7 +435,7 @@ while ($i < min($num,$limit))
$userstatic->employee=$obj->employee;
$userstatic->photo=$obj->photo;
- $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login');
+ $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login','',1);
print " | ";
if (! empty($arrayfields['u.login']['checked']))
@@ -541,7 +541,7 @@ while ($i < min($num,$limit))
$user2->admin=$obj->admin2;
$user2->email=$obj->email2;
$user2->socid=$obj->fk_soc2;
- print $user2->getNomUrl(-1,'',0,0,24,0,'');
+ print $user2->getNomUrl(-1,'',0,0,24,0,'','',1);
if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2)
{
print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
| |