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

[IMP] imporve action_send_mail method in related module. hr_recruitment :- call email.message.send.wizard in oprtunity instead of crm.send.mail wizard.

Browse Source 
bzr revid: ysa@tinyerp.com-20110218115120-flg9m13lady8yk40
This commit is contained in:
Yogesh (OpenERP)
2011-02-18 17:21:20 +05:30
parent 425d9b0877
commit 107467047c
7 changed files with 85 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead.py
+9 -8
View File
@@ -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',
addons/crm_claim/crm_claim.py
+3 -2
View File
@@ -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',
addons/crm_fundraising/crm_fundraising.py
+9 -8
View File
@@ -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',
addons/crm_helpdesk/crm_helpdesk.py
+9 -8
View File
@@ -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',
addons/event/event.py
+9 -8
View File
@@ -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',
addons/hr_recruitment/hr_recruitment.py
+32
View File
@@ -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 = {}
addons/hr_recruitment/hr_recruitment_view.xml
+14 -15
View File
@@ -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"/>