[IMP]: improvements
bzr revid: rha@tinyerp.com-20110331090350-uud2kept28bs1xv0
This commit is contained in:
parent
8306e424b9
commit
dfb7539e98
|
@ -308,8 +308,8 @@ class crm_case(object):
|
|||
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):
|
||||
mailgate_pool = self.pool.get('email.thread')
|
||||
return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
return thread_pool.history(cr, uid, cases, keyword, history=history,\
|
||||
subject=subject, email=email, \
|
||||
details=details, email_from=email_from,\
|
||||
message_id=message_id, attach=attach, \
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
|
||||
"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
|
||||
"email_email_message_manager","email.email.message.manager","email.model_email_message","base.group_sale_manager",1,0,0,0
|
||||
"email_thread_manager","email.mailgate.thread.manager","email.model_email_thread","base.group_sale_manager",1,1,1,1
|
||||
"email_thread_manager","email.thread.manager","email.model_email_thread","base.group_sale_manager",1,1,1,1
|
||||
"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
|
||||
"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
|
||||
"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
|
||||
"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
|
||||
"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
|
||||
"email_mailgate_thread","email.mailgate.thread","email.model_email_thread","base.group_sale_salesman",1,1,1,1
|
||||
"email_mailgate_thread","email.thread","email.model_email_thread","base.group_sale_salesman",1,1,1,1
|
||||
"email_gateway_email_message_user","email.email.message.user","email.model_email_message","base.group_sale_salesman",1,1,1,1
|
||||
"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
|
||||
"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
|
||||
|
|
|
|
@ -210,7 +210,7 @@ class email_message(osv.osv):
|
|||
msg_vals = {
|
||||
'subject': subject,
|
||||
'model': model or '',
|
||||
'date': time.strftime('%Y-%m-%d'),
|
||||
'date': time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
'user_id': uid,
|
||||
'body': body,
|
||||
'email_from': email_from,
|
||||
|
@ -266,7 +266,7 @@ class email_message(osv.osv):
|
|||
self.write(cr, uid, ids, {'state':'outgoing'}, context)
|
||||
for message in self.browse(cr, uid, ids, context):
|
||||
try:
|
||||
res = self.send_email(cr, uid, ids, auto_commit=True, context=context)
|
||||
res = self.send_email(cr, uid, [message.id], auto_commit=True, context=context)
|
||||
if res:
|
||||
self.write(cr, uid, [message.id], {'state':'sent', 'message_id': res}, context)
|
||||
else:
|
||||
|
@ -313,6 +313,7 @@ class email_message(osv.osv):
|
|||
else:
|
||||
raise osv.except_osv(_('Error !'), _('No messages in outgoing or exception state!'))
|
||||
|
||||
#if auto_selete=True then delete that sent messages as well as attachments
|
||||
sent_emails = self.search(cr, uid, [('state','=','sent'), ('auto_delete','=',True)], context=context)
|
||||
if sent_emails:
|
||||
for sent in self.browse(cr, uid, sent_emails, context):
|
||||
|
@ -328,7 +329,7 @@ class email_message(osv.osv):
|
|||
logger.notifyChannel("email-template", netsvc.LOG_ERROR, _("Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s") % (message.id, error))
|
||||
self.write(cr, uid, [message.id], {'state':'exception'}, context)
|
||||
return False
|
||||
return True
|
||||
return res
|
||||
# OLD Code.
|
||||
# def send_all_mail(self, cr, uid, ids=None, context=None):
|
||||
# if ids is None:
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_email_message","email.message","model_email_message",,1,0,0,0
|
||||
"access_mailgate_thread","mailgate.thread","model_email_thread",,1,0,0,0
|
||||
"access_mailgate_thread","email.thread","model_email_thread",,1,0,0,0
|
||||
|
|
|
|
@ -107,8 +107,8 @@ class project_tasks(osv.osv):
|
|||
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):
|
||||
mailgate_pool = self.pool.get('email.thread')
|
||||
return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
return thread_pool.history(cr, uid, cases, keyword, history=history,\
|
||||
subject=subject, email=email, \
|
||||
details=details, email_from=email_from,\
|
||||
message_id=message_id, attach=attach, \
|
||||
|
|
Loading…
Reference in New Issue