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

[MERGE] merged from ysa-emails-framework-addons branch

Browse Source 
bzr revid: hmo@tinyerp.com-20110301164608-l2n47qnoph0ko48q
This commit is contained in:
Harry (OpenERP)
2011-03-01 22:16:08 +05:30
parent d4d4411229 062c57e4b0
commit 3cd3ceea0a
17 changed files with 117 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_lead_view.xml
+2 -2
View File
@@ -108,7 +108,7 @@
<field name="email_from" widget="email"/>
<button string="Send Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'crm.lead'}"
context="{'email_model':'crm.lead', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action" colspan="1"/>
<newline/>
<field name="phone"/>
@@ -227,7 +227,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'crm.lead'}"
context="{'email_model':'crm.lead', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
</notebook>
addons/crm/crm_opportunity_view.xml
+2 -2
View File
@@ -61,7 +61,7 @@
<field name="email_from" string="Email" />
<button string="Send Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model': 'crm.lead'}"
context="{'email_model': 'crm.lead', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</group>
<field name="phone"/>
@@ -183,7 +183,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model': 'crm.lead'}"
context="{'email_model': 'crm.lead', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
addons/crm/wizard/email_compose_message.py
+4 -4
View File
@@ -38,13 +38,13 @@ 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,
'email_to' : data.email_from,
'name' : 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 '')),
'email_cc' : tools.ustr(data.email_cc or ''),
'model': model,
'res_id': resource_id,
'model': model or False,
'res_id': resource_id or False,
})
if hasattr(data, 'section_id'):
result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
addons/crm_claim/crm_claim_view.xml
+1 -1
View File
@@ -215,7 +215,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'crm.claim'}"
context="{'email_model':'crm.claim', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
</notebook>
addons/crm_fundraising/crm_fundraising_view.xml
+1 -1
View File
@@ -206,7 +206,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'crm.fundraising'}"
context="{'email_model':'crm.fundraising', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
addons/crm_helpdesk/crm_helpdesk_view.xml
+1 -1
View File
@@ -140,7 +140,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'crm.helpdesk'}"
context="{'email_model':'crm.helpdesk', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
addons/email_template/email_template.py
+1 -1
View File
@@ -191,7 +191,7 @@ This is useful for CRM leads for example"),
'res_model': 'email.compose.message',
'src_model': src_obj,
'view_type': 'form',
'context': "{'email_model':'%s','template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (src_obj, template.id),
'context': "{'email_model':'%s', 'email_res_id': active_id,'template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (src_obj, template.id),
'view_mode':'form,tree',
'view_id': res_id,
'target': 'new',
addons/email_template/wizard/email_compose_message.py
+56 -37
View File
@@ -26,55 +26,82 @@ import tools
class email_compose_message(osv.osv_memory):
_name = 'email.compose.message'
_inherit = 'email.compose.message'
def default_get(self, cr, uid, fields, context=None):
def get_template_data(self, cr, uid, res_id, template_id, context=None):
if context is None:
context = {}
result = super(email_compose_message, self).default_get(cr, uid, fields, context=context)
result = {}
template_pool = self.pool.get('email.template')
model_pool = self.pool.get('ir.model')
template_id = context.get('template_id', False)
if template_id:
template = template_pool.get_email_template(cr, uid, template_id=template_id, context=context)
def _get_template_value(field):
if not template:
return False
if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets original template values for multiple email change
if len(context.get('src_rec_ids',[])) > 1: # Multiple Mail: Gets original template values for multiple email change
return getattr(template, field)
else: # Simple Mail: Gets computed template values
return template_pool.get_template_value(cr, uid, getattr(template, field), template.model, context.get('active_id'), context)
return template_pool.get_template_value(cr, uid, getattr(template, field), template.model, context.get('email_res_id'), context)
result.update({
'template_id' : template.id,
'smtp_server_id' : template.smtp_server_id.id,
'description' : _get_template_value('description') or False,
'name' : _get_template_value('subject') or False,
'attachment_ids' : template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids'] or [],
'res_id' : res_id or False,
'email_to' : _get_template_value('email_to') or False,
'email_cc' : _get_template_value('email_cc') or False,
'email_bcc' : _get_template_value('email_bcc') or False,
'reply_to' : _get_template_value('reply_to') or False,
'model' : template.model or False,
})
return result
if 'template_id' in fields:
result['template_id'] = template.id
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)
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)
else:
result['model'] = context.get('email_model', False)
if 'smtp_server_id' in fields:
result['smtp_server_id'] = template.smtp_server_id.id
if not vals:
return result
if 'attachment_ids' in fields:
result['attachment_ids'] = template_pool.read(cr, uid, template.id, ['attachment_ids'])['attachment_ids']
if 'template_id' in fields:
result.update({'template_id' : vals.get('template_id', False)})
if 'model' in fields:
result['model'] = context.get('email_model')
if 'smtp_server_id' in fields:
result.update({'smtp_server_id' : vals.get('smtp_server_id', False)})
if 'res_id' in fields:
result['res_id'] = context.get('active_id')
if 'attachment_ids' in fields:
result.update({'attachment_ids' : vals.get('attachment_ids', False)})
if 'email_to' in fields:
result['email_to'] = _get_template_value('email_to')
if 'model' in fields:
result.update({'model' : vals.get('model', False)})
if 'email_cc' in fields:
result['email_cc'] = _get_template_value('email_cc')
if 'res_id' in fields:
result.update({'res_id' : vals.get('res_id', False)})
if 'email_bcc' in fields:
result['email_bcc'] = _get_template_value('email_bcc')
if 'email_to' in fields:
result.update({'email_to' : vals.get('email_to', False)})
if 'name' in fields:
result['name'] = _get_template_value('subject')
if 'email_cc' in fields:
result.update({'email_cc' : vals.get('email_cc', False)})
if 'description' in fields:
result['description'] = _get_template_value('description')
if 'email_bcc' in fields:
result.update({'email_bcc' : vals.get('email_bcc', False)})
if 'reply_to' in fields:
result['reply_to'] = _get_template_value('reply_to')
if 'name' in fields:
result.update({'name' : vals.get('name', False)})
if 'description' in fields:
result.update({'description' : vals.get('description', False)})
if 'reply_to' in fields:
result.update({'reply_to' : vals.get('reply_to', False)})
return result
@@ -107,18 +134,10 @@ class email_compose_message(osv.osv_memory):
context = {}
if context.get('mail') == 'reply':
return {'value':{}}
email_temp_previ_pool = self.pool.get('email_template.preview')
result = self.on_change_referred_doc(cr, uid, [], model, resource_id, context=context)
vals = result.get('value',{})
if template_id and resource_id:
email_temp_pool = self.pool.get('email.template')
email_temp_data = email_temp_pool.browse(cr, uid, template_id, context)
vals.update({'smtp_server_id': email_temp_data.smtp_server_id and email_temp_data.smtp_server_id.id or False})
context.update({'template_id': template_id})
value = email_temp_previ_pool.on_change_ref(cr, uid, [], resource_id, context)
vals.update(value.get('value',{}))
vals.update({'name': value.get('value',{}).get('subject','')})
vals.update({'attachment_ids' : email_temp_pool.read(cr, uid, template_id, ['attachment_ids'])['attachment_ids']})
vals.update(self.get_template_data(cr, uid, resource_id, template_id, context))
else:
vals.update({'attachment_ids' : []})
return {'value': vals}
addons/emails/wizard/email_compose_message.py
+33 -61
View File
@@ -93,7 +93,7 @@ class email_compose_message(osv.osv_memory):
if 'debug' in fields:
result['debug'] = vals.get('debug',False)
return result
def _get_records(self, cr, uid, context=None):
@@ -112,7 +112,7 @@ class email_compose_message(osv.osv_memory):
elif context.get('email_model',False):
model = context.get('email_model')
model_pool = self.pool.get(model)
record_ids = context.get('active_ids',[])
record_ids = context.get('email_res_id') and [context.get('email_res_id')] or []
if not record_ids:
record_ids = model_pool.search(cr, uid, [])
if model_pool:
@@ -135,68 +135,40 @@ class email_compose_message(osv.osv_memory):
message_pool = self.pool.get('email.message')
if message_id:
message_data = message_pool.browse(cr, uid, message_id, context)
if 'message_id' in fields:
result['message_id'] = message_data and message_data.message_id or False
subject = tools.ustr(message_data and message_data.name or '')
if context.get('mail','') == 'reply':
subject = "Re :- " + subject
if 'attachment_ids' in fields:
result['attachment_ids'] = message_data and message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids'] or []
description = message_data and message_data.description and message_data.description or ''
message_body = False
if context.get('mail','') == 'reply':
header = '-------- Original Message --------'
sender = 'From: %s' % tools.ustr(message_data.email_from or '')
email_to = 'To: %s' % tools.ustr(message_data.email_to or '')
sentdate = 'Date: %s' % message_data.date
desc = '\n > \t %s' % tools.ustr(description.replace('\n', "\n > \t") or '')
description = '\n'.join([header, sender, email_to, sentdate, desc])
if 'res_id' in fields:
result['res_id'] = message_data and message_data.res_id or False
result.update({
'description' : description,
'name' : subject,
'message_id' : message_data and message_data.message_id or False,
'attachment_ids' : message_data and message_pool.read(cr, uid, message_id, ['attachment_ids'])['attachment_ids'] or [],
'res_id' : message_data and message_data.res_id or False,
'email_from' : message_data and message_data.email_to or False,
'email_to' : message_data and message_data.email_from or False,
'email_cc' : message_data and message_data.email_cc or False,
'email_bcc' : message_data and message_data.email_bcc or False,
'reply_to' : message_data and message_data.reply_to or False,
'model' : message_data and message_data.model or False,
'user_id' : message_data and message_data.user_id and message_data.user_id.id or False,
'references' : message_data and message_data.references and tools.ustr(message_data.references) or False,
'sub_type' : message_data and message_data.sub_type or False,
'headers' : message_data and message_data.headers or False,
'priority' : message_data and message_data.priority or False,
'debug': message_data and message_data.debug or False
})
if 'email_from' in fields:
result['email_from'] = message_data and message_data.email_to or False
if 'email_to' in fields:
result['email_to'] = message_data and message_data.email_from or False
if 'email_cc' in fields:
result['email_cc'] = message_data and message_data.email_cc or False
if 'email_bcc' in fields:
result['email_bcc'] = message_data and message_data.email_bcc or False
if 'name' in fields:
result['name'] = tools.ustr(message_data and message_data.name or '')
if context.get('mail','') == 'reply':
result['name'] = "Re :- " + result['name']
if 'description' in fields:
description = message_data and message_data.description and message_data.description or ''
if context.get('mail','') == 'reply':
header = '-------- Original Message --------'
sender = 'From: %s' % tools.ustr(message_data.email_from or '')
email_to = 'To: %s' % tools.ustr(message_data.email_to or '')
sentdate = 'Date: %s' % message_data.date
desc = '\n > \t %s' % tools.ustr(description.replace('\n', "\n > \t") or '')
result['description'] = '\n'.join([header, sender, email_to, sentdate, desc])
else:
result['description'] = description
if 'reply_to' in fields:
result['reply_to'] = message_data and message_data.reply_to or False
if 'model' in fields:
result['model'] = message_data and message_data.model or False
if 'user_id' in fields:
result['user_id'] = message_data and message_data.user_id and message_data.user_id.id or False
if 'references' in fields:
result['references'] = message_data and message_data.references and tools.ustr(message_data.references) or False
if 'sub_type' in fields:
result['sub_type'] = message_data and message_data.sub_type or False
if 'headers' in fields:
result['headers'] = message_data and message_data.headers or False
if 'priority' in fields:
result['priority'] = message_data and message_data.priority or False
if 'debug' in fields:
result['debug'] = message_data and message_data.debug or False
return result
def on_change_referred_doc(self, cr, uid, ids, model, resource_id, context=None):
addons/event/event_view.xml
+1 -1
View File
@@ -431,7 +431,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'event.registration'}"
context="{'email_model':'event.registration', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
</notebook>
addons/fetchmail/fetchmail.py
+1 -12
View File
@@ -117,7 +117,7 @@ class email_server(osv.osv):
context = {}
for server in self.browse(cr, uid, ids, context=context):
logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
context.update({'server_id': server.id, 'server_type': server.type})
context.update({'server_id': server.id})
try:
if server.type == 'imap':
imap_server = None
@@ -215,22 +215,14 @@ class email_message(osv.osv):
_columns = {
'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
'server_type':fields.selection([
('pop', 'POP Server'),
('imap', 'IMAP Server'),
], 'Server Type', select=True, readonly=True),
}
_order = 'id desc'
def create(self, cr, uid, values, context=None):
if context is None:
context={}
server_id = context.get('server_id',False)
server_type = context.get('server_type',False)
if server_id:
values['server_id'] = server_id
if server_type:
values['server_type'] = server_type
res = super(email_message,self).create(cr, uid, values, context=context)
return res
@@ -238,11 +230,8 @@ class email_message(osv.osv):
if context is None:
context={}
server_id = context.get('server_id',False)
server_type = context.get('server_type',False)
if server_id:
values['server_id'] = server_id
if server_type:
values['server_type'] = server_type
res = super(email_message,self).write(cr, uid, ids, values, context=context)
return res
addons/hr_evaluation/wizard/email_compose_message.py
+9 -9
View File
@@ -55,15 +55,15 @@ class email_compose_message(osv.osv_memory):
if record_data.state == "waiting_answer":
msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,") %(record_data.user_to_review_id.name, record_data.survey_id.title)
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,
'res_id': resource_id,
'email_cc': False,
'email_bcc': False,
'reply_to': False,
})
'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,
'res_id': resource_id,
'email_cc': False,
'email_bcc': False,
'reply_to': False,
})
return result
email_compose_message()
addons/hr_recruitment/hr_recruitment_view.xml
+1 -1
View File
@@ -185,7 +185,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model': 'hr.applicant'}"
context="{'email_model': 'hr.applicant', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Notes">
addons/project/wizard/email_compose_message.py
+1 -1
View File
@@ -51,7 +51,7 @@ class email_compose_message(osv.osv_memory):
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:
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,
addons/project_issue/project_issue_view.xml
+1 -1
View File
@@ -142,7 +142,7 @@
icon="terp-document-new" type="action" />
<button string="Send New Email"
name="%(emails.action_email_compose_message_wizard)d"
context="{'email_model':'project.issue'}"
context="{'email_model':'project.issue', 'email_res_id': active_id}"
icon="terp-mail-message-new" type="action"/>
</page>
<page string="Extra Info" groups="base.group_extended">
addons/project_planning/project_planning_view.xml
+1 -1
View File
@@ -109,7 +109,7 @@
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
<button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
<button name="%(emails.action_email_compose_message_wizard)d" context="{'email_model':'project.task'}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
<button name="%(emails.action_email_compose_message_wizard)d" context="{'email_model':'project.task', 'email_res_id': active_id}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
</group>
</page>
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
addons/project_scrum/project_scrum_view.xml
+1 -1
View File
@@ -396,7 +396,7 @@
<field name="user_id"/>
<button name="%(emails.action_email_compose_message_wizard)d"
string="Send Email" type="action" icon="terp-mail-message-new"
context="{'email_model': 'project.scrum.meeting'}"/>
context="{'email_model': 'project.scrum.meeting', 'email_res_id': active_id}"/>
</group>
<notebook colspan="4">
<page string="Scrum Meeting">