def find_xml_id(self,cr,uid,ids,name,context=None):
subtype_obj = self.pool.get('mail.message.subtype')
- irmodel_obj = self.pool.get('ir.model.data')
- subtype_id = subtype_obj.search(cr,uid,[('res_model','=',self._name),('name','=',name)])
- ir_ids = irmodel_obj.search(cr,uid,[('model','=','mail.message.subtype'),('res_id','in',subtype_id)])
- xml_id = False
- ir_model_browse = irmodel_obj.browse(cr,uid,ir_ids)
- if ir_model_browse:
- xml_id = ir_model_browse[0].name
+ ir_model_data_obj = self.pool.get('ir.model.data')
+ subtype_ids = subtype_obj.search(cr,uid,[('res_model','=',self._name),('name','=',name)])
+ ir_data_ids = ir_model_data_obj.search(cr,uid,[('model','=','mail.message.subtype'),('res_id','in',subtype_ids)])
+ xml_id = 'mail_subtype_comment'
+ ir_model_data_record = ir_model_data_obj.browse(cr,uid,ir_data_ids)
+ if ir_model_data_record:
+ xml_id = ir_model_data_record[0].name
return xml_id
def case_close_send_note(self, cr, uid, ids, context=None):
subtype_browse = subtype_obj.browse(cr, uid, ref[1],context=context)
if self._name == subtype_browse.res_model:
values['subtype_id']=subtype_browse.id
- else:
+ if not subtype_browse.res_model:
values['subtype_id']=subtype_browse.id
values.update({
'model': context.get('thread_model', self._name) if thread_id else False,
partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
- def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
+ def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
""" Add partners to the records followers. """
if not subtype_ids:
subtype_obj = self.pool.get('mail.message.subtype')