pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Forward-port saas-6 up to 7dc2ed94c3

Browse Source
This commit is contained in:
Olivier Dony
2017-05-16 09:22:27 +02:00
parent a95a667563 7dc2ed94c3
commit 2c4512c263
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/models/mass_mailing.py
+2 -1
View File
@@ -666,7 +666,8 @@ class MassMailing(osv.Model):
email_fname = 'email_from'
if 'email' in model._fields:
email_fname = 'email'
record_ids = model.search(cr, uid, [('id', 'in', res_ids), (email_fname, 'ilike', email)], context=context)
ctx = dict(context or {}, active_test=False)
record_ids = model.search(cr, uid, [('id', 'in', res_ids), (email_fname, 'ilike', email)], context=ctx)
model.write(cr, uid, record_ids, {'opt_out': value}, context=context)
#------------------------------------------------------
addons/report/models/report.py
+16 -12
View File
@@ -567,19 +567,23 @@ class Report(osv.Model):
"""
writer = PdfFileWriter()
streams = [] # We have to close the streams *after* PdfFilWriter's call to write()
for document in documents:
pdfreport = file(document, 'rb')
streams.append(pdfreport)
reader = PdfFileReader(pdfreport)
for page in range(0, reader.getNumPages()):
writer.addPage(reader.getPage(page))
try:
for document in documents:
pdfreport = file(document, 'rb')
streams.append(pdfreport)
reader = PdfFileReader(pdfreport)
for page in range(0, reader.getNumPages()):
writer.addPage(reader.getPage(page))
merged_file_fd, merged_file_path = tempfile.mkstemp(suffix='.html', prefix='report.merged.tmp.')
with closing(os.fdopen(merged_file_fd, 'w')) as merged_file:
writer.write(merged_file)
for stream in streams:
stream.close()
merged_file_fd, merged_file_path = tempfile.mkstemp(suffix='.pdf', prefix='report.merged.tmp.')
with closing(os.fdopen(merged_file_fd, 'w')) as merged_file:
writer.write(merged_file)
finally:
for stream in streams:
try:
stream.close()
except Exception:
pass
return merged_file_path