From c636fcca6d8264a9a1601f650c57619873d1a282 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Mon, 17 Nov 2014 19:23:14 +0100 Subject: [PATCH] DBG_PRINTER: n'imprime pas pour de vrai --- impression/impression_hp.py | 5 ++--- testing.sh | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/impression/impression_hp.py b/impression/impression_hp.py index 4e3927b0..e83f137d 100644 --- a/impression/impression_hp.py +++ b/impression/impression_hp.py @@ -39,8 +39,7 @@ except AttributeError: handler.formatter = formatter logger.addHandler(handler) -DEBUG = bool(os.getenv('DEBUG', False)) -DECOUVERT_AUTHORISE = config_impression.decouvert +DEBUG = bool(os.getenv('DBG_PRINTER', False)) class Option(object): # Valeur par défaut @@ -359,7 +358,7 @@ class impression(object): adh = adh[1:] adh = self._get_adh(adh[0]) self._calcule_prix() # Normalement inutile, mais évite les races - if (self._prix > (adh.solde() - DECOUVERT_AUTHORISE)): + if (self._prix > (adh.solde() - config_impression.decouvert)): raise SoldeInsuffisant adh.solde(-self._prix, "impression(%d): %s par %s" % (self._jid,self._fichier,self._adh)) adh.save() diff --git a/testing.sh b/testing.sh index 02a33528..c02ef052 100644 --- a/testing.sh +++ b/testing.sh @@ -17,3 +17,6 @@ export DBG_MAIL=`whoami`+test@crans.org # Serveur freeradius de test ? export DBG_FREERADIUS=1 + +# Imprime pour de vrai ? +export DBG_PRINTER=1