diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 32769af34f1..51f4c2ccf2f 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -121,22 +121,25 @@ if ($action == 'create') {
$htmls = new Form($db);
$adht = new AdherentType($db);
- print "
| Type | ";
+ print ' |
| Type | ';
$htmls->select_array("type", $adht->liste_array());
- print " |
";
+ print "";
+
+ print 'Commentaires : | ';
$morphys["phy"] = "Physique";
$morphys["mor"] = "Morale";
print "| Personne | ";
$htmls->select_array("morphy", $morphys);
- print " |
";
-
-
- print '| Prénom | | ';
+ print "";
- print 'Commentaires : ';
- print " |
";
+ print ' | ';
+
+ print '| Prénom | |
';
+
+
+
print '| Nom | |
';
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 932be65f4a5..83ad5f86c88 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -37,7 +37,7 @@ $var=True;
$sql = "SELECT count(*) as somme , t.libelle FROM llx_adherent as d, llx_adherent_type as t";
-$sql .= " WHERE d.fk_adherent_type = t.rowid GROUP BY t.libelle";
+$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1 GROUP BY t.libelle";
$result = $db->query($sql);
diff --git a/htdocs/theme/yellow/dolibarr.css b/htdocs/theme/yellow/dolibarr.css
index 9964eaa7cb4..4e7c67a2448 100644
--- a/htdocs/theme/yellow/dolibarr.css
+++ b/htdocs/theme/yellow/dolibarr.css
@@ -1,7 +1,4 @@
/* Copyright (C) 2002 Rodolphe Quiedeville
- *
- * $Id$
- * $Source$
*
* 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
@@ -17,9 +14,12 @@
* 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$
+ *
*/
-BODY
+body
{
background: #ebebe0;
font-family: Helvetica, Verdana; font-size: 12px;
@@ -76,7 +76,7 @@ td.barre
color: #000000;
text-decoration: none }
-TD.barre_select
+td.barre_select
{
background: #ccccb3;
color: #000000
@@ -84,7 +84,7 @@ TD.barre_select
-DIV.titre
+div.titre
{
font-family: Helvetica, Verdana; font-size: 16px; font-weight: bold;
color: #666633;
@@ -92,22 +92,22 @@ DIV.titre
/*
*
*/
-TR.liste_titre
+tr.liste_titre
{
background: #999966;
font-family: Helvetica, Verdana; font-size: 14px; font-weight: bold;
- text-decoration: none }
+ }
-TR.pair
+tr.pair
{
- background: #ccccb3;
+ background: #dcdcb3;
font-family: Helvetica, Verdana; font-size: 12px;
- text-decoration: none }
+ }
-TR.impair
+tr.impair
{
background: #eeeecc;
font-family: Helvetica, Verdana; font-size: 12px;
- text-decoration: none }
+ }