diff --git a/CHANGELOG b/CHANGELOG index a1c2858fd2..15019b8208 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Use expire delay instead of UTC datetime in reset password email * Use RENAME and DROP COLUMN with SQLite backend * Support window functions with SQLite backend * Use JSONB to store Dict field on PostgreSQL backend diff --git a/trytond/res/email_reset_password.html b/trytond/res/email_reset_password.html index cd3e2f8eab..2e2d1d0f66 100644 --- a/trytond/res/email_reset_password.html +++ b/trytond/res/email_reset_password.html @@ -17,8 +17,8 @@
-

- The password will expire at . +

+ The password will expire in .

diff --git a/trytond/res/user.py b/trytond/res/user.py index 51bdcad48a..d4be430e47 100644 --- a/trytond/res/user.py +++ b/trytond/res/user.py @@ -1179,6 +1179,13 @@ class EmailResetPassword(Report): context['expire'] = lang.strftime( records[0].password_reset_expire, format=lang.date + ' %H:%M:%S') + expire_delay = ( + records[0].password_reset_expire - datetime.datetime.now()) + # Use a precision of minutes + expire_delay = datetime.timedelta( + days=expire_delay.days, + minutes=round(expire_delay.seconds / 60)) + context['expire_delay'] = expire_delay return context