From 54ec6e88926df67bb1963d0c20c7ee9cd6599fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 4 Sep 2012 13:57:23 +0200
Subject: [PATCH] [IMP] hr_evaluation: also updated default values when sending
 a mass_mail reminder.

bzr revid: tde@openerp.com-20120904115723-v5ifjg18l8hmbdj2
---
 addons/hr_evaluation/hr_evaluation_view.xml | 5 +++--
 addons/mail/wizard/mail_compose_message.py  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 78997cff83b..4f49b7ba516 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -399,7 +399,6 @@
             action="action_hr_evaluation_interview_tree"/>
 
       <!-- Email Compose message Action-->
-      <!-- TDE TODO: add context values -->
       <act_window
         id="evaluation_reminders" name="Appraisal Reminders"
         res_model="mail.compose.message"
@@ -407,7 +406,9 @@
         view_type="form" view_mode="form"
         target="new" multi="True"
         key2="client_action_multi"
-        context="{'default_composition_mode': 'mass_mail'}"/>
+        context="{'default_composition_mode': 'mass_mail',
+                    'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                    'default_subject': 'Reminder to fill up Survey'}"/>
 
       <!-- Appraisal Interviews Button on Employee Form -->
       <act_window
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3a42336de23..41b10d6d4a3 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -81,7 +81,7 @@ class mail_compose_message(osv.TransientModel):
         elif composition_mode == 'comment' and model and res_id:
             vals = self.get_record_data(cr, uid, model, res_id, context=context)
         elif composition_mode == 'mass_mail' and model and active_ids:
-            vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
+            vals = {'model': model, 'res_id': res_id}
         else:
             vals = {'model': model, 'res_id': res_id}
         if composition_mode: