From 79f7a3e7fd77dfce87cacca37fd529819ce62f4e Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 16 Feb 2011 11:26:00 +0530
Subject: [PATCH 01/27] [IMP]email_template:- also check template has no
 smtp_server_id then it take default smtp_server.

bzr revid: ysa@tinyerp.com-20110216055600-z8avrlljeatr3kp7
---
 addons/email_template/email_template.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index e75b3cf9325..78cacbb7586 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -30,6 +30,7 @@ import re
 from tools.translate import _
 import tools
 import pooler
+import types
 
 class email_template(osv.osv):
     "Templates for sending Email"
@@ -371,8 +372,11 @@ This is useful for CRM leads for example"),
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, record_id, context)
         smtp_server_id = context.get('smtp_server_id', False)
-        if not smtp_server_id:
+        if not smtp_server_id and template.smtp_server_id:
             smtp_server_id = template.smtp_server_id.id
+        else:
+            smtp_ids = smtp_pool.search(cr, uid, [('default','=',True)])
+            smtp_server_id = smtp_ids and smtp_ids[0]
         smtp_server = smtp_pool.browse(cr, uid, smtp_server_id, context=context)
         # determine name of sender, either it is specified in email_id
 
@@ -481,6 +485,8 @@ class email_message(osv.osv):
             context = {}
         notemplate = context.get('notemplate', False)
         if (not notemplate) and model and openobject_id:
+            if type(openobject_id) != list:
+                openobject_id = [openobject_id]
             template_pool = self.pool.get('email.template')
             template_ids = template_pool.search(cr, uid, [('model','=',model)])
             if template_ids and len(template_ids):

From a084e73585c87dda1d42102447b744f19f9c9522 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 16 Feb 2011 13:03:12 +0530
Subject: [PATCH 02/27] [IMP] email_template :- openobject_id pass as a int in
 generate_email method.

bzr revid: ysa@tinyerp.com-20110216073312-6m133fmnzgf61v71
---
 addons/email_template/email_template.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 78cacbb7586..5a746b8608b 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -30,7 +30,6 @@ import re
 from tools.translate import _
 import tools
 import pooler
-import types
 
 class email_template(osv.osv):
     "Templates for sending Email"
@@ -452,14 +451,13 @@ This is useful for CRM leads for example"),
 
 
 
-    def generate_email(self, cr, uid, ids, record_ids,  context=None):
+    def generate_email(self, cr, uid, ids, record_id,  context=None):
         if context is None:
             context = {}
         email_ids = []
         for template in self.browse(cr, uid, ids, context=context):
-            for record_id in record_ids:
-                email_id = self._generate_email(cr, uid, template.id, record_id, context)
-                email_ids.append(email_id)
+            email_id = self._generate_email(cr, uid, template.id, record_id, context)
+            email_ids.append(email_id)
         return email_ids
 email_template()
 
@@ -485,8 +483,6 @@ class email_message(osv.osv):
             context = {}
         notemplate = context.get('notemplate', False)
         if (not notemplate) and model and openobject_id:
-            if type(openobject_id) != list:
-                openobject_id = [openobject_id]
             template_pool = self.pool.get('email.template')
             template_ids = template_pool.search(cr, uid, [('model','=',model)])
             if template_ids and len(template_ids):

From 99c4933b50cdc107bf66748d3d20d1e78a197b94 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Feb 2011 16:28:44 +0530
Subject: [PATCH 03/27] [ADD] emails :- add email.message send wizard.

bzr revid: ysa@tinyerp.com-20110217105844-sj5o5y1qmszp6mtw
---
 addons/email_template/email_template.py | 16 ++++++++--------
 addons/emails/__init__.py               |  1 +
 addons/emails/__openerp__.py            |  2 +-
 addons/emails/email_message.py          |  2 +-
 addons/emails/email_view.xml            |  3 ++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 5a746b8608b..59025fa5162 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -451,14 +451,12 @@ This is useful for CRM leads for example"),
 
 
 
-    def generate_email(self, cr, uid, ids, record_id,  context=None):
+    def generate_email(self, cr, uid, template_id, record_id,  context=None):
         if context is None:
             context = {}
-        email_ids = []
-        for template in self.browse(cr, uid, ids, context=context):
-            email_id = self._generate_email(cr, uid, template.id, record_id, context)
-            email_ids.append(email_id)
-        return email_ids
+        email_id = self._generate_email(cr, uid, template_id, record_id, context)
+        return email_id
+
 email_template()
 
 class email_message(osv.osv):
@@ -481,15 +479,17 @@ class email_message(osv.osv):
             message_id=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None):
         if context is None:
             context = {}
-        notemplate = context.get('notemplate', False)
+        notemplate = context.get('notemplate', True)
         if (not notemplate) and model and openobject_id:
             template_pool = self.pool.get('email.template')
             template_ids = template_pool.search(cr, uid, [('model','=',model)])
             if template_ids and len(template_ids):
                 template_id = template_ids[0]
-                return template_pool.generate_email(cr, uid, [template_id], openobject_id, context=context)
+                return template_pool.generate_email(cr, uid, template_id, openobject_id, context=context)
+
         return super(email_message, self).email_send(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc, email_bcc=email_bcc, reply_to=reply_to, attach=attach,
                 message_id=message_id, openobject_id=openobject_id, debug=debug, subtype=subtype, x_headers=x_headers, priority=priority, smtp_server_id=smtp_server_id, context=context)
+
 email_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/emails/__init__.py b/addons/emails/__init__.py
