diff options
| author | Tejas Tank <tta@openerp.com> | 2012-08-17 16:16:10 +0530 |
|---|---|---|
| committer | Tejas Tank <tta@openerp.com> | 2012-08-17 16:16:10 +0530 |
| commit | f4f0d42a70d62320b0d0b0d3aab16336b696a485 (patch) | |
| tree | ac01c07c02a5284eb67d044e92e3255506e70a08 /addons/fetchmail/fetchmail.py | |
| parent | ae1ed5900caf1d0429ef731343af4ae364d989ae (diff) | |
| parent | 6666d5993f9753c6ec3aec721b41ebd3fbc6c18c (diff) | |
Merged with latest.
bzr revid: tta@openerp.com-20120817104610-h7pova57capzm1by
Diffstat (limited to 'addons/fetchmail/fetchmail.py')
| -rw-r--r-- | addons/fetchmail/fetchmail.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 55923c3043a..544a4f81b96 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -71,7 +71,7 @@ class fetchmail_server(osv.osv): 'password' : fields.char('Password', size=1024, readonly=True, states={'draft':[('readonly', False)]}), 'action_id':fields.many2one('ir.actions.server', 'Server Action', help="Optional custom server action to trigger for each incoming mail, " "on the record that was created or updated by this mail"), - 'object_id': fields.many2one('ir.model', "Create a New Record", required=True, help="Process each incoming mail as part of a conversation " + 'object_id': fields.many2one('ir.model', "Create a New Record", help="Process each incoming mail as part of a conversation " "corresponding to this document type. This will create " "new documents for new conversations, or attach follow-up " "emails to the existing conversations (documents)."), @@ -151,8 +151,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS connection = server.connect() server.write({'state':'done'}) except Exception, e: - _logger.exception("Failed to connect to %s server %s", server.type, server.name) - raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s") % tools.ustr(e)) + _logger.exception("Failed to connect to %s server %s.", server.type, server.name) + raise osv.except_osv(_("Connection test failed!"), _("Here is what we got instead:\n %s.") % tools.ustr(e)) finally: try: if connection: @@ -189,7 +189,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS result, data = imap_server.search(None, '(UNSEEN)') for num in data[0].split(): result, data = imap_server.fetch(num, '(RFC822)') - res_id = mail_thread.message_process(cr, uid, server.object_id.model, data[0][1], + res_id = mail_thread.message_process(cr, uid, server.object_id.model, + data[0][1], save_original=server.original, strip_attachments=(not server.attach), context=context) @@ -200,7 +201,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS count += 1 _logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name) except Exception, e: - _logger.exception("Failed to fetch mail from %s server %s", server.type, server.name) + _logger.exception("Failed to fetch mail from %s server %s.", server.type, server.name) finally: if imap_server: imap_server.close() @@ -224,7 +225,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS cr.commit() _logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name) except Exception, e: - _logger.exception("Failed to fetch mail from %s server %s", server.type, server.name) + _logger.exception("Failed to fetch mail from %s server %s.", server.type, server.name) finally: if pop_server: pop_server.quit() |