diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 68e161c3d4e..174cfa6b72b 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -71,15 +71,16 @@ $search_categ = isset($_GET["search_categ"])?$_GET["search_categ"]:$_POST["searc * View */ -llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); - $form=new Form($db); $htmlother=new FormOther($db); +$membertypestatic=new AdherentType($db); +$memberstatic=new Adherent($db); + +llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); + $now=dol_now(); -$membertypestatic=new AdherentType($db); - $sql = "SELECT d.rowid, d.login, d.prenom, d.nom, d.societe, "; $sql.= " d.datefin,"; $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,"; @@ -256,18 +257,18 @@ if ($resql) $datefin=$db->jdate($objp->datefin); - $adh=new Adherent($db); - // Nom $var=!$var; - print ""; + print ""; + $memberstatic->nom=$objp->nom; + $memberstatic->prenom=$objp->prenom; if ($objp->societe != '') { - print "rowid\">".img_object($langs->trans("ShowMember"),"user").' '.$objp->prenom." ".dol_trunc($objp->nom,12)." / ".dol_trunc($objp->societe,12)."\n"; + print "rowid\">".img_object($langs->trans("ShowMember"),"user").' '.dol_trunc($memberstatic->getFullName($langs))." / ".dol_trunc($objp->societe,12)."\n"; } else { - print "rowid\">".img_object($langs->trans("ShowMember"),"user").' '.$objp->prenom." ".dol_trunc($objp->nom)."\n"; + print "rowid\">".img_object($langs->trans("ShowMember"),"user").' '.dol_trunc($memberstatic->getFullName($langs))."\n"; } // Login @@ -281,14 +282,14 @@ if ($resql) print ''; // Moral/Physique - print "".$adh->getmorphylib($objp->morphy)."\n"; + print "".$memberstatic->getmorphylib($objp->morphy)."\n"; // EMail print "".dol_print_email($objp->email,0,0,1)."\n"; // Statut print ''; - print $adh->LibStatut($objp->statut,$objp->cotisation,$datefin,2); + print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2); print ""; // End of subscription date