Merge lp:~openerp-dev/openobject-addons/trunk-send_mail_warning-nco into lp:openobject-addons

[Harry (OpenERP)]

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Thanks for the proposal.. Please check below points.

- Line 153-156 => Merge lines by giving Email(s)
- Keep default value for raise_exception in line 24 with True
- field: failure_reason -> Improve tooltip (Show exception..)

Regards,

review: Needs Fixing

[Atul Patel(OpenERP) (atp-openerp)]

Hello sir,

Improve code as per ur suggestion..
Thanks

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-send_mail_warning-nco]

8829. By Pariket Trivedi(OpenERP) on 2013-09-19

[IMP] : for general setting email failer worring change.

8830. By Atul Patel(OpenERP) on 2013-10-14

[MERGE]: Merged with addons

8831. By Pariket Trivedi(OpenERP) on 2013-10-14

[Fix]: Email in Groupby field 'type' and marketting campaign remove send email exception.

8832. By Pariket Trivedi(OpenERP) on 2013-10-14

[IMP] email groupby 'type' field invisible

8833. By Atul Patel(OpenERP) on 2013-10-17

[MERGE]: Merged with trunk

8834. By Atul Patel(OpenERP) on 2013-10-29

[MERGE]: Merged with addons

8835. By Atul Patel(OpenERP) on 2013-11-08

[MERGE]: Merged with addons

8836. By Atul Patel(OpenERP) on 2013-11-13

[MERGE]: Merged trunk-addons

[Thibault Delavallée (OpenERP) (tde-openerp)]

What's the purpose of the fields_view_get override ?

review: Needs Information

[Atul Patel(OpenERP) (atp-openerp)]

Hello Thaibault,

In General configuration setting, we required number of failed emails count.
to find that number of failed emails not sent and to display that in configuration we override fields_view_get method.

Thanks

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

Long time, but back to goold ol' stuff! About the override of fields view get, it seems complicated. You could obtain the same result with standard fields and view. I think you should define a new function field in the config. It computes the number of failed emails. In the config view, display the number of failed emails + link to the action.

Moreover, limiting to the last 24 hours seems short. I would prefer seeing the last 30 days.

review: Needs Fixing

Unmerged revisions

8836. By Atul Patel(OpenERP) on 2013-11-13

[MERGE]: Merged trunk-addons

8835. By Atul Patel(OpenERP) on 2013-11-08

[MERGE]: Merged with addons

8834. By Atul Patel(OpenERP) on 2013-10-29

[MERGE]: Merged with addons

8833. By Atul Patel(OpenERP) on 2013-10-17

[MERGE]: Merged with trunk

8832. By Pariket Trivedi(OpenERP) on 2013-10-14

[IMP] email groupby 'type' field invisible

8831. By Pariket Trivedi(OpenERP) on 2013-10-14

[Fix]: Email in Groupby field 'type' and marketting campaign remove send email exception.

8830. By Atul Patel(OpenERP) on 2013-10-14

[MERGE]: Merged with addons

8829. By Pariket Trivedi(OpenERP) on 2013-09-19

[IMP] : for general setting email failer worring change.

8828. By Atul Patel(OpenERP) on 2013-08-26

[MERGE]: Merged with addons

8827. By Atul Patel(OpenERP) on 2013-08-22

[ADD]: Add new action in config file for mail exception

=== modified file 'mail/mail_mail.py'
--- mail/mail_mail.py	2013-10-18 14:49:24 +0000
+++ mail/mail_mail.py	2013-11-13 12:20:23 +0000
@@ -30,6 +30,7 @@
 from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+import openerp.tools as tools
 
 _logger = logging.getLogger(__name__)
 
@@ -62,6 +63,7 @@
         # and during unlink() we will not cascade delete the parent and its attachments
         'notification': fields.boolean('Is Notification',
             help='Mail has been created to notify people of an existing mail.message'),
