[IMP] email.compose.message wizard:- improve code.
bzr revid: ysa@tinyerp.com-20110301065748-2mc5hygt3gcd0p70
This commit is contained in:
Yogesh (OpenERP)
parent
60650f789f
commit
67e07f8bd3
|
|
@ -34,73 +34,20 @@ class email_compose_message(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).get_value(cr, uid, model, resource_id, context=context)
|
||||
if model not in email_model:
|
||||
return result
|
||||
model_obj = self.pool.get(model)
|
||||
data = model_obj.browse(cr, uid , resource_id, context)
|
||||
result.update({
|
||||
'name' : data.name,
|
||||
'email_to' : data.email_from,
|
||||
'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 '')),
|
||||
'email_cc' : tools.ustr(data.email_cc or '')
|
||||
})
|
||||
if hasattr(data, 'section_id'):
|
||||
result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
|
||||
return result
|
||||
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
|
||||
if context.get('active_id',False) and context.get('email_model',False) and context.get('email_model') in email_model:
|
||||
vals = self.get_value(cr, uid, context.get('email_model'), context.get('active_id'), context)
|
||||
if 'name' in fields:
|
||||
result.update({'name' : vals.get('name','')})
|
||||
|
||||
if 'email_to' in fields:
|
||||
result.update({'email_to' : vals.get('email_to','')})
|
||||
|
||||
if 'email_from' in fields:
|
||||
result.update({'email_from' : vals.get('email_from','')})
|
||||
|
||||
if 'description' in fields:
|
||||
result.update({'description' : vals.get('description','')})
|
||||
|
||||
if 'model' in fields:
|
||||
result['model'] = context.get('email_model','')
|
||||
|
||||
if 'email_cc' in fields:
|
||||
result.update({'email_cc' : vals.get('email_cc','')})
|
||||
|
||||
if 'res_id' in fields:
|
||||
result['res_id'] = context.get('active_id',0)
|
||||
|
||||
if 'reply_to' in fields:
|
||||
result['reply_to'] = vals.get('reply_to','')
|
||||
|
||||
return result
|
||||
|
||||
def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if context.get('mail') == 'reply':
|
||||
return {'value':{}}
|
||||
result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context)
|
||||
value = {}
|
||||
if not result.get('value'):
|
||||
result.update({'value':{}})
|
||||
if resource_id and model in email_model:
|
||||
vals = self.get_value(cr, uid, model, resource_id, context)
|
||||
result['value'].update({
|
||||
'email_from': vals.get('email_from',''),
|
||||
'email_to': vals.get('email_to',''),
|
||||
'name': vals.get('name',''),
|
||||
'description': vals.get('description',''),
|
||||
'email_cc': vals.get('email_cc',''),
|
||||
'email_bcc': vals.get('email_bcc',''),
|
||||
'reply_to': vals.get('reply_to',''),
|
||||
})
|
||||
if model in email_model and resource_id:
|
||||
model_obj = self.pool.get(model)
|
||||
data = model_obj.browse(cr, uid , resource_id, context)
|
||||
result.update({
|
||||
'name' : data.name,
|
||||
'email_to' : data.email_from,
|
||||
'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 '')),
|
||||
'email_cc' : tools.ustr(data.email_cc or ''),
|
||||
'model': model,
|
||||
'res_id': resource_id,
|
||||
})
|
||||
if hasattr(data, 'section_id'):
|
||||
result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
|
||||
return result
|
||||
|
||||
email_compose_message()
|
||||
|
|
|
|||
|
|
@ -32,6 +32,32 @@ class email_compose_message(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
|
||||
if context.get('email_model') and context.get('active_id'):
|
||||
vals = self.get_value(cr, uid, context.get('email_model'), context.get('active_id'), context)
|
||||
if 'name' in fields and vals:
|
||||
result.update({'name' : vals.get('name','')})
|
||||
|
||||
if 'email_to' in fields and vals:
|
||||
result.update({'email_to' : vals.get('email_to','')})
|
||||
|
||||
if 'email_from' in fields and vals:
|
||||
result.update({'email_from' : vals.get('email_from','')})
|
||||
|
||||
if 'description' in fields and vals:
|
||||
result.update({'description' : vals.get('description','')})
|
||||
|
||||
if 'model' in fields and vals:
|
||||
result.update({'model' : vals.get('model','')})
|
||||
|
||||
if 'email_cc' in fields and vals:
|
||||
result.update({'email_cc' : vals.get('email_cc','')})
|
||||
|
||||
if 'res_id' in fields and vals:
|
||||
result.update({'res_id' : vals.get('res_id',0)})
|
||||
|
||||
if 'reply_to' in fields and vals:
|
||||
result['reply_to'] = vals.get('reply_to','')
|
||||
|
||||
message_pool = self.pool.get('email.message')
|
||||
message_id = context.get('message_id', False)
|
||||
if message_id:
|
||||
|
|
@ -136,7 +162,24 @@ class email_compose_message(osv.osv_memory):
|
|||
return {}
|
||||
|
||||
def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
|
||||
return {'value':{}}
|
||||
if context is None:
|
||||
context = {}
|
||||
if context.get('mail') == 'reply':
|
||||
return {'value':{}}
|
||||
result = {}
|
||||
if resource_id and model:
|
||||
vals = self.get_value(cr, uid, model, resource_id, context)
|
||||
if vals:
|
||||
result.update({
|
||||
'email_from': vals.get('email_from',''),
|
||||
'email_to': vals.get('email_to',''),
|
||||
'name': vals.get('name',''),
|
||||
'description': vals.get('description',''),
|
||||
'email_cc': vals.get('email_cc',''),
|
||||
'email_bcc': vals.get('email_bcc',''),
|
||||
'reply_to': vals.get('reply_to',''),
|
||||
})
|
||||
return {'value': result}
|
||||
|
||||
def on_change_smtp_server(self, cr, uid, ids, smtp_server_id, email_from, context=None):
|
||||
if not email_from and smtp_server_id:
|
||||
|
|
|
|||
|
|
@ -30,85 +30,37 @@ class email_compose_message(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).get_value(cr, uid, model, resource_id, context=context)
|
||||
if model != 'project.task':
|
||||
return result
|
||||
task_pool = self.pool.get('project.task')
|
||||
task_data = task_pool.browse(cr, uid, resource_id, context=context)
|
||||
partner = task_data.partner_id or task_data.project_id.partner_id
|
||||
|
||||
result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
|
||||
val = {
|
||||
'name': task_data.name,
|
||||
'user_id': task_data.user_id.name,
|
||||
'task_id': "%d/%d" % (task_data.project_id.id, task_data.id),
|
||||
'date_start': task_data.date_start,
|
||||
'date': task_data.date_end,
|
||||
'state': task_data.state
|
||||
}
|
||||
header = (task_data.project_id.warn_header or '') % val
|
||||
footer = (task_data.project_id.warn_footer or '') % val
|
||||
description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
|
||||
result.update({'description': description or False})
|
||||
result.update({'email_to': task_data.project_id.user_id and task_data.project_id.user_id.user_email or False})
|
||||
if partner and len(partner.address) and 'email_to' in fields:
|
||||
result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
|
||||
result.update({'name': _("Task '%s' Closed") % task_data.name})
|
||||
|
||||
return result
|
||||
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
|
||||
if context.get('active_id',False) and context.get('email_model',False) and context.get('email_model') == 'project.task':
|
||||
if model == 'project.task' and resource_id:
|
||||
task_pool = self.pool.get('project.task')
|
||||
task_data = task_pool.browse(cr, uid, context.get('active_id'), context=context)
|
||||
task_data = task_pool.browse(cr, uid, resource_id, context=context)
|
||||
partner = task_data.partner_id or task_data.project_id.partner_id
|
||||
|
||||
if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
|
||||
raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
|
||||
elif task_data.project_id.warn_customer and (not partner or not len(partner.address) or (partner and len(partner.address) and not partner.address[0].email)):
|
||||
raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
|
||||
vals = self.get_value(cr, uid, context.get('email_model'), context.get('active_id'), context)
|
||||
if 'email_from' in fields:
|
||||
result.update({'email_from': vals.get('email_from','')})
|
||||
|
||||
if 'description' in fields:
|
||||
result.update({'description': vals.get('description','')})
|
||||
|
||||
if 'email_to' in fields:
|
||||
result.update({'description': vals.get('description','')})
|
||||
|
||||
if 'name' in fields:
|
||||
result.update({'description': vals.get('name','')})
|
||||
|
||||
if 'model' in fields:
|
||||
result.update({'model':context.get('email_model')})
|
||||
|
||||
if 'res_id' in fields:
|
||||
result.update({'res_id':context.get('active_id')})
|
||||
|
||||
return result
|
||||
|
||||
def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if context.get('mail') == 'reply':
|
||||
return {'value':{}}
|
||||
result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context)
|
||||
if not result.get('value'):
|
||||
result.update({'value':{}})
|
||||
if resource_id and model == 'project.task':
|
||||
vals = self.get_value(cr, uid, model, resource_id, context)
|
||||
result.get('value',{}).update({
|
||||
'email_from': vals.get('email_from',''),
|
||||
'email_to': vals.get('email_to',''),
|
||||
'description': vals.get('description',''),
|
||||
'name': vals.get('name',''),
|
||||
'email_cc': vals.get('email_cc',''),
|
||||
'email_bcc': vals.get('email_bcc',''),
|
||||
'reply_to': vals.get('reply_to',''),
|
||||
result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
|
||||
val = {
|
||||
'name': task_data.name,
|
||||
'user_id': task_data.user_id.name,
|
||||
'task_id': "%d/%d" % (task_data.project_id.id, task_data.id),
|
||||
'date_start': task_data.date_start,
|
||||
'date': task_data.date_end,
|
||||
'state': task_data.state
|
||||
}
|
||||
header = (task_data.project_id.warn_header or '') % val
|
||||
footer = (task_data.project_id.warn_footer or '') % val
|
||||
description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
|
||||
if partner and len(partner.address) and 'email_to' in fields:
|
||||
result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
|
||||
result.update({
|
||||
'description': 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,
|
||||
'model': model,
|
||||
'res_id': resource_id,
|
||||
})
|
||||
|
||||
return result
|
||||
|
||||
email_compose_message()
|
||||
|
|
|
|||
|
|
@ -30,72 +30,27 @@ class email_compose_message(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).get_value(cr, uid, model, resource_id, context=context)
|
||||
if model != 'project.scrum.meeting':
|
||||
return result
|
||||
meeting_pool = self.pool.get('project.scrum.meeting')
|
||||
user_pool = self.pool.get('res.users')
|
||||
meeting = meeting_pool.browse(cr, uid, resource_id, context=context)
|
||||
if model == 'project.scrum.meeting' and resource_id:
|
||||
meeting_pool = self.pool.get('project.scrum.meeting')
|
||||
user_pool = self.pool.get('res.users')
|
||||
meeting = meeting_pool.browse(cr, uid, resource_id, context=context)
|
||||
|
||||
sprint = meeting.sprint_id
|
||||
user_data = user_pool.browse(cr, uid, uid, context=context)
|
||||
result.update({'email_from': user_data.address_id and user_data.address_id.email or False})
|
||||
sprint = meeting.sprint_id
|
||||
user_data = user_pool.browse(cr, uid, uid, context=context)
|
||||
result.update({'email_from': user_data.address_id and user_data.address_id.email or False})
|
||||
|
||||
if sprint.scrum_master_id and sprint.scrum_master_id.user_email:
|
||||
result.update({'email_to': sprint.scrum_master_id.user_email})
|
||||
if sprint.product_owner_id and sprint.product_owner_id.user_email:
|
||||
result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + sprint.product_owner_id.user_email or sprint.product_owner_id.user_email})
|
||||
if sprint.scrum_master_id and sprint.scrum_master_id.user_email:
|
||||
result.update({'email_to': sprint.scrum_master_id.user_email})
|
||||
if sprint.product_owner_id and sprint.product_owner_id.user_email:
|
||||
result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + sprint.product_owner_id.user_email or sprint.product_owner_id.user_email})
|
||||
|
||||
subject = _("Scrum Meeting : %s") %(meeting.date)
|
||||
result.update({'name': subject})
|
||||
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({'description': message})
|
||||
return result
|
||||
|
||||
def default_get(self, cr, uid, fields, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
|
||||
|
||||
if context.get('active_id',False) and context.get('email_model',False) and context.get('email_model') == 'project.scrum.meeting':
|
||||
vals = self.get_value(cr, uid, context.get('email_model'), context.get('active_id'), context)
|
||||
if 'email_from' in fields:
|
||||
result.update({'email_from': vals.get('email_from','')})
|
||||
|
||||
if 'email_to' in fields:
|
||||
result.update({'email_to': vals.get('email_to','')})
|
||||
|
||||
if 'name' in fields:
|
||||
result.update({'name': vals.get('name','')})
|
||||
|
||||
if 'description' in fields:
|
||||
result.update({'description': vals.get('description','')})
|
||||
|
||||
if 'model' in fields:
|
||||
result.update({'model':context.get('email_model')})
|
||||
|
||||
if 'res_id' in fields:
|
||||
result.update({'res_id':context.get('active_id')})
|
||||
|
||||
return result
|
||||
|
||||
def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
if context.get('mail') == 'reply':
|
||||
return {'value':{}}
|
||||
result = super(email_compose_message, self).on_change_referred_doc(cr, uid, ids, model, resource_id, context=context)
|
||||
if not result.get('value'):
|
||||
result.update({'value':{}})
|
||||
if resource_id and model == 'project.scrum.meeting':
|
||||
vals = self.get_value(cr, uid, model, resource_id, context)
|
||||
result.get('value',{}).update({
|
||||
'email_from': vals.get('email_from',''),
|
||||
'email_to': vals.get('email_to',''),
|
||||
'description': vals.get('description',''),
|
||||
'name': vals.get('name',''),
|
||||
'email_cc': vals.get('email_cc',''),
|
||||
'email_bcc': vals.get('email_bcc',''),
|
||||
'reply_to': vals.get('reply_to',''),
|
||||
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,
|
||||
'model': model,
|
||||
'res_id': resource_id
|
||||
})
|
||||
return result
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue