changement de SMTP alinto

development.ini

@@ -31,6 +31,13 @@ mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
 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
+# mail.port = 465
+# mail.ssl  = True
+# ATTENTION : mail.username est utilisé dans rdf_view
+# mail.username = polynet-dumas@entreprise-dumas.com  
+# mail.password = sasdumas
 
 [server:main]
 use = egg:waitress#main

mondumas/models/dossier.py

@@ -48,7 +48,7 @@ def get_dossier_by_sinistre(request,societe, nosin):
     return results
 
 def get_dossiers_traites(request):
-    query = "SELECT d.*, s.libelle FROM dem_devis d JOIN p_statuts s ON d.STATUS = s.CODE WHERE d.usermaj='EMAIL' ORDER BY d.DATEMAJ";
+    query = "SELECT d.*, s.libelle FROM dem_devis d JOIN p_statuts s ON d.STATUS = s.CODE WHERE d.status < 2 ORDER BY d.societe, d.status, d.nomcli";
     results = request.dbsession.execute(query).fetchall()
     return results
 

mondumas/templates/parametres/new_home.pt

@@ -95,7 +95,7 @@
 					<span class="info-box-icon"><i class="glyphicon glyphicon-folder-open"></i></span>
 					<div class="info-box-content">
 						<span class="info-box-number">DEM. DEVIS</span>
-						<span class="info-box-text">A traiter : </span>
+						<span class="info-box-text">A traiter (<2) </span>
 						<span class="info-box-number"><span class="badge bg-PE">${nb_dd_restants.nb_PE}</span>
 													<span class="badge bg-ME">${nb_dd_restants.nb_ME}</span>
 													<span class="badge bg-PL">${nb_dd_restants.nb_PL}</span></span>
@@ -108,7 +108,7 @@
 				<span class="info-box-icon"><i class="glyphicon glyphicon-file"></i></span>
 				<div class="info-box-content">
 					<span class="info-box-number">DEVIS</span>
-					<span class="info-box-text">A traiter : </span>
+					<span class="info-box-text">Acceptés (=4) </span>
 					<span class="info-box-number"><span class="badge bg-PE">${nb_de_restants.nb_PE}</span>
 												<span class="badge bg-ME">${nb_de_restants.nb_ME}</span>
 												<span class="badge bg-PL">${nb_de_restants.nb_PL}</span></span>
@@ -120,7 +120,7 @@
 				<span class="info-box-icon"><i class="glyphicon glyphicon-inbox"></i></span>
 				<div class="info-box-content">
 					<span class="info-box-number">FACTURES</span>
-					<span class="info-box-text">A traiter : </span>
+					<span class="info-box-text">A régler (< 8>) </span>
 					<span class="info-box-number"><span class="badge bg-PE">${nb_fa_restants.nb_PE}</span>
 												<span class="badge bg-ME">${nb_fa_restants.nb_ME}</span>
 												<span class="badge bg-PL">${nb_fa_restants.nb_PL}</span></span>

mondumas/views/default.py

@@ -113,9 +113,11 @@ gestion.entreprise-dumas.com
 """ % (request.route_url('redefinir_mdp', lien=lien))
             # envoyer l'email
             expediteur = request.registry.settings['mondumas.admin_email']
-            send_mail(request, expediteur, [member.email,], "[Ent. Dumas] Demande de ré-initialisation du mot de passe", body)
+            error = send_mail(request, expediteur, [member.email,], "[Ent. Dumas] Demande de ré-initialisation du mot de passe", body)
-            
+            if len(error) > 0:
-            request.session.flash("Le lien permettant de redéfinir votre mot de passe vous a été envoyé à l'adresse : %s." % member.email, 'success')
+                request.session.flash(error, 'warning')
+            else:
+                request.session.flash("Le lien permettant pour redéfinir votre mot de passe vous a été envoyé à l'adresse : %s." % member.email, 'success')
             return HTTPFound(location=request.route_url('affiche_message', login=login))
         else:
             message = "Le mot de passe fourni est incorrect."

mondumas/views/utils.py

@@ -131,7 +131,7 @@ def email_rappels(request, objet, corps, destinataire, societe):
     # envoyer le rappel
     error = send_mail(request, expediteur, destinataire, "[Ent. Dumas] " + objet, corps)
     
-    return error
+    return len(error)
 
 def email_rapport(request):
     NOW = datetime.now()
@@ -176,10 +176,9 @@ def send_mail(request, expediteur, destinataires, objet, corps):
             msg = e.message
         else:
             msg = e
-        # logguer l'erreur
         insert_log(request, 'MAILER', "- ERROR : %s, TO : %s" % (msg, destinataires))
 
-    return len(msg)
+    return str(msg)
 
 @view_config(route_name='batch_test')
 def batch_test(request):

production.ini

@@ -25,15 +25,15 @@ mondumas.devfac_url = mondumas:static/DEVFAC/DOCS_ATTACHES/
 mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES
 
 # Mailer configuration
-mail.host = mail1.sfrbusinessteam.fr
+# mail.host = mail1.sfrbusinessteam.fr
-mail.port = 25
+# mail.port = 25
-mail.ssl  = False
+# mail.ssl  = False
 # SMTP alinto quota limit 30 emails
-# mail.host = v5.alinto.net
+mail.host = v5.alinto.net
-# mail.port = 465
+mail.port = 465
-# mail.ssl  = True
+mail.ssl  = True
 # ATTENTION : mail.username est utilisé dans rdf_view
-mail.username = peinture-dumas@entreprise-dumas.com  
+mail.username = polynet-dumas@entreprise-dumas.com  
 mail.password = sasdumas
 
 [server:main]