Merge lp:~openerp-dev/openobject-addons/7.0-fix-mail_issues-adh into lp:openobject-addons/7.0

[Anand Dharampuriya(OpenERP)]

Hello,

I had fixed some mail issues which are currently present in 7.0/addons.

Regards,
ADH

Unmerged revisions

10064. By Anand Dharampuriya(OpenERP) on 2014-06-12

[FIX] Solve some mail issues which are currently present in 7.0/addons

=== modified file 'mail/mail_group.py'
--- mail/mail_group.py	2013-08-27 15:07:08 +0000
+++ mail/mail_group.py	2014-06-12 12:07:36 +0000
@@ -24,6 +24,7 @@
 from openerp.osv import osv
 from openerp.osv import fields
 from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
 
 
 class mail_group(osv.Model):
@@ -46,7 +47,7 @@
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
-        'description': fields.text('Description'),
+        'description': fields.text('Description', translate=True),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
         'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')], 'Privacy', required=True,
             help='This group is visible by non members. \
@@ -172,6 +173,8 @@
         mail_alias = self.pool.get('mail.alias')
         alias_ids = [group.alias_id.id for group in groups if group.alias_id]
         # Delete mail_group
+        if self.pool['ir.model.data'].get_object_reference(cr, uid, 'mail', 'group_all_employees')[1] in ids:
+            raise osv.except_osv(_('Warning!'), _('You cannot delete this group because some other modules are dependent on it')) 
         res = super(mail_group, self).unlink(cr, uid, ids, context=context)
         # Delete alias
         mail_alias.unlink(cr, SUPERUSER_ID, alias_ids, context=context)
 
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2014-05-05 09:43:29 +0000
+++ mail/mail_thread.py	2014-06-12 12:07:36 +0000
@@ -944,7 +944,7 @@
             return result
         if partner and partner in obj.message_follower_ids:  # recipient already in the followers -> skip
             return result
-        if partner and partner in [val[0] for val in result[obj.id]]:  # already existing partner ID -> skip
+        if partner and partner.id in [val[0] for val in result[obj.id]]:  # already existing partner ID -> skip
             return result
         if partner and partner.email:  # complete profile: id, name <email>
             result[obj.id].append((partner.id, '%s<%s>' % (partner.name, partner.email), reason))
 
=== modified file 'mail/static/src/css/mail.css'
--- mail/static/src/css/mail.css	2014-02-14 13:17:05 +0000
+++ mail/static/src/css/mail.css	2014-06-12 12:07:36 +0000
@@ -672,3 +672,8 @@
 .openerp .oe_mail .oe_view_nocontent > p {
     padding-left: 15px;
 }
+@media print {
+    .openerp .oe_form div.oe_chatter {
+        display: none !important;
+    }
+}
 \ No newline at end of file