pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] crm: Replace Details by Notes

Browse Source 
[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
This commit is contained in:
Stephane Wirtel
2010-04-09 16:35:44 +02:00
parent fa45d444e5
commit 615b6be349
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_fund_view.xml
+1 -1
View File
@@ -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">
addons/crm/crm_helpdesk_view.xml
+1 -1
View File
@@ -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"/>
addons/crm/crm_lead_view.xml
+2 -2
View File
@@ -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">
addons/crm/wizard/crm_send_email.py
+4 -1
View File
@@ -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 '')