index 5e481d8e957..dd9a7e703d0 100644
--- a/addons/emails/__init__.py
+++ b/addons/emails/__init__.py
@@ -22,6 +22,7 @@
 import email_smtp_server
 import email_message
 import res_partner
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/emails/__openerp__.py b/addons/emails/__openerp__.py
index 9e2c1ae2dd8..a3b6456921f 100644
--- a/addons/emails/__openerp__.py
+++ b/addons/emails/__openerp__.py
@@ -32,11 +32,11 @@
     'depends': ['base', 'base_tools'],
     'init_xml': [],
     'update_xml': [
+        "wizard/email_message_wizard_send_view.xml",
         "email_view.xml",
         "res_partner_view.xml",
         'security/ir.model.access.csv',
         'email_data.xml',
-
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/emails/email_message.py b/addons/emails/email_message.py
index 07572916fbf..ec2aa7ccca0 100644
--- a/addons/emails/email_message.py
+++ b/addons/emails/email_message.py
@@ -284,7 +284,7 @@ class email_message(osv.osv):
             for attachment in attach:
                 attachment_data = {
                         'name':  (subject or '') + _(' (Email Attachment)'),
-                        'datas': base64.b64encode(attachment[1]),
+                        'datas': attachment[1],
                         'datas_fname': attachment[0],
                         'description': subject or _('No Description'),
                         'res_model':'email.message',
diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index 4a2da7fb106..929c96626e1 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" />
+              id="base.menu_lunch_survey_root" sequence="20"/>
 
         <record model="ir.ui.view" id="view_email_message_form">
             <field name="name">email.message.form</field>
@@ -34,6 +34,7 @@
                                     <field name="res_id"  readonly="1"/>
                                     <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
 	                                <field name="message_id"/>
+	                                <button name="%(action_email_message_wizard_send)d" string="Reply" type="action" icon="terp-mail-replied"/>
                                 </group>
                             </group>
                             <separator string="Description" colspan="4"/>

From 70b7e315c2352cfaab6fbc12b526acf42127ed67 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Feb 2011 16:29:12 +0530
Subject: [PATCH 04/27] [ADD] emails :- add email.message send wizard.

bzr revid: ysa@tinyerp.com-20110217105912-x8bxz5m6mu3wnlik
---
 addons/emails/wizard/__init__.py              |  24 +++
 .../wizard/email_message_wizard_send.py       | 138 ++++++++++++++++++
 .../wizard/email_message_wizard_send_view.xml |  52 +++++++
 3 files changed, 214 insertions(+)
 create mode 100644 addons/emails/wizard/__init__.py
 create mode 100644 addons/emails/wizard/email_message_wizard_send.py
 create mode 100644 addons/emails/wizard/email_message_wizard_send_view.xml

diff --git a/addons/emails/wizard/__init__.py b/addons/emails/wizard/__init__.py
new file mode 100644
index 00000000000..e8dc20ee171
--- /dev/null
+++ b/addons/emails/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import email_message_wizard_send
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
new file mode 100644
index 00000000000..7dfc008db1d
--- /dev/null
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+from tools.translate import _
+
+class email_message_wizard_send(osv.osv_memory):
+    _name = 'email.message.wizard_send'
+    _inherit = 'email.message'
+    _description = 'This is the wizard for send e-mail'
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_message_wizard_send, self).default_get(cr, uid, fields, context=context)
+        message_pool = self.pool.get('email.message')
+
+        model_pool = self.pool.get('ir.model')
+        message_id = context.get('message_id', False)
+        if message_id:
+            message_data = message_pool.browse(cr, uid, message_id, context)
+
+            if 'template_id' in fields:
+                result['template_id'] = message_data.template_id and message_data.template_id.id or False
+
+            if 'smtp_server_id' in fields:
+                result['smtp_server_id'] = message_data.smtp_server_id and message_data.smtp_server_id.id or False
+
+            if 'message_id' in fields:
+                result['message_id'] = message_data.message_id
+
+            if 'attachment_ids' in fields:
+                result['attachment_ids'] = message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids']
+
+            if 'res_id' in fields:
+                result['res_id'] = message_data.res_id
+
+            if 'email_from' in fields:
+                result['email_from'] = message_data.email_from
+
+            if 'email_to' in fields:
+                result['email_to'] = message_data.email_to
+
+            if 'email_cc' in fields:
+                result['email_cc'] = message_data.email_cc
+
+            if 'email_bcc' in fields:
+                result['email_bcc'] = message_data.email_bcc
+
+            if 'name' in fields:
+                result['name'] = "Re : " + message_data.name
+
+            if 'description' in fields:
+                result['description'] = "On %s %s  wrote :- \n >\t %s " %(str(message_data.date) ,
+                            message_data.email_from , message_data.description and message_data.description.replace('\n', "\n > \t") or '')
+
+            if 'reply_to' in fields:
+                result['reply_to'] = message_data.reply_to
+
+            if 'model' in fields:
+                result['model'] = message_data.model
+
+            if 'user_id' in fields:
+                result['user_id'] = message_data.user_id and message_data.user_id.id or False
+
+            if 'references' in fields:
+                result['references'] = message_data.references
+
+            if 'sub_type' in fields:
+                result['sub_type'] = message_data.sub_type
+
+            if 'headers' in fields:
+                result['headers'] = message_data.headers
+
+            if 'priority' in fields:
+                result['priority'] = message_data.priority
+
+            if 'partner_id' in fields:
+                result['partner_id'] = message_data.partner_id and message_data.partner_id.id or False
+
+            if 'debug' in fields:
+                result['debug'] = message_data.debug
+
+        return result
+
+    _columns = {
+        'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
+    }
+
+    def save_to_drafts(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        email_id = self.save_to_mailbox(cr, uid, ids, context=context)
+        self.pool.get('email.message').write(cr, uid, email_id, {'folder':'drafts', 'state': 'draft'}, context)
+        return {}
+
+    def send_mail(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        email_id = self.save_to_mailbox(cr, uid, ids, context)
+        return {}
+
+    def save_to_mailbox(self, cr, uid, ids, context=None):
+        email_ids = []
+        email_message_pool = self.pool.get('email.message')
+        attachment = []
+        for mail in self.browse(cr, uid, ids, context=context):
+            for attach in mail.attachment_ids:
+                attachment.append((attach.datas_fname, attach.datas))
+            email_id = email_message_pool.email_send(cr, uid, mail.email_from, mail.email_to, mail.name, mail.description,
+                    model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to,
+                    attach=attachment, message_id=mail.message_id, openobject_id=mail.res_id, debug=mail.debug,
+                    subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context)
+            email_ids.append(email_id)
+        return email_ids
+
+email_message_wizard_send()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/emails/wizard/email_message_wizard_send_view.xml b/addons/emails/wizard/email_message_wizard_send_view.xml
new file mode 100644
index 00000000000..6847e64a295
--- /dev/null
+++ b/addons/emails/wizard/email_message_wizard_send_view.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <record model="ir.ui.view" id="email_message_wizard_send_form">
+            <field name="name">email.message.wizard_send.form</field>
+            <field name="model">email.message.wizard_send</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reply Email">
+                    <group col="6" colspan="4">
+                        <field name="smtp_server_id" widget="selection" colspan="4"/>
+                        <field name="email_from" colspan="4" required="1"/>
+                        <field name="email_to" colspan="4" required="1"/>
+                        <field name="email_cc" colspan="4"/>
+                        <field name="email_bcc" colspan="4"/>
+                        <field name="name" colspan="4" widget="char" size="512"/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <notebook colspan="4">
+                        <page string="Body">
+                            <field name="description" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Attachments">
+                            <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
+                            <field name="attachment_ids" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <group col="4" colspan="4">
+                        <label string="" colspan="1"/>
+                        <button icon="gtk-close" special="cancel" string="Close"/>
+                        <button icon="gtk-apply" name="save_to_drafts" string="Save in Drafts" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+
+        <record id="action_email_message_wizard_send" model="ir.actions.act_window">
+            <field name="name">Send E-mail</field>
+            <field name="res_model">email.message.wizard_send</field>
+            <field name="src_model">email.message.wizard_send</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'message_id':active_id}</field>
+        </record>
+
+	</data>
+</openerp>

From 8eb8fa47ca23c5f4837c690b935213b9d84da57f Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 11:11:50 +0530
Subject: [PATCH 05/27] [IMP] emails:- improve reply message text in
 default_get method.

bzr revid: ysa@tinyerp.com-20110218054150-xvs6s4dgh2e1kq25
---
 addons/emails/wizard/email_message_wizard_send.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
index 7dfc008db1d..d9155d722cd 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -70,8 +70,13 @@ class email_message_wizard_send(osv.osv_memory):
                 result['name'] = "Re : " + message_data.name
 
             if 'description' in fields:
-                result['description'] = "On %s %s  wrote :- \n >\t %s " %(str(message_data.date) ,
-                            message_data.email_from , message_data.description and message_data.description.replace('\n', "\n > \t") or '')
+                header = '-------- Original Message --------'
+                sender = 'From: %s'  % (message_data.email_from or '')
+                email_to = 'To: %s' %  (message_data.email_to or '')
+                sentdate = 'Date: %s' % message_data.date
+                desc = '\n > \t %s' % (message_data.description and message_data.description.replace('\n', "\n > \t") or '')
+                original = [header, sender, email_to, sentdate, desc]
+                result['description'] = '\n'.join(original)
 
             if 'reply_to' in fields:
                 result['reply_to'] = message_data.reply_to

From 7065eebae3163926e082d0dd3449ac9e6e503d67 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 12:28:33 +0530
Subject: [PATCH 06/27] [IMP] emails:- default value exist in context then
 first set default value using context otherwise read message and set default
 value in email.message.send.wizard.

bzr revid: ysa@tinyerp.com-20110218065833-p8twmz26p1tv4j5o
---
 .../wizard/email_message_wizard_send.py       | 95 ++++++++++---------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
index d9155d722cd..130103d3854 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 import netsvc
 from tools.translate import _
+import tools
 
 class email_message_wizard_send(osv.osv_memory):
     _name = 'email.message.wizard_send'
@@ -36,74 +37,76 @@ class email_message_wizard_send(osv.osv_memory):
 
         model_pool = self.pool.get('ir.model')
         message_id = context.get('message_id', False)
+        message_data = None
         if message_id:
             message_data = message_pool.browse(cr, uid, message_id, context)
 
-            if 'template_id' in fields:
-                result['template_id'] = message_data.template_id and message_data.template_id.id or False
+        if 'template_id' in fields:
+            result['template_id'] = context.get('default_template_id',False) or (message_data and message_data.template_id and message_data.template_id.id or False)
 
-            if 'smtp_server_id' in fields:
-                result['smtp_server_id'] = message_data.smtp_server_id and message_data.smtp_server_id.id or False
+        if 'smtp_server_id' in fields:
+            result['smtp_server_id'] = context.get('default_smtp_server_id',False) or (message_data and message_data.smtp_server_id and message_data.smtp_server_id.id or False)
 
-            if 'message_id' in fields:
-                result['message_id'] = message_data.message_id
+        if 'message_id' in fields:
+            result['message_id'] =  context.get('default_message_id','') or (message_data and message_data.message_id)
 
-            if 'attachment_ids' in fields:
-                result['attachment_ids'] = message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids']
+        if 'attachment_ids' in fields:
+            result['attachment_ids'] =  context.get('default_attachment_ids',[]) or (message_data and message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids'])
 
-            if 'res_id' in fields:
-                result['res_id'] = message_data.res_id
+        if 'res_id' in fields:
+            result['res_id'] =  context.get('default_res_id',0) or (message_data and message_data.res_id)
 
-            if 'email_from' in fields:
-                result['email_from'] = message_data.email_from
+        if 'email_from' in fields:
+            result['email_from'] =  context.get('default_email_from','') or (message_data and message_data.email_from)
 
-            if 'email_to' in fields:
-                result['email_to'] = message_data.email_to
+        if 'email_to' in fields:
+            result['email_to'] =  context.get('default_email_to','') or (message_data and message_data.email_to)
 
-            if 'email_cc' in fields:
-                result['email_cc'] = message_data.email_cc
+        if 'email_cc' in fields:
+            result['email_cc'] =  context.get('default_email_cc', '') or (message_data and message_data.email_cc)
 
-            if 'email_bcc' in fields:
-                result['email_bcc'] = message_data.email_bcc
+        if 'email_bcc' in fields:
+            result['email_bcc'] =  context.get('default_email_bcc', '') or (message_data and message_data.email_bcc)
 
-            if 'name' in fields:
-                result['name'] = "Re : " + message_data.name
+        if 'name' in fields:
+            result['name'] = "Re : " +  tools.ustr(context.get('default_name', '') or (message_data and message_data.name))
 
-            if 'description' in fields:
-                header = '-------- Original Message --------'
-                sender = 'From: %s'  % (message_data.email_from or '')
-                email_to = 'To: %s' %  (message_data.email_to or '')
-                sentdate = 'Date: %s' % message_data.date
-                desc = '\n > \t %s' % (message_data.description and message_data.description.replace('\n', "\n > \t") or '')
-                original = [header, sender, email_to, sentdate, desc]
-                result['description'] = '\n'.join(original)
+        if 'description' in fields:
+            description =  context.get('default_description', '') or (message_data and message_data.description and message_data.description or '')
+            header = '-------- Original Message --------'
+            sender = 'From: %s'  % tools.ustr(message_data.email_from or '')
+            email_to = 'To: %s' %  tools.ustr(message_data.email_to or '')
+            sentdate = 'Date: %s' % message_data.date
+            desc = '\n > \t %s' % tools.ustr(description.replace('\n', "\n > \t") or '')
+            original = [header, sender, email_to, sentdate, desc]
+            result['description'] = '\n'.join(original)
 
-            if 'reply_to' in fields:
-                result['reply_to'] = message_data.reply_to
+        if 'reply_to' in fields:
+            result['reply_to'] = context.get('default_reply_to', '') or (message_data and message_data.reply_to)
 
-            if 'model' in fields:
-                result['model'] = message_data.model
+        if 'model' in fields:
+            result['model'] = context.get('default_model', '') or (message_data and message_data.model)
 
-            if 'user_id' in fields:
-                result['user_id'] = message_data.user_id and message_data.user_id.id or False
+        if 'user_id' in fields:
+            result['user_id'] = context.get('default_user_id', False) or (message_data and message_data.user_id and message_data.user_id.id or False)
 
-            if 'references' in fields:
-                result['references'] = message_data.references
+        if 'references' in fields:
+            result['references'] = tools.ustr(context.get('default_references', '') or (message_data and message_data.references))
 
-            if 'sub_type' in fields:
-                result['sub_type'] = message_data.sub_type
+        if 'sub_type' in fields:
+            result['sub_type'] = context.get('default_sub_type') or (message_data and message_data.sub_type)
 
-            if 'headers' in fields:
-                result['headers'] = message_data.headers
+        if 'headers' in fields:
+            result['headers'] = context.get('default_headers', {}) or (message_data and message_data.headers)
 
-            if 'priority' in fields:
-                result['priority'] = message_data.priority
+        if 'priority' in fields:
+            result['priority'] = context.get('default_priority') or (message_data and message_data.priority)
 
-            if 'partner_id' in fields:
-                result['partner_id'] = message_data.partner_id and message_data.partner_id.id or False
+        if 'partner_id' in fields:
+            result['partner_id'] = context.get('default_partner_id', False) or (message_data and message_data.partner_id and message_data.partner_id.id or False)
 
-            if 'debug' in fields:
-                result['debug'] = message_data.debug
+        if 'debug' in fields:
+            result['debug'] = context.get('default_debug', False) or (message_data and message_data.debug)
 
         return result
 

From f4ff6da00e330350844459e6eda667367d48c645 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 15:57:48 +0530
Subject: [PATCH 07/27] [IMP] emails :- improve default value of
 email.message.send wizard. crm :- call email.message.send wizard of emails
 module instead of crm module wizard

bzr revid: ysa@tinyerp.com-20110218102748-8x7kaztiadm52h0n
---
 addons/crm/crm_lead.py                        |  31 ++++++
 addons/crm/crm_lead_view.xml                  |  18 +--
 addons/emails/email_view.xml                  |   5 +-
 .../wizard/email_message_wizard_send.py       | 103 +++++++++---------
 .../wizard/email_message_wizard_send_view.xml |   3 +-
 5 files changed, 97 insertions(+), 63 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 60e2f447c0d..b463e379a6e 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -288,6 +288,37 @@ class crm_lead(crm_case, osv.osv):
                         }
         return value
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for lead in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'model': 'crm.lead',
+                    'default_name': lead.name,
+                    'default_email_to': lead.email_from,
+                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
+                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context = {}
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f5e960dc0d4..ecbb09c6fc5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -13,8 +13,8 @@
         <field name="context">{'type':'lead'}</field>
         <field name="help">Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle.</field>
     </record>
-    
-   
+
+
 
      <menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"
@@ -170,8 +170,8 @@
                             <field name="history" invisible="1"/>
                             <button
                                 string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                name="%(emails.action_email_message_wizard_send)d"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
                                 icon="terp-mail-replied" type="action" />
                         </tree>
                         <form string="Communication history">
@@ -189,8 +189,8 @@
                                         <field name="description" colspan="4" nolabel="1" height="250"/>
                                         <button colspan="4"
                                             string="Reply"
-                                            name="%(crm.action_crm_send_mail)d"
-                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                            name="%(emails.action_email_message_wizard_send)d"
+                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
                                             icon="terp-mail-replied" type="action" />
                                     </group>
                                     <group attrs="{'invisible': [('history', '=', True)]}">
@@ -208,9 +208,9 @@
                         context="{'model': 'crm.lead' }"
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
-                        name="%(crm.action_crm_send_mail)d"
-                        context="{'mail':'new', 'model': 'crm.lead'}"
-                        icon="terp-mail-message-new" type="action" />
+                        name="action_send_email"
+                        context="{'mail':'new', 'model': 'crm.lead', 'rec_id' : active_id}"
+                        icon="terp-mail-message-new" type="object" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index 929c96626e1..585118f149d 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -31,10 +31,11 @@
                                 <separator string="Message Details" colspan="4"/>
                                 <field name="model" readonly="1"/>
                                 <group col="3" colspan="2">
-                                    <field name="res_id"  readonly="1"/>
+                                    <field name="res_id" readonly="1"/>
                                     <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
 	                                <field name="message_id"/>
-	                                <button name="%(action_email_message_wizard_send)d" string="Reply" type="action" icon="terp-mail-replied"/>
+	                                <button name="%(action_email_message_wizard_send)d" string="Reply" type="action" icon="terp-mail-replied"
+	                                context="{'mail':'reply', 'message_id':active_id}"/>
                                 </group>
                             </group>
                             <separator string="Description" colspan="4"/>
diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
index 130103d3854..dfd310732c3 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -37,76 +37,79 @@ class email_message_wizard_send(osv.osv_memory):
 
         model_pool = self.pool.get('ir.model')
         message_id = context.get('message_id', False)
-        message_data = None
+        message_data = False
         if message_id:
-            message_data = message_pool.browse(cr, uid, message_id, context)
+            message_data = message_pool.browse(cr, uid, int(message_id), context)
+            if 'template_id' in fields:
+                result['template_id'] = message_data and message_data.template_id and message_data.template_id.id or False
 
-        if 'template_id' in fields:
-            result['template_id'] = context.get('default_template_id',False) or (message_data and message_data.template_id and message_data.template_id.id or False)
+            if 'smtp_server_id' in fields:
+                result['smtp_server_id'] = message_data and message_data.smtp_server_id and message_data.smtp_server_id.id or False
 
-        if 'smtp_server_id' in fields:
-            result['smtp_server_id'] = context.get('default_smtp_server_id',False) or (message_data and message_data.smtp_server_id and message_data.smtp_server_id.id or False)
+            if 'message_id' in fields:
+                result['message_id'] =  message_data and message_data.message_id
 
-        if 'message_id' in fields:
-            result['message_id'] =  context.get('default_message_id','') or (message_data and message_data.message_id)
+            if 'attachment_ids' in fields:
+                result['attachment_ids'] = message_data and message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids']
 
-        if 'attachment_ids' in fields:
-            result['attachment_ids'] =  context.get('default_attachment_ids',[]) or (message_data and message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids'])
+            if 'res_id' in fields:
+                result['res_id'] = message_data and message_data.res_id
 
-        if 'res_id' in fields:
-            result['res_id'] =  context.get('default_res_id',0) or (message_data and message_data.res_id)
+            if 'email_from' in fields:
+                result['email_from'] = message_data and message_data.email_from
 
-        if 'email_from' in fields:
-            result['email_from'] =  context.get('default_email_from','') or (message_data and message_data.email_from)
+            if 'email_to' in fields:
+                result['email_to'] = message_data and message_data.email_to
 
-        if 'email_to' in fields:
-            result['email_to'] =  context.get('default_email_to','') or (message_data and message_data.email_to)
+            if 'email_cc' in fields:
+                result['email_cc'] = message_data and message_data.email_cc
 
-        if 'email_cc' in fields:
-            result['email_cc'] =  context.get('default_email_cc', '') or (message_data and message_data.email_cc)
+            if 'email_bcc' in fields:
+                result['email_bcc'] = message_data and message_data.email_bcc
 
-        if 'email_bcc' in fields:
-            result['email_bcc'] =  context.get('default_email_bcc', '') or (message_data and message_data.email_bcc)
+            if 'name' in fields:
+                result['name']  = tools.ustr(message_data and message_data.name or '')
+                if context.get('mail','') == 'reply':
+                    result['name'] = "Re :- " + result['name']
 
-        if 'name' in fields:
-            result['name'] = "Re : " +  tools.ustr(context.get('default_name', '') or (message_data and message_data.name))
+            if 'description' in fields:
+                description =  message_data and message_data.description and message_data.description or ''
+                if context.get('mail','') == 'reply':
+                    header = '-------- Original Message --------'
+                    sender = 'From: %s'  % tools.ustr(message_data.email_from or '')
+                    email_to = 'To: %s' %  tools.ustr(message_data.email_to or '')
+                    sentdate = 'Date: %s' % message_data.date
+                    desc = '\n > \t %s' % tools.ustr(description.replace('\n', "\n > \t") or '')
+                    result['description'] = '\n'.join([header, sender, email_to, sentdate, desc])
+                else:
+                    result['description'] = description
 
-        if 'description' in fields:
-            description =  context.get('default_description', '') or (message_data and message_data.description and message_data.description or '')
-            header = '-------- Original Message --------'
-            sender = 'From: %s'  % tools.ustr(message_data.email_from or '')
-            email_to = 'To: %s' %  tools.ustr(message_data.email_to or '')
-            sentdate = 'Date: %s' % message_data.date
-            desc = '\n > \t %s' % tools.ustr(description.replace('\n', "\n > \t") or '')
-            original = [header, sender, email_to, sentdate, desc]
-            result['description'] = '\n'.join(original)
+            if 'reply_to' in fields:
+                result['reply_to'] = message_data and message_data.reply_to
 
-        if 'reply_to' in fields:
-            result['reply_to'] = context.get('default_reply_to', '') or (message_data and message_data.reply_to)
+            if 'model' in fields:
+                result['model'] = message_data and message_data.model
 
-        if 'model' in fields:
-            result['model'] = context.get('default_model', '') or (message_data and message_data.model)
+            if 'user_id' in fields:
+                result['user_id'] = message_data and message_data.user_id and message_data.user_id.id or False
 
-        if 'user_id' in fields:
-            result['user_id'] = context.get('default_user_id', False) or (message_data and message_data.user_id and message_data.user_id.id or False)
+            if 'references' in fields:
+                result['references'] = tools.ustr(message_data and message_data.references)
 
-        if 'references' in fields:
-            result['references'] = tools.ustr(context.get('default_references', '') or (message_data and message_data.references))
+            if 'sub_type' in fields:
+                result['sub_type'] = message_data and message_data.sub_type
 
-        if 'sub_type' in fields:
-            result['sub_type'] = context.get('default_sub_type') or (message_data and message_data.sub_type)
+            if 'headers' in fields:
+                result['headers'] = message_data and message_data.headers
 
-        if 'headers' in fields:
-            result['headers'] = context.get('default_headers', {}) or (message_data and message_data.headers)
+            if 'priority' in fields:
+                result['priority'] = message_data and message_data.priority
 
-        if 'priority' in fields:
-            result['priority'] = context.get('default_priority') or (message_data and message_data.priority)
+            if 'partner_id' in fields:
+                result['partner_id'] = message_data and message_data.partner_id and message_data.partner_id.id or False
 
-        if 'partner_id' in fields:
-            result['partner_id'] = context.get('default_partner_id', False) or (message_data and message_data.partner_id and message_data.partner_id.id or False)
-
-        if 'debug' in fields:
-            result['debug'] = context.get('default_debug', False) or (message_data and message_data.debug)
+            if 'debug' in fields:
+                result['debug'] = message_data and message_data.debug
 
         return result
 
diff --git a/addons/emails/wizard/email_message_wizard_send_view.xml b/addons/emails/wizard/email_message_wizard_send_view.xml
index 6847e64a295..f599939fd9d 100644
--- a/addons/emails/wizard/email_message_wizard_send_view.xml
+++ b/addons/emails/wizard/email_message_wizard_send_view.xml
@@ -36,7 +36,6 @@
             </field>
         </record>
 
-
         <record id="action_email_message_wizard_send" model="ir.actions.act_window">
             <field name="name">Send E-mail</field>
             <field name="res_model">email.message.wizard_send</field>
@@ -45,7 +44,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'message_id':active_id}</field>
+            <field name="context">{'message_id':active_id, 'mail':'reply'}</field>
         </record>
 
 	</data>

From de37cd5b35ee4d4bb1d4a038389342c6fd6afd29 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 16:16:00 +0530
Subject: [PATCH 08/27] [IMP] crm :- call email.message.send.wizard in
 oprtunity instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218104600-e7ma1jrlvjvpbz4m
---
 addons/crm/crm_lead_view.xml        |  5 ++---
 addons/crm/crm_opportunity_view.xml | 32 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ecbb09c6fc5..e95ac3fb7a5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -187,11 +187,10 @@
                                 <page string="Details">
                                     <group attrs="{'invisible': [('history', '!=', True)]}">
                                         <field name="description" colspan="4" nolabel="1" height="250"/>
-                                        <button colspan="4"
-                                            string="Reply"
+                                        <button colspan="4" string="Reply"
                                             name="%(emails.action_email_message_wizard_send)d"
                                             context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
-                                            icon="terp-mail-replied" type="action" />
+                                            icon="terp-mail-replied" type="action"/>
                                     </group>
                                     <group attrs="{'invisible': [('history', '=', True)]}">
                                         <field name="display_text" colspan="4" nolabel="1"  height="250"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index ee41e865b2d..993070d31c4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
     <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
         <field name="name">Stages</field>
         <field name="res_model">crm.case.stage</field>
@@ -11,13 +11,13 @@
         <field name="context">{'type':'opportunity'}</field>
         <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle.</field>
     </record>
-    
+
 
 
      <menuitem action="crm_opportunity_stage_act" id="menu_crm_opportunity_stage_act" name="Stages"
         groups="base.group_extended" sequence="0"
         parent="base.menu_crm_config_opportunity" />
-        
+
         <!-- Opportunities Form View -->
             <record model="ir.ui.view" id="crm_case_form_view_oppor">
                 <field name="name">Opportunities</field>
@@ -154,11 +154,10 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+                                    <button string="Reply"
+                                        name="%(emails.action_email_message_wizard_send)d"
+                                        context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
+                                        icon="terp-mail-replied" type="action"/>
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -173,11 +172,10 @@
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -193,10 +191,10 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="action_send_email"
+		                        context="{'mail':'new', 'model': 'crm.lead', 'rec_id' : active_id}"
+		                        icon="terp-mail-message-new" type="object" />
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">

From c3c9ce4621d508e2973964e60ddd6eec5e3242b3 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 16:47:36 +0530
Subject: [PATCH 09/27] [IMP] crm_claim :- call email.message.send.wizard in
 oprtunity instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218111736-csyf3cgc51biy8az
---
 addons/crm/crm_lead_view.xml        |  2 +-
 addons/crm_claim/crm_claim.py       | 32 +++++++++++++++++++++++
 addons/crm_claim/crm_claim_view.xml | 39 ++++++++++++++---------------
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e95ac3fb7a5..d95b79139a6 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -209,7 +209,7 @@
                     <button string="Send New Email"
                         name="action_send_email"
                         context="{'mail':'new', 'model': 'crm.lead', 'rec_id' : active_id}"
-                        icon="terp-mail-message-new" type="object" />
+                        icon="terp-mail-message-new" type="object"/>
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 66ba0d93248..3626a843545 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,6 +22,7 @@
 from osv import fields, osv
 from crm import crm
 import time
+import tools
 
 class crm_claim(crm.crm_case, osv.osv):
     """
@@ -99,6 +100,37 @@ class crm_claim(crm.crm_case, osv.osv):
         #'stage_id': _get_stage_id,
     }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for data in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'model': 'crm.lead',
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'default_reply_to': data.section_id and data.section_id.reply_to or False,
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
         @param self: The object pointer
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 696c8ed3a84..a8e8f017561 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -33,7 +33,7 @@
             <field name="context">{'type':'claim'}</field>
             <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
-        
+
          <menuitem action="crm_claim_stage_act" name="Stages"
                 id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
@@ -75,15 +75,15 @@
                     <group>
                         <field name="name" />
                         <field name="date"/>
-                        
-                        
+
+
                     </group>
-                    
+
                     <group colspan="4" col="6">
-                        
+
                         <field name="user_id"/>
                         <field name="section_id" widget="selection" />
-                        
+
                         <group colspan="2" col="4">
                             <field name="stage_id" domain="[('type','=','claim')]"/>
                             <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
@@ -164,11 +164,11 @@
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                     <tree string="History">
                                         <field name="display_text" string="History Information"/>
-                                        <button
-                                            string="Reply"
-                                            name="%(crm.action_crm_send_mail)d"
-                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
-                                            icon="terp-mail-replied" type="action" attrs="{'invisible': [('history', '!=', True)]}" />
+			                            <button
+			                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+			                                name="%(emails.action_email_message_wizard_send)d"
+			                                context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True, 'message_id':active_id}"
+			                                icon="terp-mail-replied" type="action" />
                                     </tree>
                                     <form string="Communication &amp; History">
                                         <group col="4" colspan="4">
@@ -183,11 +183,10 @@
                                             <page string="Details">
                                                 <group attrs="{'invisible': [('history', '!=', True)]}">
                                                     <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                    <button colspan="4"
-                                                        string="Reply"
-                                                        name="%(crm.action_crm_send_mail)d"
-                                                        context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
-                                                        icon="terp-mail-replied" type="action" />
+			                                        <button colspan="4" string="Reply"
+			                                            name="%(emails.action_email_message_wizard_send)d"
+			                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True, 'message_id':active_id}"
+			                                            icon="terp-mail-replied" type="action"/>
                                                 </group>
                                                 <group attrs="{'invisible': [('history', '=', True)]}">
                                                     <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -203,10 +202,10 @@
                                     name="%(crm.action_crm_add_note)d"
                                     context="{'model': 'crm.lead' }"
                                     icon="terp-document-new" type="action" />
-                                <button string="Send New Email"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'new', 'model': 'crm.claim'}"
-                                    icon="terp-mail-message-new" type="action" />
+			                    <button string="Send New Email"
+			                        name="action_send_email"
+			                        context="{'mail':'new', 'model': 'crm.claim', 'rec_id' : active_id}"
+			                        icon="terp-mail-message-new" type="object"/>
                             </page>
                         </notebook>
                     </group>

From dceabef2acb6ddf4744d8f42841a1abf731a3c11 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 16:53:34 +0530
Subject: [PATCH 10/27] [IMP] crm_fundraising :- call email.message.send.wizard
 in oprtunity instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218112334-90fu3nuz9i9ryvbd
---
 addons/crm_fundraising/crm_fundraising.py     | 32 +++++++++++++++++++
 .../crm_fundraising/crm_fundraising_view.xml  | 29 ++++++++---------
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index ad14cecb1f6..89881b21d98 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from crm import crm
+import tools
 
 class crm_fundraising(crm.crm_case, osv.osv):
     """ Fund Raising Cases """
@@ -93,6 +94,37 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'planned_revenue': lambda *a:0.0,
             }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for lead in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'model': 'crm.lead',
+                    'default_name': lead.name,
+                    'default_email_to': lead.email_from,
+                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
+                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
 crm_fundraising()
 
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 8c704347c67..fde8905f5b3 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -33,7 +33,7 @@
             <field name="context">{'type':'fundraising'}</field>
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>
-        
+
 
 
          <menuitem action="crm_fundraising_stage_act"
@@ -148,11 +148,11 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+		                            <button
+		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+		                                name="%(emails.action_email_message_wizard_send)d"
+		                                context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True, 'message_id':active_id}"
+		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -167,11 +167,10 @@
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True, 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -187,10 +186,10 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.fundraising'}"
-                                icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="action_send_email"
+		                        context="{'mail':'new', 'model': 'crm.fundraising', 'rec_id' : active_id}"
+		                        icon="terp-mail-message-new" type="object"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">

From 3e1b8764eb998c7224e1c76947ca9c0907b764ea Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 16:58:50 +0530
Subject: [PATCH 11/27] [IMP] crm_helpdesk :- call email.message.send.wizard in
 oprtunity instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218112850-k9bpkg9v7rceixq7
---
 addons/crm_helpdesk/crm_helpdesk.py       | 32 +++++++++++++++++++++++
 addons/crm_helpdesk/crm_helpdesk_view.xml | 27 +++++++++----------
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 6a51303761a..adf6bc1d2a6 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -22,6 +22,7 @@
 from crm import crm
 from osv import fields, osv
 import time
+import tools
 
 class crm_helpdesk(crm.crm_case, osv.osv):
     """ Helpdesk Cases """
@@ -86,6 +87,37 @@ class crm_helpdesk(crm.crm_case, osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for lead in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'model': 'crm.lead',
+                    'default_name': lead.name,
+                    'default_email_to': lead.email_from,
+                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
+                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
 crm_helpdesk()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index fe2f727c248..02635b07097 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -100,11 +100,11 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+		                            <button
+		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+		                                name="%(emails.action_email_message_wizard_send)d"
+		                                context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True, 'message_id':active_id}"
+		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -119,11 +119,10 @@
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True, 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                              </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -139,10 +138,10 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                                icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="action_send_email"
+		                        context="{'mail':'new', 'model': 'crm.helpdesk', 'rec_id' : active_id}"
+		                        icon="terp-mail-message-new" type="object"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group colspan="2" col="2">

From 425d9b087790759a08bf982a16503673b71c3d24 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 17:09:14 +0530
Subject: [PATCH 12/27] [IMP] event :- call email.message.send.wizard in
 oprtunity instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218113914-z1og0kj6yxz0wvxm
---
 addons/event/event.py       | 32 ++++++++++++++++++++++++++++++++
 addons/event/event_view.xml | 29 ++++++++++++++---------------
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index bf5336ad6bc..68414f7d0f7 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -25,6 +25,7 @@ from crm import crm
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+import tools
 
 class event_type(osv.osv):
     """ Event Type """
@@ -334,6 +335,37 @@ class event_registration(osv.osv):
         'user_id': lambda self, cr, uid, ctx: uid,
     }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for lead in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'model': 'crm.lead',
+                    'default_name': lead.name,
+                    'default_email_to': lead.email_from,
+                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
+                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
     def _make_invoice(self, cr, uid, reg, lines, context=None):
         """ Create Invoice from Invoice lines
         @param reg: Model of Event Registration
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c91d279021b..d29db1bd800 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -391,11 +391,11 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+		                            <button
+		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+		                                name="%(emails.action_email_message_wizard_send)d"
+		                                context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True, 'message_id':active_id}"
+		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -410,11 +410,10 @@
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True, 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -426,14 +425,14 @@
                                     </notebook>
                                 </form>
                             </field>
-                             <button string="Add Internal Note"
+                            <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                              <button string="Send New Email"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'new', 'model': 'event.registration'}"
-                                icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="action_send_email"
+		                        context="{'mail':'new', 'model': 'event.registration', 'rec_id' : active_id}"
+		                        icon="terp-mail-message-new" type="object"/>
                            </page>
                     </notebook>
                 </form>

