odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] improve code in email_template. 

bzr revid: ysa@tinyerp.com-20110208050535-4s0rbpd3zzs4g70a
This commit is contained in:
Yogesh (OpenERP) 2011-02-08 10:35:35 +05:30
parent 0ee0948e88
commit 3cf67ee9de
1 changed files with 15 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
addons/email_template/email_template.py
View File

@ -20,20 +20,16 @@
# #
############################################################################## ##############################################################################
from osv import osv
from osv import fields
import base64 import base64
import random import random
import netsvc import netsvc
import logging import logging
import re import re
TEMPLATE_ENGINES = []
from osv import osv, fields
from tools.translate import _ from tools.translate import _
import tools import tools
import pooler import pooler
import logging
def get_value(cursor, user, recid, message=None, template=None, context=None): def get_value(cursor, user, recid, message=None, template=None, context=None):
""" """
@ -74,14 +70,9 @@ class email_template(osv.osv):
_description = 'Email Templates for Models' _description = 'Email Templates for Models'
def change_model(self, cursor, user, ids, object_name, context=None): def change_model(self, cursor, user, ids, object_name, context=None):
mod_name = False
if object_name: if object_name:
mod_name = self.pool.get('ir.model').read( mod_name = self.pool.get('ir.model').browse(cursor, user, object_name, context).model
cursor,
user,
object_name,
['model'], context)['model']
else:
mod_name = False
return {'value':{'model_int_name':mod_name}} return {'value':{'model_int_name':mod_name}}
_columns = { _columns = {
@ -228,7 +219,6 @@ This is useful for CRM leads for example"),
vals = {} vals = {}
if context is None: if context is None:
context = {} context = {}
template_obj = a
action_obj = self.pool.get('ir.actions.act_window') action_obj = self.pool.get('ir.actions.act_window')
for template in self.browse(cr, uid, ids, context=context): for template in self.browse(cr, uid, ids, context=context):
src_obj = template.object_name.model src_obj = template.object_name.model
@ -252,8 +242,8 @@ This is useful for CRM leads for example"),
'object': True, 'object': True,
}, context) }, context)
self.write(cr, uid, ids, { self.write(cr, uid, ids, {
'ref_ir_act_window': vals['ref_ir_act_window'], 'ref_ir_act_window': vals.get('ref_ir_act_window',False),
'ref_ir_value': vals['ref_ir_value'], 'ref_ir_value': vals.get('ref_ir_value',False),
}, context) }, context)
return True return True
@ -420,15 +410,9 @@ This is useful for CRM leads for example"),
'res_model':'email.message', 'res_model':'email.message',
'res_id': mailbox_id, 'res_id': mailbox_id,
} }
attachment_id = attachment_obj.create(cursor, attachment_id = attachment_obj.create(cursor, user, attachment_data, context)
user,
attachment_data,
context)
if attachment_id: if attachment_id:
self.pool.get('email.message').write( self.pool.get('email.message').write(cursor, user, mailbox_id,
cursor,
user,
mailbox_id,
{ {
'attachments_ids':[(4, attachment_id)], 'attachments_ids':[(4, attachment_id)],
'mail_type':'multipart/mixed' 'mail_type':'multipart/mixed'
@ -451,21 +435,12 @@ This is useful for CRM leads for example"),
@return: True @return: True
""" """
if template.report_template: if template.report_template:
reportname = 'report.' + \ reportname = 'report.' + self.pool.get('ir.actions.report.xml').browse(cursor,
self.pool.get('ir.actions.report.xml').read( user, template.report_template.id, context).report_name
cursor,
user,
template.report_template.id,
['report_name'],
context)['report_name']
service = netsvc.LocalService(reportname) service = netsvc.LocalService(reportname)
data = {} data = {}
data['model'] = template.model_int_name data['model'] = template.model_int_name
(result, format) = service.create(cursor, (result, format) = service.create(cursor, user, [record_id], data, context)
user,
[record_id],
data,
context)
fname = tools.ustr(get_value(cursor, user, record_id, fname = tools.ustr(get_value(cursor, user, record_id,
template.file_name, template, context) template.file_name, template, context)
or 'Report') or 'Report')
@ -498,25 +473,14 @@ This is useful for CRM leads for example"),
context = {} context = {}
#If account to send from is in context select it, else use enforced account #If account to send from is in context select it, else use enforced account
if 'account_id' in context.keys(): if 'account_id' in context.keys():
from_account = self.pool.get('email.smtp_server').read( from_account = self.pool.get('email.smtp_server').read(cursor, user, context.get('account_id'), ['name', 'email_id'], context)
cursor,
user,
context.get('account_id'),
['name', 'email_id'],
context
)
else: else:
from_account = { from_account = {
'id':template.from_account.id, 'id':template.from_account.id,
'name':template.from_account.name, 'name':template.from_account.name,
'email_id':template.from_account.email_id 'email_id':template.from_account.email_id
} }
lang = get_value(cursor, lang = get_value(cursor, user, record_id, template.lang, template, context)
user,
record_id,
template.lang,
template,
context)
if lang: if lang:
ctx = context.copy() ctx = context.copy()
ctx.update({'lang':lang}) ctx.update({'lang':lang})
@ -616,14 +580,8 @@ This is useful for CRM leads for example"),
result = True result = True
mailbox_obj = self.pool.get('email.message') mailbox_obj = self.pool.get('email.message')
for record_id in record_ids: for record_id in record_ids:
mailbox_id = self._generate_mailbox_item_from_template( mailbox_id = self._generate_mailbox_item_from_template(cursor, user, template, record_id, context)
cursor, mail = mailbox_obj.browse(cursor, user, mailbox_id, context=context)
user,
template,
record_id,
context)
mail = mailbox_obj.browse(cursor, user, mailbox_id, context=context
)
if template.report_template or template.attachment_ids: if template.report_template or template.attachment_ids:
self.generate_attach_reports(cursor, user, template, record_id, mail, context ) self.generate_attach_reports(cursor, user, template, record_id, mail, context )
mailbox_obj.write(cursor, user, mailbox_id, {'folder':'outbox', 'state': 'waiting'}, context=context) mailbox_obj.write(cursor, user, mailbox_id, {'folder':'outbox', 'state': 'waiting'}, context=context)