[MERGE]

bzr revid: hmo@tinyerp.com-20110425091047-d51xuglrsk1f5p9y
2011-04-25 14:40:47 +05:30
parent cf032c0bf0 91113680fa
commit 234ad131d1
1 changed files with 5 additions and 1 deletions
@@ -171,7 +171,11 @@ class email_compose_message(osv.osv_memory):


    def get_template_value(self, cr, uid, message, model, resource_id, context=None):
-        return message
+        locals_for_emails = {
+            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+            'object' : self.pool.get(model).browse(cr, uid, resource_id),
+        }
+        return message and eval(message, {}, locals_for_emails)

 email_compose_message()