From 107467047ca16cc7682631eff18c97a19b2291dd Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 17:21:20 +0530
Subject: [PATCH 13/27] [IMP] imporve action_send_mail method in related
 module. hr_recruitment :- call email.message.send.wizard in oprtunity instead
 of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218115120-flg9m13lady8yk40
---
 addons/crm/crm_lead.py                        | 17 +++++-----
 addons/crm_claim/crm_claim.py                 |  5 +--
 addons/crm_fundraising/crm_fundraising.py     | 17 +++++-----
 addons/crm_helpdesk/crm_helpdesk.py           | 17 +++++-----
 addons/event/event.py                         | 17 +++++-----
 addons/hr_recruitment/hr_recruitment.py       | 32 +++++++++++++++++++
 addons/hr_recruitment/hr_recruitment_view.xml | 29 ++++++++---------
 7 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b463e379a6e..c45a18b7ddc 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -294,19 +294,20 @@ class crm_lead(crm_case, osv.osv):
         """
         if context is None:
             context = {}
-        for lead in self.browse(cr, uid ,ids, context):
+        for data in self.browse(cr, uid ,ids, context):
             context.update({
                     'mail':'new',
-                    'model': 'crm.lead',
-                    'default_name': lead.name,
-                    'default_email_to': lead.email_from,
-                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
-                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
                     'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
                     'default_res_id': context.get('rec_id',0)
                 })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
         result = {
                 'view_type': 'form',
                 'view_mode': 'form',
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 3626a843545..e33582e6659 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -109,16 +109,17 @@ class crm_claim(crm.crm_case, osv.osv):
         for data in self.browse(cr, uid ,ids, context):
             context.update({
                     'mail':'new',
-                    'model': 'crm.lead',
                     'default_name': data.name,
                     'default_email_to': data.email_from,
                     'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
                     'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_reply_to': data.section_id and data.section_id.reply_to or False,
                     'default_model': context.get('model',''),
                     'default_email_cc': tools.ustr(data.email_cc or ''),
                     'default_res_id': context.get('rec_id',0)
                 })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
         result = {
                 'view_type': 'form',
                 'view_mode': 'form',
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 89881b21d98..c13089b07a6 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -100,19 +100,20 @@ class crm_fundraising(crm.crm_case, osv.osv):
         """
         if context is None:
             context = {}
-        for lead in self.browse(cr, uid ,ids, context):
+        for data in self.browse(cr, uid ,ids, context):
             context.update({
                     'mail':'new',
-                    'model': 'crm.lead',
-                    'default_name': lead.name,
-                    'default_email_to': lead.email_from,
-                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
-                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
                     'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
                     'default_res_id': context.get('rec_id',0)
                 })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
         result = {
                 'view_type': 'form',
                 'view_mode': 'form',
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index adf6bc1d2a6..3d31c6b241f 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -93,19 +93,20 @@ class crm_helpdesk(crm.crm_case, osv.osv):
         """
         if context is None:
             context = {}
-        for lead in self.browse(cr, uid ,ids, context):
+        for data in self.browse(cr, uid ,ids, context):
             context.update({
                     'mail':'new',
-                    'model': 'crm.lead',
-                    'default_name': lead.name,
-                    'default_email_to': lead.email_from,
-                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
-                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
                     'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
                     'default_res_id': context.get('rec_id',0)
                 })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
         result = {
                 'view_type': 'form',
                 'view_mode': 'form',
diff --git a/addons/event/event.py b/addons/event/event.py
index 68414f7d0f7..b47b9eb7690 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -341,19 +341,20 @@ class event_registration(osv.osv):
         """
         if context is None:
             context = {}
-        for lead in self.browse(cr, uid ,ids, context):
+        for data in self.browse(cr, uid ,ids, context):
             context.update({
                     'mail':'new',
-                    'model': 'crm.lead',
-                    'default_name': lead.name,
-                    'default_email_to': lead.email_from,
-                    'default_email_from': lead.user_id and lead.user_id.address_id and lead.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(lead.user_id.signature or '')),
-                    'default_reply_to': lead.section_id and lead.section_id.reply_to or False,
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
                     'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(lead.email_cc or ''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
                     'default_res_id': context.get('rec_id',0)
                 })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
         result = {
                 'view_type': 'form',
                 'view_mode': 'form',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 27e6b468682..4eb4fe16995 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -176,6 +176,38 @@ class hr_applicant(crm.crm_case, osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for data in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
     def onchange_job(self,cr, uid, ids, job, context=None):
         result = {}
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3738a1d8be6..b0c320468df 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,11 +145,11 @@
                             <tree string="History">
                                 <field name="display_text" string="History Information"/>
                                 <field name="history" invisible="1"/>
-                                <button
-                                    string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                    name="%(crm.action_crm_send_mail)d"
-                                    context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
-                                    icon="terp-mail-replied" type="action" />
+	                            <button
+	                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+	                                name="%(emails.action_email_message_wizard_send)d"
+	                                context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True, 'message_id':active_id}"
+	                                icon="terp-mail-replied" type="action" />
                             </tree>
                             <form string="History">
                                 <group col="4" colspan="4">
@@ -164,11 +164,10 @@
                                     <page string="Details">
                                         <group attrs="{'invisible': [('history', '!=', True)]}">
                                             <field name="description" colspan="4" nolabel="1" height="250"/>
-                                            <button colspan="4"
-                                                string="Reply"
-                                                name="%(crm.action_crm_send_mail)d"
-                                                context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
-                                                icon="terp-mail-replied" type="action" />
+	                                        <button colspan="4" string="Reply"
+	                                            name="%(emails.action_email_message_wizard_send)d"
+	                                            context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True, 'message_id':active_id}"
+	                                            icon="terp-mail-replied" type="action"/>
                                         </group>
                                         <group attrs="{'invisible': [('history', '=', True)]}">
                                             <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -180,14 +179,14 @@
                                 </notebook>
                             </form>
                         </field>
-                         <button string="Add Internal Note"
+                        <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                        <button string="Send New Email"
-                           name="%(crm.action_crm_send_mail)d"
-                           context="{'mail':'new', 'model': 'hr.applicant'}"
-                           icon="terp-mail-message-new" type="action" />
+	                    <button string="Send New Email"
+	                        name="action_send_email"
+	                        context="{'mail':'new', 'model': 'hr.applicant', 'rec_id' : active_id}"
+	                        icon="terp-mail-message-new" type="object"/>
                  </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>

From b086aadd1ea4a6163d927cb51ba51ef95ebc4aab Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 17:26:56 +0530
Subject: [PATCH 14/27] [IMP] project_issue :- call email.message.send.wizard
 in oprtunity instead of crm.send.mail wizard.

bzr revid: ysa@tinyerp.com-20110218115656-off7dhkdo0n5sh71
---
 addons/project_issue/project_issue.py       | 32 +++++++++++++++++++++
 addons/project_issue/project_issue_view.xml | 27 +++++++++--------
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 9e82eb01556..227ba4f617d 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -243,6 +243,38 @@ class project_issue(crm.crm_case, osv.osv):
         'project_id':_get_project,
     }
 
+    def action_send_email(self, cr, uid, ids, context=None):
+        """
+            Open Send email wizard.
+        """
+        if context is None:
+            context = {}
+        for data in self.browse(cr, uid ,ids, context):
+            context.update({
+                    'mail':'new',
+                    'default_name': data.name,
+                    'default_email_to': data.email_from,
+                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
+                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
+                    'default_model': context.get('model',''),
+                    'default_email_cc': tools.ustr(data.email_cc or ''),
+                    'default_res_id': context.get('rec_id',0)
+                })
+            if hasattr(data, 'section_id'):
+                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
+
+        result = {
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'email.message.wizard_send',
+                'view_id': False,
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True
+                }
+        return result
+
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 23a361b0ff9..c17002d969d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -101,11 +101,11 @@
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                        name="%(crm.action_crm_send_mail)d"
-                                        context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                        icon="terp-mail-replied" type="action" />
+		                            <button
+		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+		                                name="%(emails.action_email_message_wizard_send)d"
+		                                context="{'mail':'reply', 'model': 'crm.lead', 'project.issue' : True, 'message_id':active_id}"
+		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
                                     <group col="4" colspan="4">
@@ -120,11 +120,10 @@
                                         <page string="Details">
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
-                                                <button colspan="4"
-                                                    string="Reply"
-                                                    name="%(crm.action_crm_send_mail)d"
-                                                    context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                                    icon="terp-mail-replied" type="action" />
+		                                        <button colspan="4" string="Reply"
+		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True, 'message_id':active_id}"
+		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
                                                 <field name="display_text" colspan="4" nolabel="1"  height="250"/>
@@ -141,10 +140,10 @@
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
-                            <button string="Send New Email"
-                               name="%(crm.action_crm_send_mail)d"
-                               context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="terp-mail-message-new" type="action" />
+		                    <button string="Send New Email"
+		                        name="action_send_email"
+		                        context="{'mail':'new', 'model': 'project.issue', 'rec_id' : active_id}"
+		                        icon="terp-mail-message-new" type="object"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">

From d1dcd5a16f5b716b6fe7f014cf028ec6b8c86c94 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 18:15:09 +0530
Subject: [PATCH 15/27] [IMP] remove duplicate code in crm, crm_claim.
 crm_helpdesk, event, hr_recruitment, project_issu relate to send mail
 wizard.and improve email.message.send wizard.

bzr revid: ysa@tinyerp.com-20110218124509-srcrk6lz4p4f3wlw
---
 addons/crm/__openerp__.py                     |  2 +-
 addons/crm/crm_lead_view.xml                  |  6 ++--
 addons/crm/wizard/__init__.py                 |  2 +-
 addons/crm_claim/crm_claim.py                 | 32 -------------------
 addons/crm_claim/crm_claim_view.xml           | 11 ++-----
 addons/crm_fundraising/crm_fundraising.py     | 32 -------------------
 .../crm_fundraising/crm_fundraising_view.xml  |  6 ++--
 addons/crm_helpdesk/crm_helpdesk.py           | 32 -------------------
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  6 ++--
 .../wizard/email_message_wizard_send.py       | 31 ++++++++++++++++--
 addons/event/event.py                         | 32 -------------------
 addons/event/event_view.xml                   |  6 ++--
 addons/hr_recruitment/hr_recruitment.py       | 32 -------------------
 addons/hr_recruitment/hr_recruitment_view.xml |  6 ++--
 addons/project_issue/project_issue.py         | 32 -------------------
 addons/project_issue/project_issue_view.xml   |  6 ++--
 16 files changed, 51 insertions(+), 223 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index d1500850afb..a6e42dd211e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -83,7 +83,7 @@ Create dashboard for CRM that includes:
         'wizard/crm_opportunity_to_phonecall_view.xml',
         'wizard/crm_partner_to_opportunity_view.xml',
 
-        'wizard/crm_send_email_view.xml',
+#        'wizard/crm_send_email_view.xml',
         'wizard/crm_add_note_view.xml',
         'wizard/crm_merge_opportunities_view.xml',
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d95b79139a6..a7479b8cdef 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -207,9 +207,9 @@
                         context="{'model': 'crm.lead' }"
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
-                        name="action_send_email"
-                        context="{'mail':'new', 'model': 'crm.lead', 'rec_id' : active_id}"
-                        icon="terp-mail-message-new" type="object"/>
+                        name="%(emails.action_email_message_wizard_send)d"
+                        context="{'mail':'new', 'model': 'crm.lead', 'record_id' : active_id}"
+                        icon="terp-mail-message-new" type="action"/>
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 9730b8d1d55..5a2adaa7e26 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import crm_send_email
+#import crm_send_email
 import crm_add_note
 
 import crm_lead_to_partner
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index e33582e6659..bd755a5ccf1 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -100,38 +100,6 @@ class crm_claim(crm.crm_case, osv.osv):
         #'stage_id': _get_stage_id,
     }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
         @param self: The object pointer
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index a8e8f017561..950dcf7bd26 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -75,15 +75,10 @@
                     <group>
                         <field name="name" />
                         <field name="date"/>
-
-
                     </group>
-
                     <group colspan="4" col="6">
-
                         <field name="user_id"/>
                         <field name="section_id" widget="selection" />
-
                         <group colspan="2" col="4">
                             <field name="stage_id" domain="[('type','=','claim')]"/>
                             <button name="stage_previous" string="" type="object" icon="gtk-go-back" />
@@ -203,9 +198,9 @@
                                     context="{'model': 'crm.lead' }"
                                     icon="terp-document-new" type="action" />
 			                    <button string="Send New Email"
-			                        name="action_send_email"
-			                        context="{'mail':'new', 'model': 'crm.claim', 'rec_id' : active_id}"
-			                        icon="terp-mail-message-new" type="object"/>
+			                        name="%(emails.action_email_message_wizard_send)d"
+			                        context="{'mail':'new', 'model': 'crm.claim', 'record_id' : active_id}"
+			                        icon="terp-mail-message-new" type="action"/>
                             </page>
                         </notebook>
                     </group>
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index c13089b07a6..6550da1c144 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -94,38 +94,6 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'planned_revenue': lambda *a:0.0,
             }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
 crm_fundraising()
 
 
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index fde8905f5b3..bd454a266a1 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -187,9 +187,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="action_send_email"
-		                        context="{'mail':'new', 'model': 'crm.fundraising', 'rec_id' : active_id}"
-		                        icon="terp-mail-message-new" type="object"/>
+		                        name="%(emails.action_email_message_wizard_send)d"
+		                        context="{'mail':'new', 'model': 'crm.fundraising', 'record_id' : active_id}"
+		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 3d31c6b241f..7e98cdf6398 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -87,38 +87,6 @@ class crm_helpdesk(crm.crm_case, osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
 crm_helpdesk()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 02635b07097..266e72e261c 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -139,9 +139,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="action_send_email"
-		                        context="{'mail':'new', 'model': 'crm.helpdesk', 'rec_id' : active_id}"
-		                        icon="terp-mail-message-new" type="object"/>
+		                        name="%(emails.action_email_message_wizard_send)d"
+		                        context="{'mail':'new', 'model': 'crm.helpdesk', 'record_id' : active_id}"
+		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group colspan="2" col="2">
diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
index dfd310732c3..d02a53f9cc7 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -34,11 +34,36 @@ class email_message_wizard_send(osv.osv_memory):
             context = {}
         result = super(email_message_wizard_send, self).default_get(cr, uid, fields, context=context)
         message_pool = self.pool.get('email.message')
-
-        model_pool = self.pool.get('ir.model')
         message_id = context.get('message_id', False)
         message_data = False
-        if message_id:
+        if context.get('record_id',False) and context.get('model',False):
+            model_obj = self.pool.get(context.get('model'))
+            data = model_obj.browse(cr, uid ,context.get('record_id'), context)
+            if 'name' in fields:
+                result['name'] = data.name
+
+            if 'email_to' in fields:
+                result['email_to'] = data.email_from
+
+            if 'email_from' in fields:
+                result['email_from'] = data.user_id and data.user_id.address_id and data.user_id.address_id.email
+
+            if 'description' in fields:
+                result['description'] = '\n' + (tools.ustr(data.user_id.signature or ''))
+
+            if 'model' in fields:
+                result['model'] = context.get('model','')
+
+            if 'email_cc' in fields:
+                result['email_cc'] = tools.ustr(data.email_cc or '')
+
+            if 'res_id' in fields:
+                result['res_id'] = context.get('record_id',0)
+
+            if 'reply_to' in fields and hasattr(data, 'section_id'):
+                result['reply_to'] = data.section_id and data.section_id.reply_to or False
+
+        elif message_id:
             message_data = message_pool.browse(cr, uid, int(message_id), context)
             if 'template_id' in fields:
                 result['template_id'] = message_data and message_data.template_id and message_data.template_id.id or False
diff --git a/addons/event/event.py b/addons/event/event.py
index b47b9eb7690..bd05ef5c8db 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -335,38 +335,6 @@ class event_registration(osv.osv):
         'user_id': lambda self, cr, uid, ctx: uid,
     }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
     def _make_invoice(self, cr, uid, reg, lines, context=None):
         """ Create Invoice from Invoice lines
         @param reg: Model of Event Registration
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d29db1bd800..1954c8e7294 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -430,9 +430,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="action_send_email"
-		                        context="{'mail':'new', 'model': 'event.registration', 'rec_id' : active_id}"
-		                        icon="terp-mail-message-new" type="object"/>
+		                        name="%(emails.action_email_message_wizard_send)d"
+		                        context="{'mail':'new', 'model': 'event.registration', 'record_id' : active_id}"
+		                        icon="terp-mail-message-new" type="action"/>
                            </page>
                     </notebook>
                 </form>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 4eb4fe16995..27e6b468682 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -176,38 +176,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
     def onchange_job(self,cr, uid, ids, job, context=None):
         result = {}
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b0c320468df..bdba2fd2fed 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -184,9 +184,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 	                    <button string="Send New Email"
-	                        name="action_send_email"
-	                        context="{'mail':'new', 'model': 'hr.applicant', 'rec_id' : active_id}"
-	                        icon="terp-mail-message-new" type="object"/>
+	                        name="%(emails.action_email_message_wizard_send)d"
+	                        context="{'mail':'new', 'model': 'hr.applicant', 'record_id' : active_id}"
+	                        icon="terp-mail-message-new" type="action"/>
                  </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 227ba4f617d..9e82eb01556 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -243,38 +243,6 @@ class project_issue(crm.crm_case, osv.osv):
         'project_id':_get_project,
     }
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
     def convert_issue_task(self, cr, uid, ids, context=None):
         case_obj = self.pool.get('project.issue')
         data_obj = self.pool.get('ir.model.data')
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c17002d969d..a0bb2a82898 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -141,9 +141,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="action_send_email"
-		                        context="{'mail':'new', 'model': 'project.issue', 'rec_id' : active_id}"
-		                        icon="terp-mail-message-new" type="object"/>
+		                        name="%(emails.action_email_message_wizard_send)d"
+		                        context="{'mail':'new', 'model': 'project.issue', 'record_id' : active_id}"
+		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">

From ffe734015973d9c08943c947ab23d94815b144c0 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 18 Feb 2011 18:18:46 +0530
Subject: [PATCH 16/27] [IMP] remove unused import statement.

bzr revid: ysa@tinyerp.com-20110218124846-uas68so40m2bvi4n
---
 addons/crm_claim/crm_claim.py                     | 1 -
 addons/crm_fundraising/crm_fundraising.py         | 1 -
 addons/crm_helpdesk/crm_helpdesk.py               | 1 -
 addons/emails/wizard/email_message_wizard_send.py | 5 ++---
 addons/event/event.py                             | 1 -
 addons/project_issue/project_issue.py             | 1 -
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index bd755a5ccf1..66ba0d93248 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -22,7 +22,6 @@
 from osv import fields, osv
 from crm import crm
 import time
-import tools
 
 class crm_claim(crm.crm_case, osv.osv):
     """
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index 6550da1c144..ad14cecb1f6 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from crm import crm
-import tools
 
 class crm_fundraising(crm.crm_case, osv.osv):
     """ Fund Raising Cases """
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 7e98cdf6398..6a51303761a 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -22,7 +22,6 @@
 from crm import crm
 from osv import fields, osv
 import time
-import tools
 
 class crm_helpdesk(crm.crm_case, osv.osv):
     """ Helpdesk Cases """
diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
index d02a53f9cc7..e58de2765e1 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-from osv import osv, fields
-import netsvc
-from tools.translate import _
+from osv import osv
+from osv import fields
 import tools
 
 class email_message_wizard_send(osv.osv_memory):
diff --git a/addons/event/event.py b/addons/event/event.py
index bd05ef5c8db..bf5336ad6bc 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -25,7 +25,6 @@ from crm import crm
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
-import tools
 
 class event_type(osv.osv):
     """ Event Type """
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 9e82eb01556..dce28737bfd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -27,7 +27,6 @@ import binascii
 import time
 import tools
 
-
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
     _order = "name desc"

From 013c86e610474edbf105a697cb4365b14d7dff83 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 21 Feb 2011 12:02:03 +0530
Subject: [PATCH 17/27] [IMP] emails :- improve default value in
 email.message.send.wizard

bzr revid: ysa@tinyerp.com-20110221063203-ttpiz36mgiohfyak
---
 .../emails/wizard/email_message_wizard_send.py   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_message_wizard_send.py
index e58de2765e1..63e06319719 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_message_wizard_send.py
@@ -38,28 +38,28 @@ class email_message_wizard_send(osv.osv_memory):
         if context.get('record_id',False) and context.get('model',False):
             model_obj = self.pool.get(context.get('model'))
             data = model_obj.browse(cr, uid ,context.get('record_id'), context)
-            if 'name' in fields:
+            if 'name' in fields and hasattr(data, 'name'):
                 result['name'] = data.name
 
-            if 'email_to' in fields:
+            if 'email_to' in fields and hasattr(data, 'email_to'):
                 result['email_to'] = data.email_from
 
-            if 'email_from' in fields:
+            if 'email_from' in fields and hasattr(data, 'email_from'):
                 result['email_from'] = data.user_id and data.user_id.address_id and data.user_id.address_id.email
 
-            if 'description' in fields:
+            if 'description' in fields and hasattr(data, 'description'):
                 result['description'] = '\n' + (tools.ustr(data.user_id.signature or ''))
 
-            if 'model' in fields:
+            if 'model' in fields and hasattr(data, 'model'):
                 result['model'] = context.get('model','')
 
-            if 'email_cc' in fields:
+            if 'email_cc' in fields and hasattr(data, 'email_cc'):
                 result['email_cc'] = tools.ustr(data.email_cc or '')
 
-            if 'res_id' in fields:
+            if 'res_id' in fields and hasattr(data, 'res_id'):
                 result['res_id'] = context.get('record_id',0)
 
-            if 'reply_to' in fields and hasattr(data, 'section_id'):
+            if 'reply_to' in fields and hasattr(data, 'reply_to'):
                 result['reply_to'] = data.section_id and data.section_id.reply_to or False
 
         elif message_id:

From 748860ca608ce957d8e8ef1d7d86feef47cf6b0f Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 21 Feb 2011 15:24:01 +0530
Subject: [PATCH 18/27] [IMP] emails :- change emails.message.send wizard name
 to email.compose.message wizard and related changes in some module.

bzr revid: ysa@tinyerp.com-20110221095401-pl0pyhzr7h8w7mjl
---
 addons/crm/crm_lead.py                        | 32 -------------------
 addons/crm/crm_lead_view.xml                  |  6 ++--
 addons/crm/crm_opportunity_view.xml           |  4 +--
 addons/crm_claim/crm_claim_view.xml           |  6 ++--
 .../crm_fundraising/crm_fundraising_view.xml  |  6 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  6 ++--
 addons/emails/__openerp__.py                  |  2 +-
 addons/emails/email_view.xml                  |  2 +-
 addons/emails/wizard/__init__.py              |  2 +-
 ...izard_send.py => email_compose_message.py} | 26 ++++++---------
 ...iew.xml => email_compose_message_view.xml} | 12 +++----
 addons/event/event_view.xml                   |  6 ++--
 addons/hr_recruitment/hr_recruitment_view.xml |  6 ++--
 addons/project_issue/project_issue_view.xml   |  6 ++--
 14 files changed, 41 insertions(+), 81 deletions(-)
 rename addons/emails/wizard/{email_message_wizard_send.py => email_compose_message.py} (88%)
 rename addons/emails/wizard/{email_message_wizard_send_view.xml => email_compose_message_view.xml} (83%)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index c45a18b7ddc..60e2f447c0d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -288,38 +288,6 @@ class crm_lead(crm_case, osv.osv):
                         }
         return value
 
-    def action_send_email(self, cr, uid, ids, context=None):
-        """
-            Open Send email wizard.
-        """
-        if context is None:
-            context = {}
-        for data in self.browse(cr, uid ,ids, context):
-            context.update({
-                    'mail':'new',
-                    'default_name': data.name,
-                    'default_email_to': data.email_from,
-                    'default_email_from': data.user_id and data.user_id.address_id and data.user_id.address_id.email,
-                    'default_description': '\n' + (tools.ustr(data.user_id.signature or '')),
-                    'default_model': context.get('model',''),
-                    'default_email_cc': tools.ustr(data.email_cc or ''),
-                    'default_res_id': context.get('rec_id',0)
-                })
-            if hasattr(data, 'section_id'):
-                context.update({'default_reply_to': data.section_id and data.section_id.reply_to or False})
-
-        result = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'email.message.wizard_send',
-                'view_id': False,
-                'context': context,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True
-                }
-        return result
-
     def write(self, cr, uid, ids, vals, context=None):
         if not context:
             context = {}
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a7479b8cdef..019e74f19d1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -170,7 +170,7 @@
                             <field name="history" invisible="1"/>
                             <button
                                 string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                name="%(emails.action_email_message_wizard_send)d"
+                                name="%(emails.action_email_compose_message_wizard)d"
                                 context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
                                 icon="terp-mail-replied" type="action" />
                         </tree>
@@ -188,7 +188,7 @@
                                     <group attrs="{'invisible': [('history', '!=', True)]}">
                                         <field name="description" colspan="4" nolabel="1" height="250"/>
                                         <button colspan="4" string="Reply"
-                                            name="%(emails.action_email_message_wizard_send)d"
+                                            name="%(emails.action_email_compose_message_wizard)d"
                                             context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
                                             icon="terp-mail-replied" type="action"/>
                                     </group>
@@ -207,7 +207,7 @@
                         context="{'model': 'crm.lead' }"
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
-                        name="%(emails.action_email_message_wizard_send)d"
+                        name="%(emails.action_email_compose_message_wizard)d"
                         context="{'mail':'new', 'model': 'crm.lead', 'record_id' : active_id}"
                         icon="terp-mail-message-new" type="action"/>
                  </page>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 993070d31c4..84d577a173f 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -155,7 +155,7 @@
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button string="Reply"
-                                        name="%(emails.action_email_message_wizard_send)d"
+                                        name="%(emails.action_email_compose_message_wizard)d"
                                         context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action"/>
                                 </tree>
@@ -173,7 +173,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            name="%(emails.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 950dcf7bd26..84bd7ef0aaa 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -161,7 +161,7 @@
                                         <field name="display_text" string="History Information"/>
 			                            <button
 			                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-			                                name="%(emails.action_email_message_wizard_send)d"
+			                                name="%(emails.action_email_compose_message_wizard)d"
 			                                context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True, 'message_id':active_id}"
 			                                icon="terp-mail-replied" type="action" />
                                     </tree>
@@ -179,7 +179,7 @@
                                                 <group attrs="{'invisible': [('history', '!=', True)]}">
                                                     <field name="description" colspan="4" nolabel="1" height="250"/>
 			                                        <button colspan="4" string="Reply"
-			                                            name="%(emails.action_email_message_wizard_send)d"
+			                                            name="%(emails.action_email_compose_message_wizard)d"
 			                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True, 'message_id':active_id}"
 			                                            icon="terp-mail-replied" type="action"/>
                                                 </group>
@@ -198,7 +198,7 @@
                                     context="{'model': 'crm.lead' }"
                                     icon="terp-document-new" type="action" />
 			                    <button string="Send New Email"
-			                        name="%(emails.action_email_message_wizard_send)d"
+			                        name="%(emails.action_email_compose_message_wizard)d"
 			                        context="{'mail':'new', 'model': 'crm.claim', 'record_id' : active_id}"
 			                        icon="terp-mail-message-new" type="action"/>
                             </page>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index bd454a266a1..82d55f462f3 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -150,7 +150,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(emails.action_email_message_wizard_send)d"
+		                                name="%(emails.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -168,7 +168,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            name="%(emails.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True, 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
@@ -187,7 +187,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(emails.action_email_message_wizard_send)d"
+		                        name="%(emails.action_email_compose_message_wizard)d"
 		                        context="{'mail':'new', 'model': 'crm.fundraising', 'record_id' : active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 266e72e261c..e297328865f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -102,7 +102,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(emails.action_email_message_wizard_send)d"
+		                                name="%(emails.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -120,7 +120,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            name="%(emails.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True, 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                              </group>
@@ -139,7 +139,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(emails.action_email_message_wizard_send)d"
+		                        name="%(emails.action_email_compose_message_wizard)d"
 		                        context="{'mail':'new', 'model': 'crm.helpdesk', 'record_id' : active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
diff --git a/addons/emails/__openerp__.py b/addons/emails/__openerp__.py
index a3b6456921f..a6c24087055 100644
--- a/addons/emails/__openerp__.py
+++ b/addons/emails/__openerp__.py
@@ -32,7 +32,7 @@
     'depends': ['base', 'base_tools'],
     'init_xml': [],
     'update_xml': [
-        "wizard/email_message_wizard_send_view.xml",
+        "wizard/email_compose_message_view.xml",
         "email_view.xml",
         "res_partner_view.xml",
         'security/ir.model.access.csv',
diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index 585118f149d..4680ece3ee3 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -34,7 +34,7 @@
                                     <field name="res_id" readonly="1"/>
                                     <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
 	                                <field name="message_id"/>
-	                                <button name="%(action_email_message_wizard_send)d" string="Reply" type="action" icon="terp-mail-replied"
+	                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
 	                                context="{'mail':'reply', 'message_id':active_id}"/>
                                 </group>
                             </group>
diff --git a/addons/emails/wizard/__init__.py b/addons/emails/wizard/__init__.py
index e8dc20ee171..16ba392b2d7 100644
--- a/addons/emails/wizard/__init__.py
+++ b/addons/emails/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import email_message_wizard_send
+import email_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/emails/wizard/email_message_wizard_send.py b/addons/emails/wizard/email_compose_message.py
similarity index 88%
rename from addons/emails/wizard/email_message_wizard_send.py
rename to addons/emails/wizard/email_compose_message.py
index 63e06319719..fce2a1fd316 100644
--- a/addons/emails/wizard/email_message_wizard_send.py
+++ b/addons/emails/wizard/email_compose_message.py
@@ -23,15 +23,15 @@ from osv import osv
 from osv import fields
 import tools
 
-class email_message_wizard_send(osv.osv_memory):
-    _name = 'email.message.wizard_send'
-    _inherit = 'email.message'
-    _description = 'This is the wizard for send e-mail'
+class email_compose_message(osv.osv_memory):
+    _name = 'email.compose.message'
+    _inherit = 'email.message.template'
+    _description = 'This is the wizard for Compose E-mail'
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        result = super(email_message_wizard_send, self).default_get(cr, uid, fields, context=context)
+        result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
         message_pool = self.pool.get('email.message')
         message_id = context.get('message_id', False)
         message_data = False
@@ -50,13 +50,13 @@ class email_message_wizard_send(osv.osv_memory):
             if 'description' in fields and hasattr(data, 'description'):
                 result['description'] = '\n' + (tools.ustr(data.user_id.signature or ''))
 
-            if 'model' in fields and hasattr(data, 'model'):
+            if 'model' in fields:
                 result['model'] = context.get('model','')
 
             if 'email_cc' in fields and hasattr(data, 'email_cc'):
                 result['email_cc'] = tools.ustr(data.email_cc or '')
 
-            if 'res_id' in fields and hasattr(data, 'res_id'):
+            if 'res_id' in fields:
                 result['res_id'] = context.get('record_id',0)
 
             if 'reply_to' in fields and hasattr(data, 'reply_to'):
@@ -64,12 +64,6 @@ class email_message_wizard_send(osv.osv_memory):
 
         elif message_id:
             message_data = message_pool.browse(cr, uid, int(message_id), context)
-            if 'template_id' in fields:
-                result['template_id'] = message_data and message_data.template_id and message_data.template_id.id or False
-
-            if 'smtp_server_id' in fields:
-                result['smtp_server_id'] = message_data and message_data.smtp_server_id and message_data.smtp_server_id.id or False
-
             if 'message_id' in fields:
                 result['message_id'] =  message_data and message_data.message_id
 
@@ -129,9 +123,6 @@ class email_message_wizard_send(osv.osv_memory):
             if 'priority' in fields:
                 result['priority'] = message_data and message_data.priority
 
-            if 'partner_id' in fields:
-                result['partner_id'] = message_data and message_data.partner_id and message_data.partner_id.id or False
-
             if 'debug' in fields:
                 result['debug'] = message_data and message_data.debug
 
@@ -139,6 +130,7 @@ class email_message_wizard_send(osv.osv_memory):
 
     _columns = {
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
+        'debug':fields.boolean('Debug', readonly=True),
     }
 
     def save_to_drafts(self, cr, uid, ids, context=None):
@@ -168,6 +160,6 @@ class email_message_wizard_send(osv.osv_memory):
             email_ids.append(email_id)
         return email_ids
 
-email_message_wizard_send()
+email_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/emails/wizard/email_message_wizard_send_view.xml b/addons/emails/wizard/email_compose_message_view.xml
similarity index 83%
rename from addons/emails/wizard/email_message_wizard_send_view.xml
rename to addons/emails/wizard/email_compose_message_view.xml
index f599939fd9d..c34b194bf87 100644
--- a/addons/emails/wizard/email_message_wizard_send_view.xml
+++ b/addons/emails/wizard/email_compose_message_view.xml
@@ -2,9 +2,9 @@
 <openerp>
 	<data>
 
-        <record model="ir.ui.view" id="email_message_wizard_send_form">
-            <field name="name">email.message.wizard_send.form</field>
-            <field name="model">email.message.wizard_send</field>
+        <record model="ir.ui.view" id="email_compose_message_wizard_form">
+            <field name="name">email.compose.message.form</field>
+            <field name="model">email.compose.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reply Email">
@@ -36,10 +36,10 @@
             </field>
         </record>
 
-        <record id="action_email_message_wizard_send" model="ir.actions.act_window">
+        <record id="action_email_compose_message_wizard" model="ir.actions.act_window">
             <field name="name">Send E-mail</field>
-            <field name="res_model">email.message.wizard_send</field>
-            <field name="src_model">email.message.wizard_send</field>
+            <field name="res_model">email.compose.message</field>
+            <field name="src_model">email.compose.message</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1954c8e7294..d13c2826d23 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -393,7 +393,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(emails.action_email_message_wizard_send)d"
+		                                name="%(emails.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -411,7 +411,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            name="%(emails.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True, 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
@@ -430,7 +430,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(emails.action_email_message_wizard_send)d"
+		                        name="%(emails.action_email_compose_message_wizard)d"
 		                        context="{'mail':'new', 'model': 'event.registration', 'record_id' : active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                            </page>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index bdba2fd2fed..c71e434dc5e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -147,7 +147,7 @@
                                 <field name="history" invisible="1"/>
 	                            <button
 	                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-	                                name="%(emails.action_email_message_wizard_send)d"
+	                                name="%(emails.action_email_compose_message_wizard)d"
 	                                context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True, 'message_id':active_id}"
 	                                icon="terp-mail-replied" type="action" />
                             </tree>
@@ -165,7 +165,7 @@
                                         <group attrs="{'invisible': [('history', '!=', True)]}">
                                             <field name="description" colspan="4" nolabel="1" height="250"/>
 	                                        <button colspan="4" string="Reply"
-	                                            name="%(emails.action_email_message_wizard_send)d"
+	                                            name="%(emails.action_email_compose_message_wizard)d"
 	                                            context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True, 'message_id':active_id}"
 	                                            icon="terp-mail-replied" type="action"/>
                                         </group>
@@ -184,7 +184,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 	                    <button string="Send New Email"
-	                        name="%(emails.action_email_message_wizard_send)d"
+	                        name="%(emails.action_email_compose_message_wizard)d"
 	                        context="{'mail':'new', 'model': 'hr.applicant', 'record_id' : active_id}"
 	                        icon="terp-mail-message-new" type="action"/>
                  </page>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a0bb2a82898..4aed9f00d0e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -103,7 +103,7 @@
                                     <field name="history" invisible="1"/>
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-		                                name="%(emails.action_email_message_wizard_send)d"
+		                                name="%(emails.action_email_compose_message_wizard)d"
 		                                context="{'mail':'reply', 'model': 'crm.lead', 'project.issue' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
@@ -121,7 +121,7 @@
                                             <group attrs="{'invisible': [('history', '!=', True)]}">
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
-		                                            name="%(emails.action_email_message_wizard_send)d"
+		                                            name="%(emails.action_email_compose_message_wizard)d"
 		                                            context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True, 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
@@ -141,7 +141,7 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="%(emails.action_email_message_wizard_send)d"
+		                        name="%(emails.action_email_compose_message_wizard)d"
 		                        context="{'mail':'new', 'model': 'project.issue', 'record_id' : active_id}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>

From 368808a4bb57212f8a15fda665bac803138d497b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 21 Feb 2011 16:09:07 +0530
Subject: [PATCH 19/27] [IMP] crm :- inherit email.compose.message wizard and
 override default_get method and set default value to related module.

bzr revid: ysa@tinyerp.com-20110221103907-l114g3ugjr57yxnd
---
 addons/crm/crm_opportunity_view.xml           |  6 +-
 addons/crm/wizard/__init__.py                 |  1 +
 addons/crm/wizard/email_compose_message.py    | 65 +++++++++++++++++++
 addons/emails/wizard/email_compose_message.py | 30 +--------
 .../wizard/email_compose_message_view.xml     |  1 -
 5 files changed, 70 insertions(+), 33 deletions(-)
 create mode 100644 addons/crm/wizard/email_compose_message.py

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 84d577a173f..cf1220b3172 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -192,9 +192,9 @@
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
-		                        name="action_send_email"
-		                        context="{'mail':'new', 'model': 'crm.lead', 'rec_id' : active_id}"
-		                        icon="terp-mail-message-new" type="object" />
+		                        name="%(emails.action_email_compose_message_wizard)d"
+		                        context="{'mail':'new', 'model': 'crm.lead', 'record_id' : active_id}"
+		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 5a2adaa7e26..559214b6b60 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 #import crm_send_email
+import email_compose_message
 import crm_add_note
 
 import crm_lead_to_partner
diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py
new file mode 100644
index 00000000000..9f4f1676a95
--- /dev/null
+++ b/addons/crm/wizard/email_compose_message.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+class email_compose_message(osv.osv_memory):
+    _name = 'email.compose.message'
+    _inherit = 'email.compose.message'
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
+        if context.get('record_id',False) and context.get('model',False):
+            model_obj = self.pool.get(context.get('model'))
+            data = model_obj.browse(cr, uid ,context.get('record_id'), context)
+            if 'name' in fields:
+                result['name'] = data.name
+
+            if 'email_to' in fields:
+                result['email_to'] = data.email_from
+
+            if 'email_from' in fields:
+                result['email_from'] = data.user_id and data.user_id.address_id and data.user_id.address_id.email
+
+            if 'description' in fields:
+                result['description'] = '\n' + (tools.ustr(data.user_id.signature or ''))
+
+            if 'model' in fields:
+                result['model'] = context.get('model','')
+
+            if 'email_cc' in fields:
+                result['email_cc'] = tools.ustr(data.email_cc or '')
+
+            if 'res_id' in fields:
+                result['res_id'] = context.get('record_id',0)
+
+            if 'reply_to' in fields and hasattr(data, 'section_id'):
+                result['reply_to'] = data.section_id and data.section_id.reply_to or False
+
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/emails/wizard/email_compose_message.py b/addons/emails/wizard/email_compose_message.py
index fce2a1fd316..738b1561119 100644
--- a/addons/emails/wizard/email_compose_message.py
+++ b/addons/emails/wizard/email_compose_message.py
@@ -34,35 +34,7 @@ class email_compose_message(osv.osv_memory):
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
         message_pool = self.pool.get('email.message')
         message_id = context.get('message_id', False)
-        message_data = False
-        if context.get('record_id',False) and context.get('model',False):
-            model_obj = self.pool.get(context.get('model'))
-            data = model_obj.browse(cr, uid ,context.get('record_id'), context)
-            if 'name' in fields and hasattr(data, 'name'):
-                result['name'] = data.name
-
-            if 'email_to' in fields and hasattr(data, 'email_to'):
-                result['email_to'] = data.email_from
-
-            if 'email_from' in fields and hasattr(data, 'email_from'):
-                result['email_from'] = data.user_id and data.user_id.address_id and data.user_id.address_id.email
-
-            if 'description' in fields and hasattr(data, 'description'):
-                result['description'] = '\n' + (tools.ustr(data.user_id.signature or ''))
-
-            if 'model' in fields:
-                result['model'] = context.get('model','')
-
-            if 'email_cc' in fields and hasattr(data, 'email_cc'):
-                result['email_cc'] = tools.ustr(data.email_cc or '')
-
-            if 'res_id' in fields:
-                result['res_id'] = context.get('record_id',0)
-
-            if 'reply_to' in fields and hasattr(data, 'reply_to'):
-                result['reply_to'] = data.section_id and data.section_id.reply_to or False
-
-        elif message_id:
+        if message_id:
             message_data = message_pool.browse(cr, uid, int(message_id), context)
             if 'message_id' in fields:
                 result['message_id'] =  message_data and message_data.message_id
diff --git a/addons/emails/wizard/email_compose_message_view.xml b/addons/emails/wizard/email_compose_message_view.xml
index c34b194bf87..f23a718ad76 100644
--- a/addons/emails/wizard/email_compose_message_view.xml
+++ b/addons/emails/wizard/email_compose_message_view.xml
@@ -44,7 +44,6 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{'message_id':active_id, 'mail':'reply'}</field>
         </record>
 
 	</data>

From 99b8e78d0f3bd1bf4690b8a921349cef83c0af58 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 21 Feb 2011 17:27:00 +0530
Subject: [PATCH 20/27] [IMP] integrate email.compose.message wizard with
 project_scrum module.

bzr revid: ysa@tinyerp.com-20110221115700-yiz0x5ypgu5v3rb1
---
 addons/crm/wizard/email_compose_message.py    |  4 +-
 addons/project_issue/project_issue_view.xml   |  2 +-
 addons/project_scrum/__openerp__.py           |  2 +-
 addons/project_scrum/project_scrum_view.xml   |  4 +-
 addons/project_scrum/wizard/__init__.py       |  3 +-
 .../wizard/email_compose_message.py           | 64 +++++++++++++++++++
 6 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 addons/project_scrum/wizard/email_compose_message.py

diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py
index 9f4f1676a95..97e33aacc2f 100644
--- a/addons/crm/wizard/email_compose_message.py
+++ b/addons/crm/wizard/email_compose_message.py
@@ -24,14 +24,14 @@ from osv import fields
 import tools
 
 class email_compose_message(osv.osv_memory):
-    _name = 'email.compose.message'
     _inherit = 'email.compose.message'
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
+        model = ['crm.lead', 'crm.claim', 'crm.fundraising', 'crm.helpdesk', 'event.registration', 'hr.applicant', 'project.issue']
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
-        if context.get('record_id',False) and context.get('model',False):
+        if context.get('record_id',False) and context.get('model',False) and context.get('model') in model:
             model_obj = self.pool.get(context.get('model'))
             data = model_obj.browse(cr, uid ,context.get('record_id'), context)
             if 'name' in fields:
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4aed9f00d0e..4a80b38fa04 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -104,7 +104,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'crm.lead', 'project.issue' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'model': 'project.issue', 'project.issue' : True, 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 90b596da2cf..eb86798c493 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -55,7 +55,7 @@
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
         'wizard/project_scrum_postpone_view.xml',
-        "wizard/project_scrum_email_view.xml",
+#        "wizard/project_scrum_email_view.xml",
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
         'process/project_scrum_process.xml',
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 32ed240cba6..1f3dc841d1c 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -394,7 +394,9 @@
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
                         <field name="user_id"/>
-                        <button name="%(action_project_scrum_email)d"  string="Send Email" type="action" icon="terp-mail-message-new" />
+                        <button name="%(emails.action_email_compose_message_wizard)d"
+                                string="Send Email" type="action" icon="terp-mail-message-new"
+                                context="{'mail':'new', 'model': 'project.scrum.meeting', 'record_id' : active_id}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 4b5b0919574..2a643f0fa5f 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -23,7 +23,8 @@ import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
 import project_scrum_postpone
-import project_scrum_email
+#import project_scrum_email
+import email_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/email_compose_message.py
new file mode 100644
index 00000000000..eb7d386e738
--- /dev/null
+++ b/addons/project_scrum/wizard/email_compose_message.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
+
+        if context.get('record_id',False) and context.get('model',False) and context.get('model') == 'project.scrum.meeting':
+
+            meeting_pool = self.pool.get('project.scrum.meeting')
+            user_pool = self.pool.get('res.users')
+            meeting = meeting_pool.browse(cr, uid, context.get('record_id'), context=context)
+            sprint = meeting.sprint_id
+
+            if 'email_from' in fields and sprint.scrum_master_id and sprint.scrum_master_id.user_email:
+                user_data = user_pool.browse(cr, uid, uid, context=context)
+                user_email = user_data.address_id and user_data.address_id.email or False
+                result.update({'email_from': user_email})
+
+            if 'email_to' in fields and sprint.scrum_master_id and sprint.scrum_master_id.user_email:
+                result.update({'email_to': sprint.scrum_master_id.user_email})
+
+            if sprint.product_owner_id and sprint.product_owner_id.user_email:
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' +  sprint.product_owner_id.user_email or sprint.product_owner_id.user_email})
+
+            if 'name' in fields:
+                subject = _("Scrum Meeting : %s") %(meeting.date)
+                result.update({'name': subject})
+
+            if 'description' in fields:
+                message = _("Hello  , \nI am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name)
+                result.update({'description': message})
+
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 40db9a23788b20b15426f59de5f8b9df7d9aabaf Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Feb 2011 10:37:37 +0530
Subject: [PATCH 21/27] [IMP] email.compose.message :- improve context value in
 related module.

bzr revid: ysa@tinyerp.com-20110222050737-hq5uv88etuu06yow
---
 addons/crm/crm_lead_view.xml                      |  6 +++---
 addons/crm/crm_opportunity_view.xml               |  6 +++---
 addons/crm/wizard/email_compose_message.py        | 10 +++++-----
 addons/crm_claim/crm_claim_view.xml               |  6 +++---
 addons/crm_fundraising/crm_fundraising_view.xml   |  6 +++---
 addons/crm_helpdesk/crm_helpdesk_view.xml         |  6 +++---
 addons/event/event_view.xml                       |  6 +++---
 addons/hr_recruitment/hr_recruitment_view.xml     |  6 +++---
 addons/project_issue/project_issue_view.xml       |  6 +++---
 addons/project_scrum/project_scrum_view.xml       |  2 +-
 .../project_scrum/wizard/email_compose_message.py | 15 ++++++++++-----
 11 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 019e74f19d1..a11ccccd9c3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -171,7 +171,7 @@
                             <button
                                 string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
                                 name="%(emails.action_email_compose_message_wizard)d"
-                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
+                                context="{'mail':'reply', 'message_id':active_id}"
                                 icon="terp-mail-replied" type="action" />
                         </tree>
                         <form string="Communication history">
@@ -189,7 +189,7 @@
                                         <field name="description" colspan="4" nolabel="1" height="250"/>
                                         <button colspan="4" string="Reply"
                                             name="%(emails.action_email_compose_message_wizard)d"
-                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
+                                            context="{'mail':'reply', 'message_id':active_id}"
                                             icon="terp-mail-replied" type="action"/>
                                     </group>
                                     <group attrs="{'invisible': [('history', '=', True)]}">
@@ -208,7 +208,7 @@
                         icon="terp-document-new" type="action" />
                     <button string="Send New Email"
                         name="%(emails.action_email_compose_message_wizard)d"
-                        context="{'mail':'new', 'model': 'crm.lead', 'record_id' : active_id}"
+                        context="{'mail':'new'}"
                         icon="terp-mail-message-new" type="action"/>
                  </page>
                 </notebook>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index cf1220b3172..59ae2e7dbff 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -156,7 +156,7 @@
                                     <field name="history" invisible="1"/>
                                     <button string="Reply"
                                         name="%(emails.action_email_compose_message_wizard)d"
-                                        context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
+                                        context="{'mail':'reply', 'message_id':active_id}"
                                         icon="terp-mail-replied" type="action"/>
                                 </tree>
                                 <form string="History">
@@ -174,7 +174,7 @@
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(emails.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True, 'message_id':active_id}"
+		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
@@ -193,7 +193,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'model': 'crm.lead', 'record_id' : active_id}"
+		                        context="{'mail':'new'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py
index 97e33aacc2f..26354387703 100644
--- a/addons/crm/wizard/email_compose_message.py
+++ b/addons/crm/wizard/email_compose_message.py
@@ -31,9 +31,9 @@ class email_compose_message(osv.osv_memory):
             context = {}
         model = ['crm.lead', 'crm.claim', 'crm.fundraising', 'crm.helpdesk', 'event.registration', 'hr.applicant', 'project.issue']
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
-        if context.get('record_id',False) and context.get('model',False) and context.get('model') in model:
-            model_obj = self.pool.get(context.get('model'))
-            data = model_obj.browse(cr, uid ,context.get('record_id'), context)
+        if context.get('active_id',False) and context.get('active_model',False) and context.get('active_model') in model:
+            model_obj = self.pool.get(context.get('active_model'))
+            data = model_obj.browse(cr, uid ,context.get('active_id'), context)
             if 'name' in fields:
                 result['name'] = data.name
 
@@ -47,13 +47,13 @@ class email_compose_message(osv.osv_memory):
                 result['description'] = '\n' + (tools.ustr(data.user_id.signature or ''))
 
             if 'model' in fields:
-                result['model'] = context.get('model','')
+                result['model'] = context.get('active_model','')
 
             if 'email_cc' in fields:
                 result['email_cc'] = tools.ustr(data.email_cc or '')
 
             if 'res_id' in fields:
-                result['res_id'] = context.get('record_id',0)
+                result['res_id'] = context.get('active_id',0)
 
             if 'reply_to' in fields and hasattr(data, 'section_id'):
                 result['reply_to'] = data.section_id and data.section_id.reply_to or False
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 84bd7ef0aaa..b427bae667f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -162,7 +162,7 @@
 			                            <button
 			                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 			                                name="%(emails.action_email_compose_message_wizard)d"
-			                                context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True, 'message_id':active_id}"
+			                                context="{'mail':'reply', 'message_id':active_id}"
 			                                icon="terp-mail-replied" type="action" />
                                     </tree>
                                     <form string="Communication &amp; History">
@@ -180,7 +180,7 @@
                                                     <field name="description" colspan="4" nolabel="1" height="250"/>
 			                                        <button colspan="4" string="Reply"
 			                                            name="%(emails.action_email_compose_message_wizard)d"
-			                                            context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True, 'message_id':active_id}"
+			                                            context="{'mail':'reply', 'message_id':active_id}"
 			                                            icon="terp-mail-replied" type="action"/>
                                                 </group>
                                                 <group attrs="{'invisible': [('history', '=', True)]}">
@@ -199,7 +199,7 @@
                                     icon="terp-document-new" type="action" />
 			                    <button string="Send New Email"
 			                        name="%(emails.action_email_compose_message_wizard)d"
-			                        context="{'mail':'new', 'model': 'crm.claim', 'record_id' : active_id}"
+			                        context="{'mail':'new'}"
 			                        icon="terp-mail-message-new" type="action"/>
                             </page>
                         </notebook>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 82d55f462f3..3d35d35db13 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -151,7 +151,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -169,7 +169,7 @@
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(emails.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True, 'message_id':active_id}"
+		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
@@ -188,7 +188,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'model': 'crm.fundraising', 'record_id' : active_id}"
+		                        context="{'mail':'new'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index e297328865f..72f9324ef0d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -103,7 +103,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -121,7 +121,7 @@
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(emails.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True, 'message_id':active_id}"
+		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                              </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
@@ -140,7 +140,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'model': 'crm.helpdesk', 'record_id' : active_id}"
+		                        context="{'mail':'new'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d13c2826d23..a11d2ac8b7c 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -394,7 +394,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -412,7 +412,7 @@
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(emails.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True, 'message_id':active_id}"
+		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
@@ -431,7 +431,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'model': 'event.registration', 'record_id' : active_id}"
+		                        context="{'mail':'new'}"
 		                        icon="terp-mail-message-new" type="action"/>
                            </page>
                     </notebook>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c71e434dc5e..0d0da8d3d34 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,7 +148,7 @@
 	                            <button
 	                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 	                                name="%(emails.action_email_compose_message_wizard)d"
-	                                context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True, 'message_id':active_id}"
+	                                context="{'mail':'reply', 'message_id':active_id}"
 	                                icon="terp-mail-replied" type="action" />
                             </tree>
                             <form string="History">
@@ -166,7 +166,7 @@
                                             <field name="description" colspan="4" nolabel="1" height="250"/>
 	                                        <button colspan="4" string="Reply"
 	                                            name="%(emails.action_email_compose_message_wizard)d"
-	                                            context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True, 'message_id':active_id}"
+	                                            context="{'mail':'reply', 'message_id':active_id}"
 	                                            icon="terp-mail-replied" type="action"/>
                                         </group>
                                         <group attrs="{'invisible': [('history', '=', True)]}">
@@ -185,7 +185,7 @@
                                 icon="terp-document-new" type="action" />
 	                    <button string="Send New Email"
 	                        name="%(emails.action_email_compose_message_wizard)d"
-	                        context="{'mail':'new', 'model': 'hr.applicant', 'record_id' : active_id}"
+	                        context="{'mail':'new'}"
 	                        icon="terp-mail-message-new" type="action"/>
                  </page>
                  <page string="Notes">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4a80b38fa04..f8f4f84964f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -104,7 +104,7 @@
 		                            <button
 		                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
 		                                name="%(emails.action_email_compose_message_wizard)d"
-		                                context="{'mail':'reply', 'model': 'project.issue', 'project.issue' : True, 'message_id':active_id}"
+		                                context="{'mail':'reply', 'message_id':active_id}"
 		                                icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="History">
@@ -122,7 +122,7 @@
                                                 <field name="description" colspan="4" nolabel="1" height="250"/>
 		                                        <button colspan="4" string="Reply"
 		                                            name="%(emails.action_email_compose_message_wizard)d"
-		                                            context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True, 'message_id':active_id}"
+		                                            context="{'mail':'reply', 'message_id':active_id}"
 		                                            icon="terp-mail-replied" type="action"/>
                                             </group>
                                             <group attrs="{'invisible': [('history', '=', True)]}">
@@ -142,7 +142,7 @@
                                 icon="terp-document-new" type="action" />
 		                    <button string="Send New Email"
 		                        name="%(emails.action_email_compose_message_wizard)d"
-		                        context="{'mail':'new', 'model': 'project.issue', 'record_id' : active_id}"
+		                        context="{'mail':'new'}"
 		                        icon="terp-mail-message-new" type="action"/>
                         </page>
                            <page string="Extra Info" groups="base.group_extended">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 1f3dc841d1c..fe874818157 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -396,7 +396,7 @@
                         <field name="user_id"/>
                         <button name="%(emails.action_email_compose_message_wizard)d"
                                 string="Send Email" type="action" icon="terp-mail-message-new"
-                                context="{'mail':'new', 'model': 'project.scrum.meeting', 'record_id' : active_id}"/>
+                                context="{'mail':'new'}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/email_compose_message.py
index eb7d386e738..e479c1bdb14 100644
--- a/addons/project_scrum/wizard/email_compose_message.py
+++ b/addons/project_scrum/wizard/email_compose_message.py
@@ -31,17 +31,16 @@ class email_compose_message(osv.osv_memory):
             context = {}
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
 
-        if context.get('record_id',False) and context.get('model',False) and context.get('model') == 'project.scrum.meeting':
+        if context.get('active_id',False) and context.get('active_model',False) and context.get('active_model') == 'project.scrum.meeting':
 
             meeting_pool = self.pool.get('project.scrum.meeting')
             user_pool = self.pool.get('res.users')
-            meeting = meeting_pool.browse(cr, uid, context.get('record_id'), context=context)
+            meeting = meeting_pool.browse(cr, uid, context.get('active_id'), context=context)
             sprint = meeting.sprint_id
 
-            if 'email_from' in fields and sprint.scrum_master_id and sprint.scrum_master_id.user_email:
+            if 'email_from' in fields:
                 user_data = user_pool.browse(cr, uid, uid, context=context)
-                user_email = user_data.address_id and user_data.address_id.email or False
-                result.update({'email_from': user_email})
+                result.update({'email_from': user_data.address_id and user_data.address_id.email or False})
 
             if 'email_to' in fields and sprint.scrum_master_id and sprint.scrum_master_id.user_email:
                 result.update({'email_to': sprint.scrum_master_id.user_email})
@@ -57,6 +56,12 @@ class email_compose_message(osv.osv_memory):
                 message = _("Hello  , \nI am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name)
                 result.update({'description': message})
 
+            if 'model' in fields:
+                result.update({'model':context.get('active_model')})
+
+            if 'res_id' in fields:
+                result.update({'res_id':context.get('active_id')})
+
         return result
 
 email_compose_message()

From fd88efc23ba5109835ee215284327a6b93758219 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Feb 2011 12:35:31 +0530
Subject: [PATCH 22/27] [IMP] project, project_planning :- integreate
 email.compose.message wizard with project.close.task in project module.

bzr revid: ysa@tinyerp.com-20110222070531-is1ofaciyoof1qlu
---
 addons/project/__openerp__.py                 |  2 +-
 addons/project/wizard/__init__.py             |  3 +-
 .../project/wizard/email_compose_message.py   | 81 +++++++++++++++++++
 .../project_planning_view.xml                 |  2 +-
 4 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 addons/project/wizard/email_compose_message.py

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 301600d25c7..b32a9b86f74 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -37,7 +37,7 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
     "update_xml": [
         "security/project_security.xml",
         "wizard/project_task_delegate_view.xml",
-        "wizard/project_task_close_view.xml",
+#        "wizard/project_task_close_view.xml",
         "wizard/project_task_reevaluate_view.xml",
         "security/ir.model.access.csv",
         "project_data.xml",
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 69e1051e621..5225a2d661e 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-import project_task_close
+#import project_task_close
+import email_compose_message
 import project_task_delegate
 import project_task_reevaluate
 
diff --git a/addons/project/wizard/email_compose_message.py b/addons/project/wizard/email_compose_message.py
new file mode 100644
index 00000000000..042cdd61a30
--- /dev/null
+++ b/addons/project/wizard/email_compose_message.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
+        if context.get('active_id',False) and context.get('active_model',False) and context.get('active_model') == 'project.task':
+            task_pool = self.pool.get('project.task')
+            task_data = task_pool.browse(cr, uid, context.get('active_id'), context=context)
+            project = task_data.project_id
+            manager = project.user_id or False
+            partner = task_data.partner_id or task_data.project_id.partner_id
+
+            if project.warn_manager and (not manager or manager and not manager.user_email) :
+                raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
+            elif project.warn_customer and (not partner or not len(partner.address) or (partner and len(partner.address) and not partner.address[0].email)):
+                raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
+
+            if 'email_from' in fields:
+                result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
+
+            if 'description' in fields:
+                val = {
+                        'name': task_data.name,
+                        'user_id': task_data.user_id.name,
+                        'task_id': "%d/%d" % (project.id, task_data.id),
+                        'date_start': task_data.date_start,
+                        'date': task_data.date_end,
+                        'state': task_data.state
+                }
+                header = (project.warn_header or '') % val
+                footer = (project.warn_footer or '') % val
+                description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
+                result.update({'description': description or False})
+
+            if 'email_to' in fields:
+                result.update({'email_to':   manager and manager.user_email or False})
+
+            if partner and len(partner.address) and 'email_to' in fields:
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
+
+            if 'name' in fields:
+                result.update({'name':  _("Task '%s' Closed") % task_data.name})
+
+            if 'model' in fields:
+                result.update({'model':context.get('active_model')})
+
+            if 'res_id' in fields:
+                result.update({'res_id':context.get('active_id')})
+
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ef39b5daad9..11ced59634b 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -109,7 +109,7 @@
                                                         <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
                                                         <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                                        <button name="%(project.action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
+                                                        <button name="%(emails.action_email_compose_message_wizard)d" context="{'mail':'new'}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
                                                     </group>
                                                  </page>
                                                 <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">

From c8c3287bcc11f636dbbf512c7051801cc2df49ff Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Feb 2011 17:14:33 +0530
Subject: [PATCH 23/27] [IMP] hr_evluation :- integrate email.compose.message
 wizard. if active_model=ir.ui.menu then visible reffere document field and
 select the record and then send mail.

bzr revid: ysa@tinyerp.com-20110222114433-riy38xpuuptpzblf
---
 addons/emails/wizard/email_compose_message.py | 21 +++++++++++++++
 .../wizard/email_compose_message_view.xml     |  4 +++
 addons/hr_evaluation/__openerp__.py           |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 27 ++++++++++++++-----
 addons/hr_evaluation/wizard/__init__.py       |  3 ++-
 5 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/addons/emails/wizard/email_compose_message.py b/addons/emails/wizard/email_compose_message.py
index 738b1561119..184677d29ba 100644
--- a/addons/emails/wizard/email_compose_message.py
+++ b/addons/emails/wizard/email_compose_message.py
@@ -31,6 +31,7 @@ class email_compose_message(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
+
         result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
         message_pool = self.pool.get('email.message')
         message_id = context.get('message_id', False)
@@ -98,13 +99,33 @@ class email_compose_message(osv.osv_memory):
             if 'debug' in fields:
                 result['debug'] = message_data and message_data.debug
 
+        if 'model' in fields and context.get('email_model',False):
+            result['model'] = context.get('email_model')
+
         return result
 
+    def _get_records(self, cr, uid, context=None):
+        """
+        Return Records of particular  Model
+        """
+        if context is None:
+            context = {}
+        record_ids = []
+        if context.get('email_model',False):
+            model_pool =  self.pool.get(context.get('email_model'))
+            record_ids = model_pool.search(cr, uid, [])
+            return model_pool.name_get(cr, uid, record_ids, context)
+        return record_ids
+
     _columns = {
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'debug':fields.boolean('Debug', readonly=True),
+        'resource_id':fields.selection(_get_records, 'Referred Document'),
     }
 
+    def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
+        return {'value':{}}
+
     def save_to_drafts(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/emails/wizard/email_compose_message_view.xml b/addons/emails/wizard/email_compose_message_view.xml
index f23a718ad76..091888f3508 100644
--- a/addons/emails/wizard/email_compose_message_view.xml
+++ b/addons/emails/wizard/email_compose_message_view.xml
@@ -9,6 +9,10 @@
             <field name="arch" type="xml">
                 <form string="Reply Email">
                     <group col="6" colspan="4">
+                        <field name="model" invisible="1"/>
+                        <field name="resource_id" invisible="context.get('active_model','') != 'ir.ui.menu'"
+                            colspan="4" on_change="on_change_referred_doc(model, resource_id)"/>
+                        <field name="res_id" invisible="1"/>
                         <field name="smtp_server_id" widget="selection" colspan="4"/>
                         <field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index ec78dcc8643..b7cfaf96489 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -41,7 +41,7 @@
     "update_xml": [
         "security/ir.model.access.csv",
         "security/hr_evaluation_security.xml",
-        "wizard/hr_evaluation_mail_view.xml",
+#        "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",
         "board_hr_evaluation_view.xml"
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 99f34f7cc7b..b144946a685 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -250,12 +250,12 @@
             <field name="arch" type="xml">
                 <search string="Search Evaluation">
                    <group col='10' colspan='4'>
-                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>                                       
+                    <filter icon="terp-check" string="Current" domain="[('state','=','wait'))]" help="Evaluations that are in waiting state"/>
                     <filter icon="terp-camera_test" string="In progress" domain="[('state','=','progress')]" help="Evaluations that are in progress state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-week" string="7 Days" help="Evaluations to close within the next 7 days"
                         domain="[('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" />
-                    <separator orientation="vertical"/> 
+                    <separator orientation="vertical"/>
                     <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                         help="Evaluations that overpassed the deadline" domain="[('date','&lt;=',(datetime.date.today()).strftime('%%Y-%%m-%%d'))]" />
                     <separator orientation="vertical"/>
@@ -399,17 +399,30 @@
             <field name="act_window_id" ref="action_hr_evaluation_interview_tree"/>
         </record>
 
+
+        <!-- Email Compose message Action-->
+        <record id="action_email_compose_message_menu_wizard" model="ir.actions.act_window">
+            <field name="name">Send E-mail</field>
+            <field name="res_model">email.compose.message</field>
+            <field name="src_model">email.compose.message</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="context">{'email_model':'hr.evaluation.interview'}</field>
+            <field name="target">new</field>
+        </record>
+
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
         <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
-           action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
+           action="action_email_compose_message_menu_wizard" sequence="45" groups="base.group_hr_manager"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
-      <act_window 
+      <act_window
       context="{'search_default_user_to_review_id': [active_id]}"
-      id="act_hr_employee_2_hr__evaluation_interview" 
-      name="Evaluation Interviews" 
-      res_model="hr.evaluation.interview" 
+      id="act_hr_employee_2_hr__evaluation_interview"
+      name="Evaluation Interviews"
+      res_model="hr.evaluation.interview"
       src_model="hr.employee"/>
 
     </data>
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/hr_evaluation/wizard/__init__.py
index 1a855087bbc..7036af4f659 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/hr_evaluation/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
-import hr_evaluation_mail
+#import hr_evaluation_mail
+import email_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c4352d9801ce72a3c5c458be4cba56d101add323 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Feb 2011 17:15:15 +0530
Subject: [PATCH 24/27] [ADD] hr_evaluation:- add email.compose.message wizard
 file.

bzr revid: ysa@tinyerp.com-20110222114515-3dc7erpdgli7r3lv
---
 .../wizard/email_compose_message.py           | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 addons/hr_evaluation/wizard/email_compose_message.py

diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py
new file mode 100644
index 00000000000..9dc5f959a71
--- /dev/null
+++ b/addons/hr_evaluation/wizard/email_compose_message.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+from tools.translate import _
+
+class email_compose_message(osv.osv_memory):
+    _inherit = 'email.compose.message'
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
+        if context.get('email_model',False) and context.get('email_model') == 'hr.evaluation.interview' and 'model' in fields:
+            result['model'] = context.get('email_model','')
+        return result
+
+    def _get_records(self, cr, uid, context=None):
+        """
+        Return Records of particular  Model
+        """
+        if context is None:
+            context = {}
+        record_ids = []
+        if context.get('email_model',False) and context.get('email_model') == 'hr.evaluation.interview':
+            model_pool =  self.pool.get(context.get('email_model'))
+            record_ids = model_pool.search(cr, uid, [('state','=','waiting_answer')])
+            return model_pool.name_get(cr, uid, record_ids, context)
+        else:
+            return super(email_compose_message, self)._get_records(cr, uid, context=context)
+
+    _columns = {
+        'resource_id':fields.selection(_get_records, 'Referred Document'),
+    }
+
+    def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
+        if context is None:
+            context = {}
+        result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context)
+        value = {}
+        if not result.get('value'):
+            result.update({'value':{}})
+
+        if model == 'hr.evaluation.interview' and resource_id:
+            model_pool = self.pool.get(model)
+            record_data = model_pool.browse(cr, uid, resource_id, context)
+            if record_data.state == "waiting_answer":
+                msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,")  %(record_data.user_to_review_id.name, record_data.survey_id.title)
+                result['value'].update({'email_from': tools.config.get('email_from','')})
+                result['value'].update({'email_to': record_data.user_to_review_id.work_email or False})
+                result['value'].update({'name': _("Reminder to fill up Survey")})
+                result['value'].update({'description': msg })
+                result['value'].update({'res_id': resource_id})
+        return result
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 30bde91c88d539c5b41276df683fed89070165dc Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 23 Feb 2011 14:57:08 +0530
Subject: [PATCH 25/27] [ADD] email_template :- inherit email.compose.message
 wizard and add template_id field. on template_id field get template and
 change the value of wizard.

bzr revid: ysa@tinyerp.com-20110223092708-aibiuj5ojw41y6ky
---
 addons/email_template/__openerp__.py          |  1 +
 addons/email_template/email_template.py       |  1 +
 addons/email_template/wizard/__init__.py      |  1 +
 .../wizard/email_compose_message.py           | 83 +++++++++++++++++++
 .../wizard/email_compose_message_view.xml     | 21 +++++
 addons/emails/wizard/email_compose_message.py | 15 +++-
 .../wizard/email_compose_message_view.xml     |  6 +-
 7 files changed, 121 insertions(+), 7 deletions(-)
 create mode 100644 addons/email_template/wizard/email_compose_message.py
 create mode 100644 addons/email_template/wizard/email_compose_message_view.xml

diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 2f21631b7d7..fb89261f516 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -36,6 +36,7 @@
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
         'wizard/email_template_send_wizard_view.xml',
+        'wizard/email_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
     "installable": True,
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 59025fa5162..0823638c614 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -168,6 +168,7 @@ This is useful for CRM leads for example"),
              " body for displaying the info in your mail.",
              store=False),
         'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
+        'model': fields.related('model_id','model', type='char', size=128, string='Object'),
     }
 
     _sql_constraints = [
diff --git a/addons/email_template/wizard/__init__.py b/addons/email_template/wizard/__init__.py
index 006106a0263..1bac2d4aaad 100644
--- a/addons/email_template/wizard/__init__.py
+++ b/addons/email_template/wizard/__init__.py
@@ -21,4 +21,5 @@
 ##############################################################################
 import email_template_preview
 import email_template_send_wizard
+import email_compose_message
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
new file mode 100644
index 00000000000..c18ad815b66
--- /dev/null
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+import tools
+
+class email_compose_message(osv.osv_memory):
+    _name = 'email.compose.message'
+    _inherit = 'email.compose.message'
+
+    def _get_templates(self, cr, uid, context=None):
+        """
+        Return Email Template of particular  Model.
+        """
+        if context is None:
+            context = {}
+        record_ids = []
+        email_temp_pool = self.pool.get('email.template')
+        model = False
+        if context.get('email_model',False):
+            model =  context.get('email_model')
+        elif context.get('active_model',False):
+            model =  context.get('active_model')
+        if model:
+            record_ids = email_temp_pool.search(cr, uid, [('model','=',model)])
+            return email_temp_pool.name_get(cr, uid, record_ids, context)
+        return []
+
+    _columns = {
+        'template_id': fields.selection(_get_templates, 'Template'),
+    }
+
+    def on_change_template(self, cr, uid, ids, model, resource_id, template_id, context=None):
+        if context is None:
+            context = {}
+        email_temp_previ_pool = self.pool.get('email_template.preview')
+        result = self.on_change_referred_doc(cr, uid, [],  model, resource_id, context=context)
+        vals = result.get('value',{})
+        if template_id and resource_id:
+            context.update({'template_id': template_id})
+            value = email_temp_previ_pool.on_change_ref(cr, uid, [], resource_id, context)
+            new_value = value.get('value',{})
+            if vals.get('email_from'):
+                new_value.get('email_from') and new_value.update({'email_from': new_value.get('email_from') + ',' + vals.get('email_from')}) or vals.get('email_from')
+
+            if vals.get('email_to'):
+                new_value.update({'email_to': new_value.get('email_to') + ',' + vals.get('email_to')}) or vals.get('email_to')
+
+            if vals.get('email_cc'):
+                new_value.get('email_cc') and new_value.update({'email_cc': new_value.get('email_cc') + ',' + vals.get('email_cc')}) or vals.get('email_cc')
+
+            if vals.get('email_bcc'):
+                new_value.get('email_bcc') and new_value.update({'email_bcc': new_value.get('email_bcc') + ',' + vals.get('email_bcc')}) or vals.get('email_bcc')
+
+            if vals.get('reply_to'):
+                new_value.get('reply_to') and new_value.update({'reply_to': new_value.get('reply_to') + ',' + vals.get('reply_to')}) or vals.get('reply_to')
+
+            vals.update(new_value)
+            vals.update({'name': new_value.get('subject','')})
+        return {'value': vals}
+
+email_compose_message()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
new file mode 100644
index 00000000000..0daf7680d86
--- /dev/null
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+        <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form">
+            <field name="name">email.compose.message.form</field>
+            <field name="model">email.compose.message</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="emails.email_compose_message_wizard_form"/>
+            <field name="arch" type="xml">
+	            <field name="res_id" position="replace">
+	                <field name="template_id" colspan="4"
+	                    on_change="on_change_template(model, res_id, template_id)"/>
+	                <field name="res_id"
+						invisible="context.get('active_model','') != 'ir.ui.menu'"
+						colspan="4" on_change="on_change_template(model, res_id, template_id)"/>
+	            </field>
+            </field>
+        </record>
+	</data>
+</openerp>
diff --git a/addons/emails/wizard/email_compose_message.py b/addons/emails/wizard/email_compose_message.py
index 184677d29ba..c93a9c884b5 100644
--- a/addons/emails/wizard/email_compose_message.py
+++ b/addons/emails/wizard/email_compose_message.py
@@ -111,16 +111,23 @@ class email_compose_message(osv.osv_memory):
         if context is None:
             context = {}
         record_ids = []
+        model_pool = False
         if context.get('email_model',False):
-            model_pool =  self.pool.get(context.get('email_model'))
+            model =  context.get('email_model')
+            model_pool =  self.pool.get(model)
             record_ids = model_pool.search(cr, uid, [])
+        elif context.get('active_model',False):
+            model =  context.get('active_model')
+            model_pool =  self.pool.get(model)
+            record_ids = context.get('active_ids',[])
+        if model_pool:
             return model_pool.name_get(cr, uid, record_ids, context)
-        return record_ids
+        return []
 
     _columns = {
         'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'debug':fields.boolean('Debug', readonly=True),
-        'resource_id':fields.selection(_get_records, 'Referred Document'),
+        'res_id':fields.selection(_get_records, 'Referred Document'),
     }
 
     def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
@@ -148,7 +155,7 @@ class email_compose_message(osv.osv_memory):
                 attachment.append((attach.datas_fname, attach.datas))
             email_id = email_message_pool.email_send(cr, uid, mail.email_from, mail.email_to, mail.name, mail.description,
                     model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to,
-                    attach=attachment, message_id=mail.message_id, openobject_id=mail.res_id, debug=mail.debug,
+                    attach=attachment, message_id=mail.message_id, openobject_id=int(mail.res_id), debug=mail.debug,
                     subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context)
             email_ids.append(email_id)
         return email_ids
diff --git a/addons/emails/wizard/email_compose_message_view.xml b/addons/emails/wizard/email_compose_message_view.xml
index 091888f3508..52860e15c67 100644
--- a/addons/emails/wizard/email_compose_message_view.xml
+++ b/addons/emails/wizard/email_compose_message_view.xml
@@ -10,14 +10,14 @@
                 <form string="Reply Email">
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
-                        <field name="resource_id" invisible="context.get('active_model','') != 'ir.ui.menu'"
-                            colspan="4" on_change="on_change_referred_doc(model, resource_id)"/>
-                        <field name="res_id" invisible="1"/>
+                        <field name="res_id" invisible="context.get('active_model','') != 'ir.ui.menu'"
+                            colspan="4" on_change="on_change_referred_doc(model, res_id)"/>
                         <field name="smtp_server_id" widget="selection" colspan="4"/>
                         <field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>
                         <field name="email_cc" colspan="4"/>
                         <field name="email_bcc" colspan="4"/>
+                        <field name="reply_to" colspan="4"/>
                         <field name="name" colspan="4" widget="char" size="512"/>
                     </group>
                     <separator string="" colspan="4"/>

From 174534ff5ebec7f93d46120db7ecc1f45e4ce53e Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 23 Feb 2011 17:52:28 +0530
Subject: [PATCH 26/27] [IMP] email_template, emails:- message id and reference
 write in message add reference argument in email_send method.

bzr revid: ysa@tinyerp.com-20110223122228-iyzw7mdfvw0zrzw8
---
 addons/email_template/email_template.py       |  4 ++--
 .../wizard/email_compose_message.py           | 10 +++++++++-
 addons/emails/email_message.py                | 12 +++++++++---
 addons/emails/email_view.xml                  |  1 +
 addons/emails/wizard/email_compose_message.py | 19 ++++++++++++++++---
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 0823638c614..3d06fb5915c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -477,7 +477,7 @@ class email_message(osv.osv):
         return result
 
     def email_send(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None, email_bcc=None, reply_to=False, attach=None,
-            message_id=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None):
+            message_id=False, references=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None):
         if context is None:
             context = {}
         notemplate = context.get('notemplate', True)
@@ -489,7 +489,7 @@ class email_message(osv.osv):
                 return template_pool.generate_email(cr, uid, template_id, openobject_id, context=context)
 
         return super(email_message, self).email_send(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc, email_bcc=email_bcc, reply_to=reply_to, attach=attach,
-                message_id=message_id, openobject_id=openobject_id, debug=debug, subtype=subtype, x_headers=x_headers, priority=priority, smtp_server_id=smtp_server_id, context=context)
+                message_id=message_id, references=references, openobject_id=openobject_id, debug=debug, subtype=subtype, x_headers=x_headers, priority=priority, smtp_server_id=smtp_server_id, context=context)
 
 email_message()
 
diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index c18ad815b66..f9902859795 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -36,7 +36,11 @@ class email_compose_message(osv.osv_memory):
         record_ids = []
         email_temp_pool = self.pool.get('email.template')
         model = False
-        if context.get('email_model',False):
+        if context.get('message_id'):
+            message_pool = self.pool.get('email.message')
+            message_data = message_pool.browse(cr, uid, int(context.get('message_id')), context)
+            model = message_data.model
+        elif context.get('email_model',False):
             model =  context.get('email_model')
         elif context.get('active_model',False):
             model =  context.get('active_model')
@@ -55,6 +59,10 @@ class email_compose_message(osv.osv_memory):
         email_temp_previ_pool = self.pool.get('email_template.preview')
         result = self.on_change_referred_doc(cr, uid, [],  model, resource_id, context=context)
         vals = result.get('value',{})
+        if template_id:
+            email_temp_pool = self.pool.get('email.template')
+            email_temp_data = email_temp_pool.browse(cr, uid, template_id, context)
+            vals.update({'smtp_server_id': email_temp_data.smtp_server_id and email_temp_data.smtp_server_id.id or False})
         if template_id and resource_id:
             context.update({'template_id': template_id})
             value = email_temp_previ_pool.on_change_ref(cr, uid, [], resource_id, context)
diff --git a/addons/emails/email_message.py b/addons/emails/email_message.py
index ec2aa7ccca0..f51b19df207 100644
--- a/addons/emails/email_message.py
+++ b/addons/emails/email_message.py
@@ -85,6 +85,10 @@ class email_message_template(osv.osv_memory):
         'description': fields.text('Description', translate=True),
         'smtp_server_id':fields.many2one('email.smtp_server', 'SMTP Server'),
     }
+    _defaults = {
+        'references': lambda * a: None,
+    }
+
     _sql_constraints = []
 email_message_template()
 
@@ -247,7 +251,7 @@ class email_message(osv.osv):
                                  _("Error sending mail: %s") % e)
 
     def email_send(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None, email_bcc=None, reply_to=False, attach=None,
-            message_id=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None):
+            message_id=False, references=False, openobject_id=False, debug=False, subtype='plain', x_headers={}, priority='3', smtp_server_id=False, context=None):
         attachment_obj = self.pool.get('ir.attachment')
         if email_to and type(email_to) != list:
             email_to = [email_to]
@@ -269,6 +273,7 @@ class email_message(osv.osv):
                 'reply_to': reply_to,
                 'res_id': openobject_id,
                 'message_id': message_id,
+                'references': references,
                 'sub_type': subtype or '',
                 'headers': x_headers or False,
                 'priority': priority,
@@ -327,7 +332,8 @@ class email_message(osv.osv):
                         email_cc=message.email_cc and message.email_cc.split(',') or [],
                         email_bcc=message.email_bcc and message.email_bcc.split(',') or [],
                         reply_to=message.reply_to,
-                        attach=attachments, message_id=message.message_id, openobject_id=message.res_id,
+                        attach=attachments, message_id=message.message_id, references = message.references,
+                        openobject_id=message.res_id,
                         subtype=message.sub_type,
                         x_headers=message.headers and eval(message.headers) or {},
                         priority=message.priority, debug=message.debug,
@@ -337,7 +343,7 @@ class email_message(osv.osv):
                         smtp_user=smtp_server and smtp_server.smtpuname or None,
                         smtp_password=smtp_server and smtp_server.smtppass or None)
                 if res:
-                    self.write(cr, uid, [message.id], {'state':'sent'}, context)
+                    self.write(cr, uid, [message.id], {'state':'sent', 'message_id': res}, context)
                 else:
                     self.write(cr, uid, [message.id], {'state':'exception'}, context)
             except Exception, error:
diff --git a/addons/emails/email_view.xml b/addons/emails/email_view.xml
index 4680ece3ee3..a88764dd883 100644
--- a/addons/emails/email_view.xml
+++ b/addons/emails/email_view.xml
@@ -37,6 +37,7 @@
 	                                <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
 	                                context="{'mail':'reply', 'message_id':active_id}"/>
                                 </group>
+                                <field name="references" widget="char" size="4096"/>
                             </group>
                             <separator string="Description" colspan="4"/>
                             <field name="description" nolabel="1" colspan="4"/>
diff --git a/addons/emails/wizard/email_compose_message.py b/addons/emails/wizard/email_compose_message.py
index c93a9c884b5..a99f6d73513 100644
--- a/addons/emails/wizard/email_compose_message.py
+++ b/addons/emails/wizard/email_compose_message.py
@@ -112,10 +112,17 @@ class email_compose_message(osv.osv_memory):
             context = {}
         record_ids = []
         model_pool = False
-        if context.get('email_model',False):
+        if context.get('message_id'):
+            message_pool = self.pool.get('email.message')
+            message_data = message_pool.browse(cr, uid, int(context.get('message_id')), context)
+            model_pool =  self.pool.get(message_data.model)
+            record_ids = [message_data.res_id]
+        elif context.get('email_model',False):
             model =  context.get('email_model')
             model_pool =  self.pool.get(model)
-            record_ids = model_pool.search(cr, uid, [])
+            record_ids = context.get('record_ids',[])
+            if not record_ids:
+                record_ids = model_pool.search(cr, uid, [])
         elif context.get('active_model',False):
             model =  context.get('active_model')
             model_pool =  self.pool.get(model)
@@ -153,9 +160,15 @@ class email_compose_message(osv.osv_memory):
         for mail in self.browse(cr, uid, ids, context=context):
             for attach in mail.attachment_ids:
                 attachment.append((attach.datas_fname, attach.datas))
+            references = False
+            message_id = False
+            if context.get('mail',False) == 'reply' and  mail.message_id:
+                references = mail.references and str(mail.references) != 'False' and mail.references + "," + mail.message_id or mail.message_id
+            else:
+                message_id = mail.message_id
             email_id = email_message_pool.email_send(cr, uid, mail.email_from, mail.email_to, mail.name, mail.description,
                     model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to,
-                    attach=attachment, message_id=mail.message_id, openobject_id=int(mail.res_id), debug=mail.debug,
+                    attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id), debug=mail.debug,
                     subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context)
             email_ids.append(email_id)
         return email_ids

From bf37d84341a46cfcb5855c2b54ee04f0ec974d6d Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 23 Feb 2011 21:52:49 +0530
Subject: [PATCH 27/27] [IMP] email_template, emails:- improve default set
 value. context pass on onchange method and check in method if mail is reply
 then donot change the value in send mail wizard.

bzr revid: ysa@tinyerp.com-20110223162249-ruiaknvx0i9o4xec
---
 addons/email_template/wizard/email_compose_message.py       | 2 ++
 addons/email_template/wizard/email_compose_message_view.xml | 4 ++--
 addons/emails/wizard/email_compose_message_view.xml         | 2 +-
 addons/hr_evaluation/wizard/email_compose_message.py        | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py
index f9902859795..047e1eaf83c 100644
--- a/addons/email_template/wizard/email_compose_message.py
+++ b/addons/email_template/wizard/email_compose_message.py
@@ -56,6 +56,8 @@ class email_compose_message(osv.osv_memory):
     def on_change_template(self, cr, uid, ids, model, resource_id, template_id, context=None):
         if context is None:
             context = {}
+        if context.get('mail') == 'reply':
+            return {'value':{}}
         email_temp_previ_pool = self.pool.get('email_template.preview')
         result = self.on_change_referred_doc(cr, uid, [],  model, resource_id, context=context)
         vals = result.get('value',{})
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index 0daf7680d86..22ec87952f0 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -10,10 +10,10 @@
             <field name="arch" type="xml">
 	            <field name="res_id" position="replace">
 	                <field name="template_id" colspan="4"
-	                    on_change="on_change_template(model, res_id, template_id)"/>
+	                    on_change="on_change_template(model, res_id, template_id, context)"/>
 	                <field name="res_id"
 						invisible="context.get('active_model','') != 'ir.ui.menu'"
-						colspan="4" on_change="on_change_template(model, res_id, template_id)"/>
+						colspan="4" on_change="on_change_template(model, res_id, template_id, context)"/>
 	            </field>
             </field>
         </record>
diff --git a/addons/emails/wizard/email_compose_message_view.xml b/addons/emails/wizard/email_compose_message_view.xml
index 52860e15c67..9cb9a6d43fc 100644
--- a/addons/emails/wizard/email_compose_message_view.xml
+++ b/addons/emails/wizard/email_compose_message_view.xml
@@ -11,7 +11,7 @@
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="context.get('active_model','') != 'ir.ui.menu'"
-                            colspan="4" on_change="on_change_referred_doc(model, res_id)"/>
+                            colspan="4" on_change="on_change_referred_doc(model, res_id, context)"/>
                         <field name="smtp_server_id" widget="selection" colspan="4"/>
                         <field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>
diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py
index 9dc5f959a71..1b72fff3f2e 100644
--- a/addons/hr_evaluation/wizard/email_compose_message.py
+++ b/addons/hr_evaluation/wizard/email_compose_message.py
@@ -56,6 +56,8 @@ class email_compose_message(osv.osv_memory):
     def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
         if context is None:
             context = {}
+        if context.get('mail') == 'reply':
+            return {'value':{}}
         result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context)
         value = {}
         if not result.get('value'):