+        'failure_reason': fields.text('Failure Reason', help="Show reason of failed mail"),
     }
 
     _defaults = {
@@ -286,7 +288,7 @@
                     mail.write({'state': 'sent', 'message_id': res})
                     mail_sent = True
                 else:
-                    mail.write({'state': 'exception'})
+                    mail.write({'state': 'exception', 'failure_reason': _('Recipient is not specified.')})
                     mail_sent = False
 
                 # /!\ can't use mail.state here, as mail.refresh() will cause an error
@@ -294,8 +296,9 @@
                 if mail_sent:
                     self._postprocess_sent_message(cr, uid, mail, context=context)
             except Exception as e:
-                _logger.exception('failed sending mail.mail %s', mail.id)
-                mail.write({'state': 'exception'})
+                failure_reason = tools.ustr(e)
+                _logger.exception('failed sending mail.mail %s due to %s', mail.id, failure_reason)
+                mail.write({'state': 'exception', 'failure_reason': failure_reason})
                 if raise_exception:
                     if isinstance(e, AssertionError):
                         # get the args of the original error, wrap into a value and throw a MailDeliveryException
 
=== modified file 'mail/mail_mail_view.xml'
--- mail/mail_mail_view.xml	2013-09-13 11:54:08 +0000
+++ mail/mail_mail_view.xml	2013-11-13 12:20:23 +0000
@@ -25,6 +25,7 @@
                             <field name="recipient_ids" widget="many2many_tags"/>
                             <field name="email_cc"/>
                             <field name="reply_to"/>
+                            <field name="failure_reason"/>
                         </group>
                         <notebook>
                             <page string="Body">
@@ -71,6 +72,7 @@
                     <field name="date"/>
                     <field name="subject"/>
                     <field name="author_id" string="User"/>
+                    <field name="failure_reason"/>
                     <field name="message_id" invisible="1"/>
                     <field name="recipient_ids" invisible="1"/>
                     <field name="model" invisible="1"/>
 
=== modified file 'mail/mail_message_view.xml'
--- mail/mail_message_view.xml	2013-08-29 10:09:32 +0000
+++ mail/mail_message_view.xml	2013-11-13 12:20:23 +0000
@@ -10,6 +10,7 @@
                 <tree string="Messages">
                     <field name="date"/>
                     <field name="subject"/>
+                    <field name="type" invisible="1"/>
                     <field name="author_id"/>
                     <field name="model"/>
                     <field name="res_id"/>
 
=== modified file 'mail/res_config.py'
--- mail/res_config.py	2013-09-17 10:20:46 +0000
+++ mail/res_config.py	2013-11-13 12:20:23 +0000
@@ -20,10 +20,11 @@
 ##############################################################################
 
 import urlparse
-
+from lxml import etree
+import datetime
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.osv import osv, fields
 
-
 class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
@@ -33,6 +34,32 @@
                                           "the OpenERP server, enter the domain name here."),
     }
 
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        """
+        Overrides orm field_view_get.
+        """
+        res = {}
+        res = super(project_configuration, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type,context=context, toolbar=toolbar, submenu=submenu)
+        doc = etree.XML(res['arch'])
+        previous_date = datetime.datetime.now() - datetime.timedelta(hours=24)
+        mail_xml_ids = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_view_mail_mail_exception')
+        mail_ids = self.pool.get('mail.mail').search(cr, uid, [('date', '>=', previous_date.strftime( DEFAULT_SERVER_DATETIME_FORMAT)), ('state', '=', 'exception')], context=context)
+        if mail_ids:
+            xml_div_failure_element = etree.Element("span")
+            xml_div_failure_element.set('class','failure_mail_list')
+            xml_button_element = etree.Element("button")
+            xml_button_element.set("name", str(mail_xml_ids and mail_xml_ids[1] or False))
+            xml_button_element.set("string", "%s %s Email(s) not sent"%(u"\u26A0",len(mail_ids)))
+            xml_button_element.set("type", "action")
+            xml_button_element.set("class", "oe_link oe_highlight_link oe_change-from-text")
+            #structure Elements
+            xml_div_failure_element.append(xml_button_element)
+            div_email_node = doc.xpath("//div[@name='email']")
+            if div_email_node and len(div_email_node)>0:
+                div_email_node[0][0].append(xml_div_failure_element)
+            res['arch'] = etree.tostring(doc)
+        return res
+
     def get_default_alias_domain(self, cr, uid, ids, context=None):
         alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
         if not alias_domain:
 
=== modified file 'mail/res_config_view.xml'
--- mail/res_config_view.xml	2013-09-13 11:54:08 +0000
+++ mail/res_config_view.xml	2013-11-13 12:20:23 +0000
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="action_view_mail_mail_exception" model="ir.actions.act_window">
+            <field name="name">Emails</field>
+            <field name="res_model">mail.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_exception': 1}</field>
+        </record>
+        
         <record id="view_general_configuration_mail_alias_domain" model="ir.ui.view">
             <field name="name">base.config.settings.mail.alias</field>
             <field name="model">base.config.settings</field>
 
