From f53ee6053a0e4f2ed8abbeee6469edf634de3d64 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Thu, 7 Apr 2011 18:20:24 +0530 Subject: [PATCH] [IMP] email.message.common: implemented active_id and active_model in default_get() and fix reference of fields subject and body bzr revid: rha@tinyerp.com-20110407125024-4354406jcb4ih2k9 --- addons/crm/wizard/email_compose_message.py | 4 ++-- .../wizard/crm_forward_to_partner.py | 2 +- .../email_template/wizard/email_compose_message.py | 8 ++++---- .../hr_evaluation/wizard/email_compose_message.py | 4 ++-- addons/mail/wizard/email_compose_message.py | 14 ++++++++------ addons/project/wizard/email_compose_message.py | 4 ++-- .../project_scrum/wizard/email_compose_message.py | 4 ++-- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/addons/crm/wizard/email_compose_message.py b/addons/crm/wizard/email_compose_message.py index 8f995b5e256..4bb55009c0e 100644 --- a/addons/crm/wizard/email_compose_message.py +++ b/addons/crm/wizard/email_compose_message.py @@ -38,10 +38,10 @@ class email_compose_message(osv.osv_memory): model_obj = self.pool.get(model) data = model_obj.browse(cr, uid , resource_id, context) result.update({ - 'name' : data.name or False, + '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, - 'description' : '\n' + (tools.ustr(data.user_id.signature or '')), + 'body' : '\n' + (tools.ustr(data.user_id.signature or '')), 'email_cc' : tools.ustr(data.email_cc or ''), 'model': model or False, 'res_id': resource_id or False, diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py index d586f23f371..bc0dd2ac0b6 100644 --- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py +++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py @@ -75,7 +75,7 @@ class crm_lead_forward_to_partner(osv.osv_memory): sender = 'From: %s' %(hist.email_from or '') to = 'To: %s' % (hist.email_to or '') sentdate = 'Date: %s' % (hist.date or '') - desc = '\n%s'%(hist.description) + desc = '\n%s'%(hist.body) original = [header, sender, to, sentdate, desc] original = '\n'.join(original) return original diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py index 0c584c98990..27dc53744bd 100644 --- a/addons/email_template/wizard/email_compose_message.py +++ b/addons/email_template/wizard/email_compose_message.py @@ -62,8 +62,8 @@ class email_compose_message(osv.osv_memory): result = super(email_compose_message, self).default_get(cr, uid, fields, context=context) template_id = context.get('template_id', False) vals = {} - if template_id and context.get('email_model') and context.get('email_res_id'): - vals = self.get_template_data(cr, uid, context.get('email_res_id'), template_id, context) + if template_id and context.get('active_model') and context.get('active_id'): + vals = self.get_template_data(cr, uid, context.get('active_id'), template_id, context) if not vals: return result @@ -116,8 +116,8 @@ class email_compose_message(osv.osv_memory): message_pool = self.pool.get('email.message') message_data = message_pool.browse(cr, uid, int(context.get('message_id')), context) model = message_data.model - elif context.get('email_model',False): - model = context.get('email_model') + elif context.get('active_model',False): + model = context.get('active_model') if model: record_ids = email_temp_pool.search(cr, uid, [('model','=',model)]) return email_temp_pool.name_get(cr, uid, record_ids, context) + [(False,'')] diff --git a/addons/hr_evaluation/wizard/email_compose_message.py b/addons/hr_evaluation/wizard/email_compose_message.py index da25dcd8cfc..40f679f4f53 100644 --- a/addons/hr_evaluation/wizard/email_compose_message.py +++ b/addons/hr_evaluation/wizard/email_compose_message.py @@ -57,8 +57,8 @@ class email_compose_message(osv.osv_memory): result.update({ 'email_from': tools.config.get('email_from',''), 'email_to': record_data.user_to_review_id.work_email or False, - 'name': _("Reminder to fill up Survey"), - 'description': msg, + 'subject': _("Reminder to fill up Survey"), + 'body': msg, 'res_id': resource_id, 'email_cc': False, 'email_bcc': False, diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py index 22779b076e4..fbc2ba58a63 100644 --- a/addons/mail/wizard/email_compose_message.py +++ b/addons/mail/wizard/email_compose_message.py @@ -33,12 +33,14 @@ class email_compose_message(osv.osv_memory): context = {} result = super(email_compose_message, self).default_get(cr, uid, fields, context=context) vals = {} - if context.get('email_model') and context.get('email_res_id'): - vals = self.get_value(cr, uid, context.get('email_model'), context.get('email_res_id'), context) - elif context.get('message_id', False): - vals = self.get_message_data(cr, uid, int(context.get('message_id', False)), context) + if context.get('active_model') and context.get('active_id') and not context.get('mail')=='reply': + vals = self.get_value(cr, uid, context.get('active_model'), context.get('active_id'), context) + + elif context.get('mail')=='reply' and context.get('active_id', False): + vals = self.get_message_data(cr, uid, int(context.get('active_id', False)), context) + else: - result['model'] = context.get('email_model', False) + result['model'] = context.get('active_model', False) if not vals: return result @@ -213,7 +215,7 @@ class email_compose_message(osv.osv_memory): message_id = mail.message_id email_id = email_message_pool.schedule_with_attach(cr, uid, mail.email_from, mail.email_to, mail.subject, mail.body, model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to, - attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id), debug=mail.debug, + attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id), subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context) email_ids.append(email_id) return email_ids diff --git a/addons/project/wizard/email_compose_message.py b/addons/project/wizard/email_compose_message.py index 68445661716..eb52604749e 100644 --- a/addons/project/wizard/email_compose_message.py +++ b/addons/project/wizard/email_compose_message.py @@ -54,9 +54,9 @@ class email_compose_message(osv.osv_memory): if partner and len(partner.address): result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email}) result.update({ - 'description': description or False, + 'body': description or False, 'email_to': task_data.project_id.user_id and task_data.project_id.user_id.user_email or False, - 'name': _("Task '%s' Closed") % task_data.name, + 'subject': _("Task '%s' Closed") % task_data.name, 'model': model, 'res_id': resource_id, }) diff --git a/addons/project_scrum/wizard/email_compose_message.py b/addons/project_scrum/wizard/email_compose_message.py index 1a639fbd198..12e7edb4e27 100644 --- a/addons/project_scrum/wizard/email_compose_message.py +++ b/addons/project_scrum/wizard/email_compose_message.py @@ -47,8 +47,8 @@ class email_compose_message(osv.osv_memory): subject = _("Scrum Meeting : %s") %(meeting.date) message = _("Hello , \nI am sending you Scrum Meeting : %s for the Sprint '%s' of Project '%s'") %(meeting.date, sprint.name, sprint.project_id.name) result.update({ - 'name': subject, - 'description': message, + 'subject': subject, + 'body': message, 'model': model, 'res_id': resource_id })