Merge lp:~josepato-o/openobject-addons/addons-fix-jpv-988336 into lp:openobject-addons/6.1

[OpenBias]

  [FIX]-988336- on the mail compose window the values are displayed insted of the variables

Unmerged revisions

6790. By Jose Patricio Villarreal on 2012-05-07

[FIX]-988336- on the mail compose window the values are displayed insted of the variables

=== modified file 'email_template/wizard/mail_compose_message.py'
--- email_template/wizard/mail_compose_message.py	2012-03-23 15:46:38 +0000
+++ email_template/wizard/mail_compose_message.py	2012-05-07 17:06:03 +0000
@@ -104,12 +104,24 @@
                         }
                         att_ids.append(attachment_obj.create(cr, uid, data_attach))
                     values['attachment_ids'] = att_ids
+            ### Renders values
+            template =  self.pool.get('email.template').get_email_template(cr, uid, template_id, res_id, context)
+            model = template.model
+            values['body_text'] = self.render_template(cr, uid,values['body_text'] , model, res_id, context=None)
+            values['email_from'] = self.render_template(cr, uid,values['email_from'] , model, res_id, context=None)
+            values['email_to'] = self.render_template(cr, uid,values['email_to'] , model, res_id, context=None)
+            values['email_cc'] = self.render_template(cr, uid,values['email_cc'] , model, res_id, context=None)
+            values['email_bcc'] = self.render_template(cr, uid,values['email_bcc'] , model, res_id, context=None)
+            values['subject'] = self.render_template(cr, uid,values['subject'] , model, res_id, context=None)
+            values['body_html'] = self.render_template(cr, uid,values['body_html'] , model, res_id, context=None)
+
         else:
             # restore defaults
             values = self.default_get(cr, uid, self.fields_get_keys(cr, uid), context)
             values.update(use_template=use_template, template_id=template_id)
-
         return {'value': values}
+    
+
 
 
     def template_toggle(self, cr, uid, ids, context=None):