backport

diff --git a/htdocs/marketing/volontaire.php b/htdocs/marketing/volontaire.php
index 67c2c57..a745014 100644 (file)
--- a/htdocs/marketing/volontaire.php
+++ b/htdocs/marketing/volontaire.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: volontaire.php,v 1.7 2004-11-22 11:15:45 x2000habouzit Exp $
+    $Id: volontaire.php,v 1.8 2004-11-22 15:51:12 x2000habouzit Exp $
  ***************************************************************************/
 
 require("xorg.inc.php");
@@ -67,7 +67,7 @@ $sql = "SELECT  COUNT(a.perms != 'non-inscrit') AS j,
           FROM  marketing     AS m
     INNER JOIN  auth_user_md5 AS i  ON i.matricule = m.dest
     INNER JOIN  auth_user_md5 AS sa ON sa.user_id = m.expe
-    LEFT  JOIN  auth_user_md5 AS a  ON a.matricule = m.dest
+    LEFT  JOIN  auth_user_md5 AS a  ON (a.matricule = m.dest AND a.perms!='non-inscrit')
          WHERE  FIND_IN_SET('envoye', m.flags)";
 $res = $globals->db->query($sql);