=== modified file 'mail/static/src/css/mail.css'
--- mail/static/src/css/mail.css	2013-08-12 04:38:10 +0000
+++ mail/static/src/css/mail.css	2013-11-13 12:20:23 +0000
@@ -53,6 +53,12 @@
 .openerp .oe_mail > .oe_thread{
     margin-left: 0px;
 }
+.openerp .oe_button.oe_link.oe_highlight_link span {
+  color: red;
+}
+.openerp .oe_form_configuration .oe_form_group td:last-child .oe_change-from-text:before{
+    content:" ";
+}
 .openerp .oe_inline.oe_compose_recipients {
     margin-top: -2px;
 }
 
=== modified file 'mail/tests/test_mail_features.py'
--- mail/tests/test_mail_features.py	2013-10-18 14:49:24 +0000
+++ mail/tests/test_mail_features.py	2013-11-13 12:20:23 +0000
@@ -524,7 +524,6 @@
         msg_pids = [partner.id for partner in msg.notified_partner_ids]
         msg_aids = [attach.id for attach in msg.attachment_ids]
         sent_emails = self._build_email_kwargs_list
-
         # Test: mail_message: subject is False, body, parent_id is msg_id
         self.assertEqual(msg.subject, False, 'message_post: mail.message subject incorrect')
         self.assertEqual(msg.body, html_sanitize(_body2), 'message_post: mail.message body incorrect')
@@ -638,7 +637,6 @@
                 'default_res_id': self.group_pigs_id,
             })
         compose = mail_compose.browse(cr, uid, compose_id)
-
         # Test: mail.compose.message: composition_mode, model, res_id
         self.assertEqual(compose.composition_mode,  'comment', 'compose wizard: mail.compose.message incorrect composition_mode')
         self.assertEqual(compose.model,  'mail.group', 'compose wizard: mail.compose.message incorrect model')
@@ -648,7 +646,8 @@
         mail_compose.send_mail(cr, user_raoul.id, [compose_id], {'mail_post_autofollow': True, 'mail_create_nosubscribe': True})
         group_pigs.refresh()
         message = group_pigs.message_ids[0]
-
+        # Test: mail_mail: notifications have been deleted
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', message.id)]),'message_send: mail.mail message should have been auto-deleted!')
         # Test: mail.group: followers (c and d added by auto follow key; raoul not added by nosubscribe key)
         pigs_pids = [p.id for p in group_pigs.message_follower_ids]
         test_pids = [self.partner_admin_id, p_b_id, p_c_id, p_d_id]
@@ -679,7 +678,6 @@
                 'default_parent_id': message.id
             })
         compose = mail_compose.browse(cr, uid, compose_id)
-
         # Test: mail.compose.message: model, res_id, parent_id
         self.assertEqual(compose.model, 'mail.group', 'compose wizard: mail.compose.message incorrect model')
         self.assertEqual(compose.res_id, self.group_pigs_id, 'compose wizard: mail.compose.message incorrect res_id')
@@ -725,6 +723,12 @@
 
         # Test: Pigs and Bird did receive their message
         test_msg_ids = self.mail_message.search(cr, uid, [], limit=2)
+        mail_ids = self.mail_mail.search(cr, uid, [('mail_message_id', '=', message2.id)])
+        mail_record_id = self.mail_mail.browse(cr, uid, mail_ids)[0]
+        self.assertTrue(mail_record_id, "'message_send: mail.mail message should have in processing mail queue'" )
+        #check mass mail state...
+        test_mail_ids = self.mail_mail.search(cr, uid, [('state', '=', 'exception')])
+        self.assertNotIn(mail_ids, test_mail_ids, 'compose wizard: Mail sending Failed!!')
         self.assertIn(message1.id, test_msg_ids, 'compose wizard: Pigs did not receive its mass mailing message')
         self.assertIn(message2.id, test_msg_ids, 'compose wizard: Bird did not receive its mass mailing message')
 
 
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py	2013-04-15 10:23:49 +0000
+++ marketing_campaign/marketing_campaign.py	2013-11-13 12:20:23 +0000
@@ -30,6 +30,7 @@
 from openerp.tools.safe_eval import safe_eval as eval
 import re
 from openerp.addons.decimal_precision import decimal_precision as dp
+from openerp import netsvc
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _