Merge lp:~therp-nl/ocb-addons/7.0-lp1249600-reverse_ocb_email_defaults into lp:ocb-addons

[Stefan Rijnhart (Opener)]

[Stéphane Bidoul (Acsone) (sbi)]

Thanks for the MP. May I suggest to revert the test too (rev 9624)?

-sbi

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks Stéphane for pointing that out! Done that now.

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve

[Daniel Reis (dreis-pt)]

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'email_template/res_partner.py'
--- email_template/res_partner.py	2013-08-15 07:54:23 +0000
+++ email_template/res_partner.py	2013-11-09 14:36:29 +0000
@@ -34,7 +34,7 @@
     }
 
     _defaults = {
-        'opt_out': True,
+        'opt_out': False,
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mail/res_partner.py'
--- mail/res_partner.py	2013-08-15 07:54:23 +0000
+++ mail/res_partner.py	2013-11-09 14:36:29 +0000
@@ -43,7 +43,7 @@
     }
 
     _defaults = {
-        'notification_email_send': lambda *args: 'none'
+        'notification_email_send': lambda *args: 'comment'
     }
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):

=== modified file 'mail/tests/test_mail_features.py'
--- mail/tests/test_mail_features.py	2013-10-27 15:03:16 +0000
+++ mail/tests/test_mail_features.py	2013-11-09 14:36:29 +0000
@@ -237,7 +237,7 @@
         self.res_users.write(cr, uid, [uid], {'email': 'a@a', 'notification_email_send': 'comment'})
         self.res_users.write(cr, uid, [self.user_raoul_id], {'email': 'r@r'})
         # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
-        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b', 'notification_email_send': 'comment'})
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
         # 2 - Carine Poilvache, with email, should receive emails for emails
         p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
         # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message