[REVIEW+FIX]
bzr revid: hmo@tinyerp.com-20110420134033-m1euj9hws0i6v0tx
This commit is contained in:
parent
490c9e3173
commit
da7aad526d
|
@ -307,7 +307,7 @@ class crm_case(object):
|
|||
else:
|
||||
return {'value': {'phone': address.phone}}
|
||||
|
||||
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
|
||||
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
return thread_pool.history(cr, uid, cases, keyword, history=history,\
|
||||
subject=subject, email=email, \
|
||||
|
|
|
@ -45,8 +45,7 @@ class email_template(osv.osv):
|
|||
"Return Template Object"
|
||||
if context is None:
|
||||
context = {}
|
||||
if not template_id:
|
||||
template_id = context.get('template_id', False)
|
||||
|
||||
if not template_id:
|
||||
return False
|
||||
|
||||
|
@ -172,7 +171,7 @@ class email_template(osv.osv):
|
|||
'res_model': 'email.compose.message',
|
||||
'src_model': src_obj,
|
||||
'view_type': 'form',
|
||||
'context': "{'template_id':'%d','src_rec_id':active_id,'src_rec_ids':active_ids}" % (template.id),
|
||||
'context': "{'mass_mail':True}",
|
||||
'view_mode':'form,tree',
|
||||
'view_id': res_id,
|
||||
'target': 'new',
|
||||
|
@ -206,15 +205,11 @@ class email_template(osv.osv):
|
|||
return super(email_template, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
template = self.browse(cr, uid, id, context=context)
|
||||
if default is None:
|
||||
default = {}
|
||||
default = default.copy()
|
||||
old = self.read(cr, uid, id, ['name'], context=context)
|
||||
new_name = _("Copy of template %s") % old.get('name', 'No Name')
|
||||
check = self.search(cr, uid, [('name', '=', new_name)], context=context)
|
||||
if check:
|
||||
new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz')
|
||||
default.update({'name':new_name})
|
||||
default['name'] = template.name or '' + '(copy)'
|
||||
return super(email_template, self).copy(cr, uid, id, default, context)
|
||||
|
||||
def build_expression(self, field_name, sub_field_name, null_value):
|
||||
|
@ -360,6 +355,7 @@ class email_template(osv.osv):
|
|||
}
|
||||
if not template_id:
|
||||
return values
|
||||
|
||||
report_xml_pool = self.pool.get('ir.actions.report.xml')
|
||||
template = self.get_email_template(cr, uid, template_id, record_id, context)
|
||||
def _get_template_value(field):
|
||||
|
@ -368,11 +364,13 @@ class email_template(osv.osv):
|
|||
else:
|
||||
return self.get_template_value(cr, uid, getattr(template, field), template.model, record_id, context=context)
|
||||
|
||||
#Use signatures if allowed
|
||||
body = _get_template_value('body')
|
||||
|
||||
#Use signatures if allowed
|
||||
if template.user_signature:
|
||||
signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
|
||||
body += '\n' + signature
|
||||
|
||||
values = {
|
||||
'smtp_server_id' : template.smtp_server_id.id,
|
||||
'body' : body,
|
||||
|
|
|
@ -38,7 +38,7 @@ class email_template_preview(osv.osv_memory):
|
|||
if context is None:
|
||||
context = {}
|
||||
|
||||
template_id = context.get('template_id', False)
|
||||
template_id = context.get('active_id', False)
|
||||
if not template_id:
|
||||
return []
|
||||
template_pool = self.pool.get('email.template')
|
||||
|
@ -61,7 +61,7 @@ class email_template_preview(osv.osv_memory):
|
|||
result = super(email_template_preview, self).default_get(cr, uid, fields, context=context)
|
||||
|
||||
template_pool = self.pool.get('email.template')
|
||||
template_id = context.get('template_id',False)
|
||||
template_id = context.get('active_id',False)
|
||||
if 'res_id' in fields:
|
||||
records = self._get_records(cr, uid, context=context)
|
||||
result['res_id'] = records and records[0][0] or False # select first record as a Default
|
||||
|
|
|
@ -120,7 +120,7 @@ class project_tasks(osv.osv):
|
|||
return len(res) and res[0] or False
|
||||
return res
|
||||
|
||||
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
|
||||
def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=None, context=None):
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
return thread_pool.history(cr, uid, cases, keyword, history=history,\
|
||||
subject=subject, email=email, \
|
||||
|
|
Loading…
Reference in New Issue