From 72f506d45a3b18a12a6e40247398ea38361babd4 Mon Sep 17 00:00:00 2001 From: bos Date: Thu, 1 Nov 2007 00:34:52 +0100 Subject: [PATCH] On ne tient pas compte des droits multimachine darcs-hash:20071031233452-c992d-7b0cf5d7bfac9a5706cae6475c6cab2c4b675226.gz --- admin/menage_cableurs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/menage_cableurs.py b/admin/menage_cableurs.py index dd98f768..594d0fae 100755 --- a/admin/menage_cableurs.py +++ b/admin/menage_cableurs.py @@ -71,8 +71,9 @@ def lister(): todo_list1 = db.search('droits=*')['adherent'] todo_list = [] for adh in todo_list1: - if ('Bureau' not in adh.droits()) and ('Nounou' not in adh.droits()) and (config.ann_scol not in adh.paiement()): + if ('Bureau' not in adh.droits()) and ('Nounou' not in adh.droits()) and (adh.droits()!=['MultiMachines']) and (config.ann_scol not in adh.paiement()): todo_list.append(adh) + todo_list.sort(lambda x, y: cmp((x.nom(), x.prenom()), (y.nom(), y.prenom()))) print "Liste des câbleur dont la cotisation n'est pas à jour." print for adh in todo_list: @@ -87,7 +88,7 @@ def controle_interactif(): todo_list1 = db.search('droits=*')['adherent'] todo_list = [] for adh in todo_list1: - if ('Bureau' not in adh.droits()) and ('Nounou' not in adh.droits()) and (config.ann_scol not in adh.paiement()): + if ('Bureau' not in adh.droits()) and ('Nounou' not in adh.droits()) and (adh.droits()!=['MultiMachines']) and (config.ann_scol not in adh.paiement()): todo_list.append(adh) # Tri de la liste des adhérents selon nom, prénom