phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changement de SMTP alinto

Browse Source
This commit is contained in:
Phuoc
2021-07-06 15:18:55 +02:00
parent 0161c72cd4
commit 02fdd57538
6 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
development.ini
View File

@@ -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

2
mondumas/models/dossier.py
View File

@@ -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

6
mondumas/templates/parametres/new_home.pt
View File

@@ -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>

8
mondumas/views/default.py
View File

@@ -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."

5
mondumas/views/utils.py
View File

@@ -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):

14
production.ini
View File

@@ -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]