diff options
Diffstat (limited to 'addons/hr_recruitment/wizard')
| -rw-r--r-- | addons/hr_recruitment/wizard/email_compose_message.py | 5 | ||||
| -rw-r--r-- | addons/hr_recruitment/wizard/hr_recruitment_phonecall.py | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/addons/hr_recruitment/wizard/email_compose_message.py b/addons/hr_recruitment/wizard/email_compose_message.py index f5cc4883ef3..b2890de02a6 100644 --- a/addons/hr_recruitment/wizard/email_compose_message.py +++ b/addons/hr_recruitment/wizard/email_compose_message.py @@ -25,7 +25,7 @@ import tools class email_compose_message(osv.osv_memory): - _inherit = 'email.compose.message' + _inherit = 'mail.compose.message' def get_value(self, cr, uid, model, resource_id, context=None): ''' @@ -45,13 +45,12 @@ class email_compose_message(osv.osv_memory): 'subject' : data.name or False, 'email_to' : data.email_from or False, 'email_from' : data.user_id and data.user_id.address_id and data.user_id.address_id.email or False, - 'body' : '\n' + (tools.ustr(data.user_id.signature or '')), + 'body_text' : '\n' + (tools.ustr(data.user_id.signature or '')), 'email_cc' : tools.ustr(data.email_cc or ''), 'model': model, 'res_id': resource_id, }) return result -email_compose_message() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py index e07e1442700..cd9cbea52f7 100644 --- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py +++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py @@ -50,7 +50,7 @@ class job2phonecall(osv.osv_memory): return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False def _get_note(self, cr, uid, context=None): - msg_obj = self.pool.get('email.message') + mail_message = self.pool.get('mail.message') if context is None: context = {} if context.get('active_id'): @@ -58,9 +58,9 @@ class job2phonecall(osv.osv_memory): if case.description: return case.description else: - msg_ids = msg_obj.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1) + msg_ids = mail_message.search(cr, uid, [('model', '=', 'hr.applicant'), ('res_id', '=', case.id), ('email_from', '!=', ''), ('email_to', '!=', '')], limit=1) if msg_ids: - return msg_obj.browse(cr, uid, msg_ids[0], context=context).description + return mail_message.browse(cr, uid, msg_ids[0], context=context).body_text return False |