diff --git a/admin/mail_invalide/logo_crans_ether.png b/admin/mail_invalide/logo_crans_ether.png new file mode 100644 index 00000000..be0b3f91 Binary files /dev/null and b/admin/mail_invalide/logo_crans_ether.png differ diff --git a/admin/mail_invalide/mail_invalide.py b/admin/mail_invalide/mail_invalide.py index a803782f..04b337bf 100755 --- a/admin/mail_invalide/mail_invalide.py +++ b/admin/mail_invalide/mail_invalide.py @@ -68,9 +68,10 @@ def generate_ps(proprio, mail): file('%s/%s.tex' % (dossier, fichier), 'w').write(template) # Compilation du fichier latex - commands.getstatusoutput('PATH="/bin:/usr/bin" cd %(dossier)s && barcode -n -E -b %(adresse)s%(date)s -o %(barcode)s && latex --interaction=nonstopmode %(base)s.tex && dvips %(base)s.dvi && rm -f %(base)s.dvi %(base)s.aux %(base)s.log %(base)s.tex %(barcode)s'%{'dossier': dossier, 'adresse': adresse, 'date': time.strftime("%Y%m%d-%H%M"), 'base': fichier, 'barcode': barcode}) + #commands.getstatusoutput('PATH="/bin:/usr/bin" cd %(dossier)s && barcode -n -E -b %(adresse)s%(date)s -o %(barcode)s && latex --interaction=nonstopmode %(base)s.tex && dvips %(base)s.dvi && rm -f %(base)s.dvi %(base)s.aux %(base)s.log %(base)s.tex %(barcode)s'%{'dossier': dossier, 'adresse': adresse, 'date': time.strftime("%Y%m%d-%H%M"), 'base': fichier, 'barcode': barcode}) + commands.getstatusoutput('cd %(dossier)s && pdflatex -interaction nonstopmode %(base)s.tex'%{'dossier': dossier, 'adresse': adresse, 'date': time.strftime("%Y%m%d-%H%M"), 'base': fichier, 'barcode': barcode}) - return '%s/%s.ps' % (dossier, fichier) + return '%s/%s.pdf' % (dossier, fichier) except Exception, e: log('Erreur lors de la génération du ps : ') diff --git a/admin/mail_invalide/mail_invalide.tex b/admin/mail_invalide/mail_invalide.tex index 5c02c059..6f0b4f7f 100644 --- a/admin/mail_invalide/mail_invalide.tex +++ b/admin/mail_invalide/mail_invalide.tex @@ -7,7 +7,7 @@ \usepackage{pstricks} \usepackage{multicol} \usepackage{alltt} -\usepackage[dvips]{eso-pic,graphicx} +\usepackage{graphicx} %\usepackage[dvips]{color} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc}