odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] crm_parner_assign, crm: Corrected history[whole, laetst, case info] for lead forword to its nearest partner email wizard 

bzr revid: ron@tinyerp.com-20111130120640-t6l8pec0fb6pehjq
This commit is contained in:
ron@tinyerp.com 2011-11-30 17:36:40 +05:30
parent e1fbd4ad7a
commit f56cc312e4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm_lead.py
View File

@ -422,7 +422,7 @@ class crm_lead(crm_case, osv.osv):
else:
value = lead[field_name]
body.append("%s: %s\n" % (field.string, value or ''))
body.append("%s: %s" % (field.string, value or ''))
return "\n".join(body + ['---'])
def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):

5
addons/crm_partner_assign/wizard/crm_forward_to_partner.py
View File

@ -66,8 +66,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
res_id = context.get('active_id')
model = context.get('active_model')
lead = self.pool.get(model).browse(cr, uid, res_id, context)
body_text = self._get_info_body_text(cr, uid, lead, context=context)
context['mail.compose.message.body'] = history_type
body_text = self._get_message_body_text(cr, uid, lead, history_type, context=context)
if body_text:
res = {'value': {'body_text' : body_text}}
return res
@ -171,7 +170,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
to = 'To: %s' % (message.email_to or '')
sentdate = 'Date: %s' % (message.date or '')
desc = '\n%s'%(message.body_text)
original = [header, sender, to, sentdate, desc]
original = [header, sender, to, sentdate, desc, '\n']
original = '\n'.join(original)
body += original
return body or ''