Bhumika (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-797233-sbh into 
lp:openobject-addons.

Requested reviews:
  tfr (Openerp) (tfr)
Related bugs:
  Bug #797233 in OpenERP Addons: "fetchmail : fecth attachement even if the 
check box add attachement is not checked"
  https://bugs.launchpad.net/openobject-addons/+bug/797233

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-797233-sbh/+merge/64951

Bug fixed :fetchmail : fecth attachement even if the check box add attachement 
is not checked.
Improve log message 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-797233-sbh/+merge/64951
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-797233-sbh.
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py	2011-02-15 12:50:01 +0000
+++ fetchmail/fetchmail.py	2011-06-17 08:48:43 +0000
@@ -116,7 +116,7 @@
         if context is None:
             context = {}
         for server in self.browse(cr, uid, ids, context=context):
-            logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
+            logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
             try:
                 if server.type == 'imap':
@@ -199,7 +199,7 @@
 
                     pop_server.quit()
 
-                    logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
+                    logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
 
             except Exception, e:
                 logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))

=== modified file 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py	2011-05-02 18:46:43 +0000
+++ mail_gateway/mail_gateway.py	2011-06-17 08:48:43 +0000
@@ -519,7 +519,7 @@
                             body = content
                             has_plain_text = True
                 elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
+                    if filename and attach:
                         attachments[filename] = part.get_payload(decode=True)
                     else:
                         res = part.get_payload(decode=True)

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to