diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 286095a337d..6e8d797d4c2 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -213,7 +213,7 @@ $var=true;
*/
$max=5;
-$sql = "SELECT a.rowid, a.statut, a.nom as lastname, a.prenom as firstname,";
+$sql = "SELECT a.rowid, a.statut, a.nom as lastname, a.prenom as firstname, a.societe as company, a.fk_soc,";
$sql.= " a.tms as datem, datefin as date_end_subscription,";
$sql.= " ta.rowid as typeid, ta.libelle, ta.cotisation";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
@@ -242,11 +242,17 @@ if ($resql)
$staticmember->id=$obj->rowid;
$staticmember->lastname=$obj->lastname;
$staticmember->firstname=$obj->firstname;
+ if (! empty($obj->fk_soc)) {
+ $staticmember->socid = $obj->fk_soc;
+ $staticmember->fetch_thirdparty();
+ } else {
+ $staticmember->name=$obj->company;
+ }
$staticmember->ref=$staticmember->getFullName($langs);
$statictype->id=$obj->typeid;
$statictype->libelle=$obj->libelle;
- print '
'.$staticmember->getNomUrl(1,24).' | ';
- print ''.$statictype->getNomUrl(1,16).' | ';
+ print ''.$staticmember->getNomUrl(1,32).' | ';
+ print ''.$statictype->getNomUrl(1,32).' | ';
print ''.dol_print_date($db->jdate($obj->datem),'dayhour').' | ';
print ''.$staticmember->LibStatut($obj->statut,($obj->cotisation=='yes'?1:0),$db->jdate($obj->date_end_subscription),5).' | ';
print '';
@@ -330,7 +336,7 @@ foreach ($AdherentType as $key => $adhtype)
{
$var=!$var;
print "";
- print '| '.img_object($langs->trans("ShowType"),"group").' '.$adhtype->getNomUrl(0,dol_size(16)).' | ';
+ print ''.img_object($langs->trans("ShowType"),"group").' '.$adhtype->getNomUrl(0,dol_size(32)).' | ';
print ''.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).' | ';
print ''.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-$MemberUpToDate[$key] > 0) ? $MembersValidated[$key]-$MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).' | ';
print ''.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key]:'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,$now,3).' | ';