*** empty log message ***

This commit is contained in:
Rodolphe Quiedeville 2002-12-30 16:20:38 +00:00
parent a9e5d82c64
commit 2af8e895ea
2 changed files with 11 additions and 4 deletions

View File

@ -259,10 +259,10 @@ class Adherent
*/ */
Function fetch($rowid) Function fetch($rowid)
{ {
$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, d.statut, d.adresse, d.cp, d.ville, d.pays, d.note, d.email, d.fk_adherent_type, d.morphy"; $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, d.statut, d.adresse, d.cp, d.ville, d.pays, d.note, d.email, d.fk_adherent_type, d.morphy, t.libelle as type";
$sql .= ",".$this->db->pdate("d.datefin")." as datefin"; $sql .= ",".$this->db->pdate("d.datefin")." as datefin";
$sql .= " FROM llx_adherent as d"; $sql .= " FROM llx_adherent as d, llx_adherent_type as t";
$sql .= " WHERE d.rowid = $rowid"; $sql .= " WHERE d.rowid = $rowid AND d.fk_adherent_type = t.rowid";
if ( $this->db->query( $sql) ) if ( $this->db->query( $sql) )
{ {
@ -273,11 +273,12 @@ class Adherent
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->typeid = $obj->fk_adherent_type; $this->typeid = $obj->fk_adherent_type;
$this->type = $obj->type;
$this->statut = $obj->statut;
$this->date = $obj->datedon; $this->date = $obj->datedon;
$this->prenom = stripslashes($obj->prenom); $this->prenom = stripslashes($obj->prenom);
$this->nom = stripslashes($obj->nom); $this->nom = stripslashes($obj->nom);
$this->societe = stripslashes($obj->societe); $this->societe = stripslashes($obj->societe);
$this->statut = $obj->fk_statut;
$this->adresse = stripslashes($obj->adresse); $this->adresse = stripslashes($obj->adresse);
$this->cp = stripslashes($obj->cp); $this->cp = stripslashes($obj->cp);
$this->ville = stripslashes($obj->ville); $this->ville = stripslashes($obj->ville);

View File

@ -102,4 +102,10 @@ td.delete
{ {
background: red; background: red;
font-weight: bold; font-weight: bold;
}
td.valid
{
background: pink;
font-weight: bold;
} }