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

[MERGE] merge with lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa-project-task-sgo 

bzr revid: fka@tinyerp.com-20120814122817-73qkhrazidfq9zus
This commit is contained in:
Foram Katharotiya (OpenERP) 2012-08-14 17:58:17 +05:30
parent 0ae13ed393 b4b9ce7178
commit f3b28f7e75
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/mail/mail_thread.py
View File

@ -155,7 +155,8 @@ class mail_thread(osv.Model):
subtype_obj=self.pool.get('mail.message.subtype')
subtype_id=subtype_obj.search(cr, uid, [('name', '=', vals.get('subtype')), ('model_ids', '=', self._name)])
vals['subtype_id'] = subtype_id[0]
if subtype_id:
vals['subtype_id'] = subtype_id[0]
user_subscribe=self.message_is_subscriber(cr, uid, [thread_id], vals['user_id'], context)
# automatically subscribe the writer of the message
if vals['user_id']:

4
addons/project/project.py
View File

@ -1209,6 +1209,10 @@ class task(base_stage, osv.osv):
user_ids.append(obj.user_id.id)
if obj.manager_id and not obj.manager_id.id in user_ids:
user_ids.append(obj.manager_id.id)
if obj.project_id:
subscriber_ids = self.pool.get('project.project').message_get_subscribers(cr, uid, [obj.project_id.id], context=context)
for user_id in subscriber_ids:
user_ids.append(user_id)
return user_ids
def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):