diff --git a/htdocs/adherents/edit.php b/htdocs/adherents/edit.php index f2b5ed93317..8a74da35847 100644 --- a/htdocs/adherents/edit.php +++ b/htdocs/adherents/edit.php @@ -51,6 +51,7 @@ if ($action == 'update') $adh->pays = $HTTP_POST_VARS["pays"]; $adh->typeid = $HTTP_POST_VARS["type"]; $adh->commentaire = $HTTP_POST_VARS["comment"]; + $adh->morphy = $HTTP_POST_VARS["morphy"]; if ($adh->update($user->id) ) { @@ -87,21 +88,25 @@ if ($rowid) $total = $obj->total; } } + + $adht = new AdherentType($db); + print_titre("Edition de la fiche adhérent"); print ''; - print ''; - + print ""; print ''; - print ''; - + print ''; print ''; + print ''; + print ''; + print ''; print ''; print ''; @@ -119,21 +124,28 @@ if ($rowid) print ""; $htmls = new Form($db); - $adht = new AdherentType($db); + print ""; + print ""; - - print ''; - print ''; - print ''; + $morphys["phy"] = "Physique"; + $morphys["mor"] = "Morale"; + + print ""; print ''; + + print ''; + + print ''; + print ''; print '"; print ""; print ""; + print ""; print "\n"; $var=True; @@ -69,6 +70,12 @@ if ($result) print "\n"; print "\n"; print "\n"; + print ""; print ""; $i++; }
Prénom'.$adh->prenom.' 
Type$adh->typeCommentaires
Nom'.$adh->nom.' 
Personne'.$adh->morphy.' '; print nl2br($adh->commentaire).' 
Prénom'.$adh->prenom.' 
Nom'.$adh->nom.' 
Société'.$adh->societe.' 
Adresse'.nl2br($adh->adresse).' 
CP Ville'.$adh->cp.' '.$adh->ville.' 
Type"; $htmls->select_array("type", $adht->liste_array(), $adh->typeid); - print "
PrénomCommentaires
Nom
Personne"; + $htmls->select_array("morphy", $morphys, $adh->morphy); + print "'; print '
Prénom
Nom
Societe
Adresse'; diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index b1a837485c9..b0a9ab79ddd 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -36,7 +36,7 @@ $pagenext = $page + 1; $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, ".$db->pdate("d.datefin")." as datefin"; -$sql .= " , d.email, t.libelle as type, d.morphy"; +$sql .= " , d.email, t.libelle as type, d.morphy, d.statut"; $sql .= " FROM llx_adherent as d, llx_adherent_type as t"; $sql .= " WHERE d.fk_adherent_type = t.rowid"; $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset); @@ -56,6 +56,7 @@ if ($result) print "EmailTypePersonneStatut
$objp->email$objp->type$objp->morphy"; + if ($objp->statut == -1) + { + print 'A valider'; + } + print "