From 7ed07c081fa732a3d88c233b823849734385f217 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Fri, 24 Oct 2014 16:56:06 +0200 Subject: [PATCH] impression_ok: bugfixes --- gestion/mail/mail_impression_ok.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gestion/mail/mail_impression_ok.py b/gestion/mail/mail_impression_ok.py index f71f3c77..a6acad58 100755 --- a/gestion/mail/mail_impression_ok.py +++ b/gestion/mail/mail_impression_ok.py @@ -56,9 +56,9 @@ for job in jobs: split = uid.split(u':') if status != "Success": # Préviens les imprimeurs si une impression a échoué, - # pas de fioritures ici, boucle assez basique + # pas de fioritures ici, boucle assez basique if len(split) < 3: - name = 'Impression à la main' + name = 'Impression à la main' task = uid if name not in echecs: echecs[name] = {'task': []} @@ -69,10 +69,10 @@ for job in jobs: task = u':'.join(split[2:]) if name not in echecs: echecs[name] = {'task': []} - echecs[name]['task'].append(task) + echecs[name]['task'].append(task) - if status != "Sucess": - continue + if status != "Success": + continue # Dans le cas d'un success, if len(split) < 3: continue @@ -138,7 +138,7 @@ for club in clubs: 'codes': u', '.join(codes), }) #print mailtxt.as_string() - #actually_sendmail(From, (To,), mailtxt) + actually_sendmail(From, (To,), mailtxt) for name in echecs: ad = con.search(u'(uid=%s)' % name) @@ -147,15 +147,15 @@ for name in echecs: adh = ad[0] tname = unicode(adh['prenom'][0]) + " " + unicode(adh['nom'][0]) else: - tname = name - mailtxt=mail.generate('mail_impression_ok', { + tname = name + mailtxt=mail.generate('mail_impression_ratee', { 'To': To, 'From': From, 'tname': tname, 'taches': u', '.join(success[name]['task']), - }) - #print mailtxt.as_string() - actually_sendmail(From, (To,), mailtxt) + }) + #print mailtxt.as_string() + actually_sendmail(From, (To,), mailtxt)