From 3a3e75b14dc96cd8275edb31e66ee3ed4eb05ace Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 May 2007 11:27:45 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Ajout=20type=20adh=E9rent=20sur=20fenetr?=
 =?UTF-8?q?e=20des=20derniers=20adh=E9rents?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/adherents/index.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 9e9d48e3d2f..6e4df4b2e1e 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -39,6 +39,7 @@ $langs->load("members");
 llxHeader();
 
 $staticmember=new Adherent($db);
+$statictype=new AdherentType($db);
 
 print_fiche_titre($langs->trans("MembersArea"));
 
@@ -191,7 +192,7 @@ $max=5;
 
 $sql = "SELECT a.rowid, a.statut, a.nom, a.prenom,";
 $sql.= " ".$db->pdate("a.tms")." as datem,  ".$db->pdate("datefin")." as date_end_subscription,";
-$sql.= " ta.cotisation";
+$sql.= " ta.rowid as typeid, ta.libelle, ta.cotisation";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as ta";
 $sql.= " WHERE a.fk_adherent_type = ta.rowid";
 $sql.= " ORDER BY a.tms DESC";
@@ -202,7 +203,7 @@ if ($resql)
 {
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print '<td colspan="3">'.$langs->trans("LastMembers",$max).'</td></tr>';
+    print '<td colspan="4">'.$langs->trans("LastMembers",$max).'</td></tr>';
 
     $num = $db->num_rows($resql);
     if ($num)
@@ -216,7 +217,10 @@ if ($resql)
             print "<tr $bc[$var]>";
             $staticmember->id=$obj->rowid;
             $staticmember->ref=trim($obj->prenom.' '.$obj->nom);
+            $statictype->id=$obj->typeid;
+            $statictype->libelle=$obj->libelle;
             print '<td>'.$staticmember->getNomUrl(1).'</td>';
+            print '<td>'.$statictype->getNomUrl(1).'</td>';
             print '<td>'.dolibarr_print_date($obj->datem,'dayhour').'</td>';
             print '<td align="right">'.$staticmember->LibStatut($obj->statut,($obj->cotisation=='yes'?1:0),$obj->date_end_subscription,5).'</td>';
             print '</tr>';