From 01c47ea353149bea0a7b39b01546b9b3568270c4 Mon Sep 17 00:00:00 2001 From: dimino Date: Mon, 5 Nov 2007 22:14:57 +0100 Subject: [PATCH] j'avais oublie quelques subtilites... darcs-hash:20071105211457-7b604-84567c0da54525bad76c6db120a99ba8600c4e43.gz --- admin/controle_tresorier2.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/admin/controle_tresorier2.py b/admin/controle_tresorier2.py index 036adc5f..8033b685 100755 --- a/admin/controle_tresorier2.py +++ b/admin/controle_tresorier2.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # -# $Id: controle_tresorier2.py,v 1.1 2007-11-05 20:32:38 dimino Exp $ +# $Id: controle_tresorier2.py,v 1.2 2007-11-05 21:14:57 dimino Exp $ # # tresorier.py # ------------ @@ -135,11 +135,22 @@ def main_menu(): return # Construction de la liste des adhérents à contrôler - search_result = db.search('paiement=%d&controle!=p' % ann_scol) - lst = search_result['adherent'] + search_result_p = db.search('paiement=%d&controle!=*p*' % ann_scol) + search_result_c = db.search('paiement=%d&controle!=*c*' % ann_scol) + lst_p = search_result_p['adherent'] + lst_c = search_result_c['adherent'] if "3" in result: - for club in search_result['club']: - lst.append(club) + for club in search_result_p['club']: + lst_p.append(club) + for club in search_result_c['club']: + lst_c.append(club) + + lst = {} + for adh in lst_p: + lst[adh.id()] = adh + for adh in lst_c: + lst[adh.id()] = adh + lst = lst.values() # Filtre si on ne veut pas des réadhesion if not "2" in result: