diff --git a/gestion/whos.py b/gestion/whos.py index 86b19bb8..a84081d5 100755 --- a/gestion/whos.py +++ b/gestion/whos.py @@ -339,13 +339,15 @@ def clubs_brief(clubs) : ook = u'\x1b[1;32mO\x1b[1;0m' nok = u'\x1b[1;31mn\x1b[1;0m' # Paiement - if ann_scol in c.paiement(): - if 'p' in c.controle(): paid = ook - else: paid = ok + if c.paiement_ok(): + # TODO + #if 'p' in c.controle(): paid = ook + #else: paid = ok + paid = ok else : paid = nok # Précablage - if ann_scol+1 in c.paiement() : paid = coul(paid,'f_vert') + # TODO machines = '' # Récupération des machines @@ -927,7 +929,7 @@ def club_details(club) : # État administratif f += coul(u'État administratif : ','gras') jour = True - if club.adhesion() < time() and not club.paiement(): + if club.adhesion() < time() and ann_scol not in club.paiement(): jour = False f += coul(u"Non adhérent." ,'violet')