From f663453b334214374fbbcf011a2f7dfeaaa8351a Mon Sep 17 00:00:00 2001 From: cohen Date: Tue, 20 Nov 2007 04:59:14 +0100 Subject: [PATCH] correction : les clubs ne peuvent pas signer la charte des MA darcs-hash:20071120035914-f6463-e3786df99b11d007a16b7387222eaa9aa732c84d.gz --- gestion/gest_crans.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gestion/gest_crans.py b/gestion/gest_crans.py index d73e6c93..85edea53 100755 --- a/gestion/gest_crans.py +++ b/gestion/gest_crans.py @@ -946,7 +946,7 @@ def set_admin(proprio): caution = on_off('k' in proprio.controle()) paiement_ok = on_off('p' in proprio.controle()) carte_ok = on_off('c' in proprio.controle()) - charte_MA = on_off(proprio.charteMA()) + if has_card: charte_MA = on_off(proprio.charteMA()) # Construction de la boîte de dialogue texte = [] @@ -975,7 +975,7 @@ def set_admin(proprio): checklist.append(u'"4" "Carte d\'étudiant vérifiée" "%s"' % carte_ok) checklist.append(u'"5" "Cotisation/charte/caution vérifées" "%s"' % paiement_ok) - if isbureau or isadm: + if (isbureau or isadm) and has_card: checklist.append(u'"6" "Charte des MA signee" "%s"' % charte_MA) if not checklist: @@ -1038,10 +1038,11 @@ def set_admin(proprio): elif iscontroleur: proprio.controle('-p') - if '6\n' in result: - proprio.charteMA(True) - elif isadm or isbureau: - proprio.charteMA(False) + if has_card: + if '6\n' in result: + proprio.charteMA(True) + elif isadm or isbureau: + proprio.charteMA(False) if 'C\n' in result: proprio.controle('+k')