From 5506680d62dbaca995b1b9c1bd3cf758782ffe3f Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Wed, 24 Sep 2014 23:55:39 +0200
Subject: [PATCH] =?UTF-8?q?fw6:=20kludge=20post-adh=C3=A9sion=20glissante?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On peut probablement faire mieux pour ne filtrer que les gens à jour de cotiz
mais j'ai la flemme …
---
 gestion/ipt.py        | 7 +------
 gestion/ldap_crans.py | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/gestion/ipt.py b/gestion/ipt.py
index e9a79d47..587aebba 100644
--- a/gestion/ipt.py
+++ b/gestion/ipt.py
@@ -758,12 +758,7 @@ def blacklist(ipt):
 
     blcklst = []
 
-    s = db.search('paiement=%s' % ann_scol)
-    if periode_transitoire:
-        tmp=db.search('paiement=%s' % (ann_scol-1))
-        s['adherent'].extend(tmp['adherent'])
-        s['club'].extend(tmp['club'])
-        del tmp
+    s = db.search('nom=*')
 
     for target in s['adherent'] + s['club']:
         sanctions = target.blacklist_actif()
diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py
index 89bbb1ec..b7ae6de4 100755
--- a/gestion/ldap_crans.py
+++ b/gestion/ldap_crans.py
@@ -981,12 +981,8 @@ class CransLdap:
             self.__machines = AssociationCrans(conn = self.conn).machines()
             # Machines des adhérents et clubs de l'année en cours
             #base = self.search('paiement=ok')
-            base = self.search('paiement=%s' % ann_scol)
+            base = self.search('nom=*')
             base = base['adherent'] + base['club']
-            if config.periode_transitoire:
-                tmp=self.search('paiement=%s' % (ann_scol-1))
-                base.extend(tmp['adherent'] + tmp['club'])
-                del tmp
             base=[a for a in base if a.paiement_ok()]
             if graphic: a = anim('\tTri des machines', len(base))
             for adh in base: