From 615b6be349c3f059343ebff6250c79ca1e2aec40 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@openerp.com>
Date: Fri, 9 Apr 2010 16:35:44 +0200
Subject: [PATCH] [FIX] crm: Replace Details by Notes [FIX] crm: Add the
 include_original flag in the context, to allows to include the original
 message for the "send new email" or "reply to email" functions

bzr revid: stephane@openerp.com-20100409143544-smmsfmtfqvrha3cx
---
 addons/crm/crm_fund_view.xml        | 2 +-
 addons/crm/crm_helpdesk_view.xml    | 2 +-
 addons/crm/crm_lead_view.xml        | 4 ++--
 addons/crm/wizard/crm_send_email.py | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 5b83b3802a6..a2a104adf15 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -129,7 +129,7 @@
                         <field name="date"/>
                         <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Details"/>
+                    <separator colspan="4" string="Notes"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index bf430eafc08..dc11b071a4c 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -58,7 +58,7 @@
                                 icon="gtk-go-forward" />
                         </group>
 
-                        <separator colspan="4" string="Details"/>
+                        <separator colspan="4" string="Notes"/>
                         <field name="description" colspan="4"
                                 nolabel="1" widget="text_tag" readonly="1" />
                         <separator colspan="4"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a54cf7c1621..829372fb30b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -168,9 +168,9 @@
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <button colspan="4"
-                                string="Reply to Email"
+                                string="Reply to Last Email"
                                 name="%(action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead'}"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                 icon="gtk-undo" type="action" />
                         </form>
                         <tree string="Communication history">
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 5fe6b18d06b..99f32443b36 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -182,6 +182,8 @@ class crm_send_new_email(osv.osv_memory):
         """
         hist_obj = self.pool.get('crm.case.history')
         res_ids = context and context.get('active_ids', []) or []
+
+        include_original = context and context.get('include_original', False) or False
         res = {}
         for hist in hist_obj.browse(cr, uid, res_ids):
             model = hist.log_id.model_id.model
@@ -193,7 +195,8 @@ class crm_send_new_email(osv.osv_memory):
                 res.update({'email_from': (case.section_id and case.section_id.reply_to) or \
                             (case.user_id and case.user_id.address_id and \
                             case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)})
-            if 'text' in fields:
+
+            if include_original == True and 'text' in fields:
                 header = '-------- Original Message --------'
                 sender = 'From: %s' %(hist.email_from or '')
                 to = 'To: %s' % (hist.email_to or '')