diff --git a/development.ini b/development.ini
index 42a6480..43f1ab5 100644
--- a/development.ini
+++ b/development.ini
@@ -30,15 +30,13 @@ mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
# Mailer configuration
mail.host = smtp.orange.fr
mail.port = 25
-mail.username = cao.thien-phuoc@orange.fr
-# SMTP alinto quota limit 30 emails
-# mail.host = v5.alinto.net
+
+# SMTP RELAY alinto
+# mail.host = gatewayxl.alinto.net
# mail.port = 465
# mail.ssl = True
-# ATTENTION : mail.username est utilisé dans rdf_view
-# mail.username = polynet-dumas@entreprise-dumas.com
-# mail.password = sasdumas
-
+# mail.username = smtpsasdumas@entreprise-dumas.com
+
[server:main]
use = egg:waitress#main
host = 0.0.0.0
diff --git a/mondumas/templates/devis/devis_preview.pt b/mondumas/templates/devis/devis_preview.pt
index 741a483..8be8ca9 100644
--- a/mondumas/templates/devis/devis_preview.pt
+++ b/mondumas/templates/devis/devis_preview.pt
@@ -49,7 +49,7 @@
Montant HT |
-
|
+
|
Les lignes du devis ici
diff --git a/mondumas/views/devis.py b/mondumas/views/devis.py
index 9ff31c0..5b9dc42 100644
--- a/mondumas/views/devis.py
+++ b/mondumas/views/devis.py
@@ -184,7 +184,7 @@ def devis_web(request):
os.remove(dest)
# on est en developpement ou en production
- if request.registry.settings["mail.username"] == "sasdumas@entreprise-dumas.com":
+ if request.registry.settings["mondumas.admin_email"] == "sasdumas@entreprise-dumas.com":
origin = 'https://gestion.entreprise-dumas.com/devis_preview/%s' % nodevis
pdfkit.from_url(origin, dest, options=options)
else:
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 434230f..fb9170e 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -651,7 +651,7 @@ def rdf_view(request):
os.remove(dest)
# developpement ou production
- if request.registry.settings["mail.username"].find('@entreprise-dumas.com') > 0:
+ if request.registry.settings["mondumas.admin_email"].find('@entreprise-dumas.com') > 0:
origin = 'https://gestion.entreprise-dumas.com/rdf_rapport/%s' % norapport
pdfkit.from_url(origin, dest, options=options)
else:
diff --git a/mondumas/views/utils.py b/mondumas/views/utils.py
index c867662..9afcb33 100644
--- a/mondumas/views/utils.py
+++ b/mondumas/views/utils.py
@@ -165,7 +165,7 @@ def send_mail(request, expediteur, destinataires, objet, corps):
recipients=destinataires,
html=body)
mailer = get_mailer(request)
- # import pdb;pdb.set_trace()
+ import pdb;pdb.set_trace()
msg = ''
try:
mailer.send_immediately(message)
diff --git a/production.ini b/production.ini
index 95c57d1..25961a1 100644
--- a/production.ini
+++ b/production.ini
@@ -28,14 +28,15 @@ mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
# mail.host = mail1.sfrbusinessteam.fr
# mail.port = 25
# mail.ssl = False
-# SMTP alinto quota limit 30 emails
-mail.host = v5.alinto.net
+
+# SMTP RELAY alinto
+mail.host = gatewayxl.alinto.net
mail.port = 465
mail.ssl = True
-# ATTENTION : mail.username est utilisé dans rdf_view
-mail.username = peinture-dumas@entreprise-dumas.com
+mail.username = smtpsasdumas@entreprise-dumas.com
mail.password = S@sdumas69
+
[server:main]
use = egg:waitress#main
host = 0.0.0.0