diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index de68b8f5855..fc6d0e045ca 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * 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 @@ -16,17 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** - \file htdocs/adherents/cotisations.php - \ingroup adherent - \brief Page de consultation et insertion d'une cotisation - \version $Revision$ -*/ + * \file htdocs/adherents/cotisations.php + * \ingroup adherent + * \brief Page de consultation et insertion d'une cotisation + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); @@ -147,7 +144,7 @@ llxHeader(); if ($msg) print $msg.'
'; // Liste des cotisations -$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe,"; +$sql = "SELECT d.rowid, d.login, d.prenom, d.nom, d.societe,"; $sql.= " c.rowid as crowid, c.cotisation,"; $sql.= " ".$db->pdate("c.dateadh")." as dateadh,"; $sql.= " ".$db->pdate("c.datef")." as datef,"; @@ -178,6 +175,7 @@ if ($result) print ''; print_liste_field_titre($langs->trans("Ref"),"cotisations.php","c.rowid",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Name"),"cotisations.php","d.nom",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Login"),"cotisations.php","d.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),"cotisations.php","c.note",$param,"",'align="left"',$sortfield,$sortorder); if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) { @@ -205,6 +203,7 @@ if ($result) $adherent->ref=trim($objp->prenom.' '.$objp->nom); $adherent->id=$objp->rowid; + $adherent->login=$objp->login; $var=!$var; @@ -220,6 +219,9 @@ if ($result) // Nom print ''.$adherent->getNomUrl(1).''; + // Login + print ''.$adherent->login.''; + // Libelle print ''; if ($allowinsertbankafter && $user->rights->banque->modifier && ! $objp->fk_account && $conf->banque->enabled && $conf->global->ADHERENT_BANK_USE && $objp->cotisation) diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 0ff21ed2fe7..88a55765a4a 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -21,7 +21,7 @@ /** \file htdocs/adherents/liste.php \ingroup adherent - \brief Page listant les adhérents + \brief Page listant les adh�rents \version $Id$ */ @@ -33,7 +33,7 @@ $langs->load("companies"); /* - * Affiche liste + * View */ llxHeader(); @@ -54,7 +54,7 @@ $offset = $conf->liste_limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; -$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, "; +$sql = "SELECT d.rowid, d.login, d.prenom, d.nom, d.societe, "; $sql.= " ".$db->pdate("d.datefin")." as datefin,"; $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,"; $sql.= " t.libelle as type, t.cotisation"; @@ -72,7 +72,7 @@ if ($_GET["type"]) } if (isset($_GET["statut"])) { - $sql.=" AND d.statut in ($statut)"; // Peut valoir un nombre ou liste de nombre séparés par virgules + $sql.=" AND d.statut in ($statut)"; // Peut valoir un nombre ou liste de nombre s�par�s par virgules } if ( $_POST["action"] == 'search') { @@ -84,6 +84,10 @@ if ($_GET["search_nom"]) { $sql.= " AND (d.prenom LIKE '%".$_GET["search_nom"]."%' OR d.nom LIKE '%".$_GET["search_nom"]."%')"; } +if ($_GET["search_login"]) +{ + $sql.= " AND d.login LIKE '%".$_GET["search_login"]."%'"; +} if ($_GET["search_email"]) { $sql.= " AND (d.email LIKE '%".$_GET["search_email"]."%')"; @@ -133,15 +137,18 @@ if ($result) } $param=""; - if (isset($_GET["statut"])) $param.="&statut=".$_GET["statut"]; - if (isset($_GET["search_nom"])) $param.="&search_nom=".$_GET["search_nom"]; - if (isset($_GET["filter"])) $param.="&filter=".$_GET["filter"]; + if (isset($_GET["statut"])) $param.="&statut=".$_GET["statut"]; + if (isset($_GET["search_nom"])) $param.="&search_nom=".$_GET["search_nom"]; + if (isset($_GET["search_login"])) $param.="&search_login=".$_GET["search_login"]; + if (isset($_GET["search_email"])) $param.="&search_email=".$_GET["search_email"]; + if (isset($_GET["filter"])) $param.="&filter=".$_GET["filter"]; print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print ""; print ''; print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),"liste.php","d.nom",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Login"),"liste.php","d.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),"liste.php","t.libelle",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Person"),"liste.php","d.morphy",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("EMail"),"liste.php","d.email",$param,"","",$sortfield,$sortorder); @@ -157,6 +164,9 @@ if ($result) print ''; + print ''; + print ''; print ''; @@ -197,6 +207,9 @@ if ($result) print "\n"; } + // Login + print "\n"; + // Type print ''; @@ -204,7 +217,7 @@ if ($result) print "\n"; // EMail - print "\n"; + print "\n"; // Statut print "
'; print ''; + print '  rowid\">".img_object($langs->trans("ShowAdherent"),"user").' '.stripslashes($objp->prenom)." ".stripslashes($objp->nom)."".$objp->login."'.img_object($langs->trans("ShowType"),"group").' '.$objp->type.'".$adh->getmorphylib($objp->morphy)."$objp->email".$objp->email."";