[MERGE] forward port of branch 7.0 up to e0c1f54
This commit is contained in:
commit
f304fb7f06
|
@ -20,6 +20,7 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import poplib
|
||||||
import time
|
import time
|
||||||
from imaplib import IMAP4
|
from imaplib import IMAP4
|
||||||
from imaplib import IMAP4_SSL
|
from imaplib import IMAP4_SSL
|
||||||
|
@ -41,6 +42,9 @@ from openerp.tools.translate import _
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
MAX_POP_MESSAGES = 50
|
MAX_POP_MESSAGES = 50
|
||||||
|
|
||||||
|
# Workaround for Python 2.7.8 bug https://bugs.python.org/issue23906
|
||||||
|
poplib._MAXLINE = 65536
|
||||||
|
|
||||||
class fetchmail_server(osv.osv):
|
class fetchmail_server(osv.osv):
|
||||||
"""Incoming POP/IMAP mail server account"""
|
"""Incoming POP/IMAP mail server account"""
|
||||||
_name = 'fetchmail.server'
|
_name = 'fetchmail.server'
|
||||||
|
|
|
@ -545,7 +545,7 @@ openerp.mail = function (session) {
|
||||||
};
|
};
|
||||||
|
|
||||||
self.do_action(action, {
|
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();
|
self.on_cancel();
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue