[MERGE] forward port of branch saas-3 up to e2bfb96
This commit is contained in:
commit
ffc40b611b
|
@ -579,5 +579,11 @@ class account_bank_statement_line(osv.osv):
|
|||
'type': 'general',
|
||||
}
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
if default is None:
|
||||
default = {}
|
||||
default = dict(default, move_ids=[])
|
||||
return super(account_bank_statement_line, self).copy(
|
||||
cr, uid, id, default=default, context=context)
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -45,6 +45,8 @@ def decode(text):
|
|||
"""Returns unicode() string conversion of the the given encoded smtp header text"""
|
||||
if text:
|
||||
text = decode_header(text.replace('\r', ''))
|
||||
# The joining space will not be needed as of Python 3.3
|
||||
# See https://hg.python.org/cpython/rev/8c03fe231877
|
||||
return ' '.join([tools.ustr(x[0], x[1]) for x in text])
|
||||
|
||||
class MLStripper(HTMLParser):
|
||||
|
|
Loading…
Reference in New Issue