From b5274ce45f8e5dc99844b221d2dfd3ac95fe7498 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 9 Dec 2014 16:19:07 +0100
Subject: [PATCH] [FIX] 'auth_generate_password' now works even if the password
 is encrypted in database;

---
 auth_generate_password/data/email_template.xml |  2 +-
 auth_generate_password/model/res_users.py      | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/auth_generate_password/data/email_template.xml b/auth_generate_password/data/email_template.xml
index b22920aa9..f914c11e0 100644
--- a/auth_generate_password/data/email_template.xml
+++ b/auth_generate_password/data/email_template.xml
@@ -31,7 +31,7 @@
 Your OpenERP credentials has been changed:
 <ul>
 <li>Login : ${object.login}</li>
-<li>New Password : ${object.password}</li>
+<li>New Password : ${ctx.get('generated_password')}</li>
 </ul>
 Please,
 <ul>
diff --git a/auth_generate_password/model/res_users.py b/auth_generate_password/model/res_users.py
index 47d78d4d0..6bf5b9ef4 100644
--- a/auth_generate_password/model/res_users.py
+++ b/auth_generate_password/model/res_users.py
@@ -34,6 +34,8 @@ class res_users(Model):
     _inherit = 'res.users'
 
     def generate_password(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
         mm_obj = self.pool['mail.mail']
         icp_obj = self.pool['ir.config_parameter']
         imd_obj = self.pool['ir.model.data']
@@ -42,6 +44,9 @@ class res_users(Model):
             cr, uid, 'auth_generate_password.password_size'))
         password_chars = eval(icp_obj.get_param(
             cr, uid, 'auth_generate_password.password_chars'))
+        et = imd_obj.get_object(
+            cr, uid, 'auth_generate_password', 'generate_password_template')
+
         for ru in self.browse(cr, uid, ids, context=context):
             if not ru.email:
                 raise osv.except_osv(
@@ -53,9 +58,8 @@ class res_users(Model):
             self._set_new_password(
                 cr, uid, ru.id, None, password, None, context=None)
             # Send Mail
-            et = imd_obj.get_object(
-                cr, uid, 'auth_generate_password',
-                'generate_password_template')
+            context['generated_password'] = password
             mail_id = et_obj.send_mail(
                 cr, uid, et.id, ru.id, True, context=context)
+            del context['generated_password']
         return {}