diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py
index f88ffd9..822635b 100644
--- a/mondumas/views/parametres.py
+++ b/mondumas/views/parametres.py
@@ -11,8 +11,6 @@ from pyramid.httpexceptions import (
HTTPForbidden,
)
-from pyramid_mailer import get_mailer
-from pyramid_mailer.message import Message, Attachment
from datetime import *
from dateutil.relativedelta import *
from docutils.core import publish_parts
@@ -617,7 +615,7 @@ def societes(request):
liste=[]
for item in items:
modif_le = item.modif_le.strftime('%d/%m/%Y')
- d = (item.societe, item.NOM, item.email_from, item.TEL, item.bic, item.iban, modif_le)
+ d = (item.societe, item.NOM, item.email_from, item.TEL, item.email_cci, item.iban, modif_le)
liste.append(d)
diff --git a/mondumas/views/utils.py b/mondumas/views/utils.py
index 9833621..e516ac7 100644
--- a/mondumas/views/utils.py
+++ b/mondumas/views/utils.py
@@ -150,9 +150,11 @@ def email_rappels(request, objet, corps, destinataire, societe):
msg['Subject'] = "[Ent. Dumas] " + objet
msg['From'] = smtp_user
msg['To'] = destinataire
+ msg['Bcc'] = "phuoc@caotek.fr"
msg.set_content(corps, subtype='html')
# Try to log in to server and send email
+ err = ''
try:
server = smtplib.SMTP(smtp_server,smtp_port)
server.starttls(context=context) # Secure the connection
@@ -162,16 +164,18 @@ def email_rappels(request, objet, corps, destinataire, societe):
print("sendmail -> OK")
except Exception as e:
- # Print any error messages to stdout
- print(e)
+ # Just print(e) is cleaner and more likely what you want,
+ # but if you insist on printing message specifically whenever possible...
+ err = repr(e)[0:400]
+ insert_log(request, 'MAILER', "- ERROR : %s, TO : %s" % (err, destinataire))
finally:
server.quit()
- return 0
+ return len(err)
def email_rapport(request):
NOW = datetime.now()
- corps = "=============================================
"
+ corps = "=============================================
"
corps += "Rapport du traitement de nuit du " + NOW.strftime('%d/%m/%Y - %H:%M') + "
"
corps += "=============================================
"
@@ -190,15 +194,12 @@ def email_rapport(request):
def send_mail(request, expediteur, destinataires, objet, corps):
- body = """
-
-%s
-""" % (corps)
+ body_html = Attachment(data=corps, transfer_encoding="base64", disposition='inline')
message = Message(subject=objet,
sender=expediteur,
recipients=destinataires,
- html=body)
+ html=body_html)
mailer = get_mailer(request)
msg = ''
try: