From d15798786ab54df7145e78c079941d17f6f361aa Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Oct 2013 14:10:13 +0200
Subject: [PATCH] [FIX]project_issue: add onchange_partner_id which was
 inherited before with base_stage, but the inheritance has been removed

bzr revid: dle@openerp.com-20131017121013-mtzvjogi2hxgfcpq
---
 addons/crm_partner_assign/crm_portal_view.xml | 8 ++++++++
 addons/portal/mail_message.py                 | 2 +-
 addons/portal/tests/test_portal.py            | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
index ab4cf8868db..2b2b61c8425 100644
--- a/addons/crm_partner_assign/crm_portal_view.xml
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -59,6 +59,10 @@
                     <field name="description" nolabel="1" colspan="2"/>
                   </group>
                 </sheet>
+                <div class="oe_chatter">
+                  <field name="message_follower_ids" widget="mail_followers"/>
+                  <field name="message_ids" widget="mail_thread" readonly="1"/>
+                </div>
               </form>
             </field>
         </record>
@@ -145,6 +149,10 @@
                 </page>
                 </notebook>
               </sheet>
+              <div class="oe_chatter">
+                <field name="message_follower_ids" widget="mail_followers"/>
+                <field name="message_ids" widget="mail_thread" readonly="1"/>
+              </div>
               </form>
             </field>
         </record>
diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
index d6a38f27378..9699b3a9ef6 100644
--- a/addons/portal/mail_message.py
+++ b/addons/portal/mail_message.py
@@ -35,7 +35,7 @@ class mail_message(osv.Model):
         group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
         group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
         if group_user_id not in [group.id for group in group_ids]:
-            args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args)
+            args = [('subtype_id', '!=', False)] + list(args)
 
         return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
             context=context, count=False, access_rights_uid=access_rights_uid)
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 4d301458365..f5eeba0aa62 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -210,11 +210,11 @@ class test_portal(TestMail):
         msg2_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body2', type='comment', subtype='mail.mt_group_public')
         msg3_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body3', type='comment', subtype='mail.mt_comment')
         msg4_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body4', type='comment')
-        msg5_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body5', type='notification')
+        # msg5_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body5', type='notification')
 
         # Do: Chell search messages: should not see internal notes (comment without subtype)
         msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)])
-        self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]),
+        self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id]),
                         'mail_message: portal user has access to messages he should not read')
 
         # Do: Chell read messages she can read