diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py index ed43645..479e652 100644 --- a/mondumas/models/parametres.py +++ b/mondumas/models/parametres.py @@ -63,7 +63,7 @@ def get_emails_sent(request, nolig): if nolig == 0: query = """SELECT CONCAT(l.societe,"-",l.no_id) as nodossier, l.datemaj, l.comment, l.nolig, l.usermaj, e.nomcli FROM dem_lig l INNER JOIN dem_devis e ON l.societe=e.societe AND l.no_id=e.no_id - WHERE l.date >= :datedeb AND l.comment LIKE 'Envoi email -> %' ORDER BY l.datemaj""" + WHERE l.date >= :datedeb AND l.comment LIKE 'Envoi email -> %' ORDER BY l.datemaj;""" results = request.dbsession.execute(query, {'datedeb': datedeb}).fetchall() else: query = """SELECT * FROM dem_lig WHERE nolig=:nolig;""" diff --git a/mondumas/templates/parametres/emails_sent.pt b/mondumas/templates/parametres/emails_sent.pt index 33aa7ad..7da54d7 100644 --- a/mondumas/templates/parametres/emails_sent.pt +++ b/mondumas/templates/parametres/emails_sent.pt @@ -41,7 +41,8 @@ return '' + data + ''; }, }, - ] + ], + order: [[0, 'desc']], }); }); diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 801df8d..a2f0a2c 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -197,7 +197,6 @@ def login(request): record = get_member_by_id(request, login) if record : # mot de passe hash valide ? - import pdb;pdb.set_trace() if record.mdp == to_sha1(password) and record.actif == 1: # get user agent string from request ua_string = request.user_agent