diff --git a/development.ini b/development.ini index 7bbc137..fb2fb08 100644 --- a/development.ini +++ b/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 diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index 876a021..b2a25e6 100644 --- a/mondumas/models/dossier.py +++ b/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 diff --git a/mondumas/templates/parametres/new_home.pt b/mondumas/templates/parametres/new_home.pt index a93280c..9800e3f 100644 --- a/mondumas/templates/parametres/new_home.pt +++ b/mondumas/templates/parametres/new_home.pt @@ -95,7 +95,7 @@
DEM. DEVIS - A traiter : + A traiter (<2) ${nb_dd_restants.nb_PE} ${nb_dd_restants.nb_ME} ${nb_dd_restants.nb_PL} @@ -108,7 +108,7 @@
DEVIS - A traiter : + Acceptés (=4) ${nb_de_restants.nb_PE} ${nb_de_restants.nb_ME} ${nb_de_restants.nb_PL} @@ -120,7 +120,7 @@
FACTURES - A traiter : + A régler (< 8>) ${nb_fa_restants.nb_PE} ${nb_fa_restants.nb_ME} ${nb_fa_restants.nb_PL} diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 5339b6b..749dfa1 100644 --- a/mondumas/views/default.py +++ b/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) - - request.session.flash("Le lien permettant de redéfinir votre mot de passe vous a été envoyé à l'adresse : %s." % member.email, 'success') + 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(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." diff --git a/mondumas/views/utils.py b/mondumas/views/utils.py index 29072f3..41a0140 100644 --- a/mondumas/views/utils.py +++ b/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): diff --git a/production.ini b/production.ini index a0b6b86..a23249d 100644 --- a/production.ini +++ b/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.port = 25 -mail.ssl = False +# mail.host = mail1.sfrbusinessteam.fr +# mail.port = 25 +# mail.ssl = False # SMTP alinto quota limit 30 emails -# mail.host = v5.alinto.net -# mail.port = 465 -# mail.ssl = True +mail.host = v5.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 = polynet-dumas@entreprise-dumas.com mail.password = sasdumas [server:main]