odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to e0c1f54

This commit is contained in:
Christophe Simonis 2015-07-16 11:15:40 +02:00
parent 505e308cd6 e0c1f54fd7
commit f304fb7f06
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/fetchmail/fetchmail.py
View File

@ -20,6 +20,7 @@
##############################################################################
import logging
import poplib
import time
from imaplib import IMAP4
from imaplib import IMAP4_SSL
@ -41,6 +42,9 @@ from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
MAX_POP_MESSAGES = 50
# Workaround for Python 2.7.8 bug https://bugs.python.org/issue23906
poplib._MAXLINE = 65536
class fetchmail_server(osv.osv):
"""Incoming POP/IMAP mail server account"""
_name = 'fetchmail.server'

2
addons/mail/static/src/js/mail.js
View File

@ -545,7 +545,7 @@ openerp.mail = function (session) {
};
self.do_action(action, {
'on_close': function(){ self.parent_thread.message_fetch() }
'on_close': function(){ self.is_log && self.parent_thread.message_fetch() }
});
self.on_cancel();
});