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

[FIX] report: manage landscape view port for wkhtml

Browse Source 
Bug introduced by commit 2254a97

Fix #7960
This commit is contained in:
Jeremy Kersten
2015-08-11 13:58:04 +02:00
parent c47ea6f8ea
commit 0ea94b4b5a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/report/models/report.py
+4 -5
View File
@@ -376,7 +376,7 @@ class Report(osv.Model):
""" """
command_args = [] command_args = []
if wkhtmltopdf_state == "ok": if wkhtmltopdf_state == "ok":
command_args.extend(['--viewport-size', '1024x768']) command_args.extend(['--viewport-size', landscape and '1024x1280' or '1280x1024'])
# Passing the cookie to wkhtmltopdf in order to resolve internal links. # Passing the cookie to wkhtmltopdf in order to resolve internal links.
try: try:
@@ -399,7 +399,7 @@ class Report(osv.Model):
del command_args[index] del command_args[index]
del command_args[index] del command_args[index]
command_args.extend(['--orientation', 'landscape']) command_args.extend(['--orientation', 'landscape'])
elif landscape and not '--orientation' in command_args: elif landscape and '--orientation' not in command_args:
command_args.extend(['--orientation', 'landscape']) command_args.extend(['--orientation', 'landscape'])
# Execute WKhtmltopdf # Execute WKhtmltopdf
@@ -449,7 +449,7 @@ class Report(osv.Model):
if process.returncode not in [0, 1]: if process.returncode not in [0, 1]:
raise UserError(_('Wkhtmltopdf failed (error code: %s). ' raise UserError(_('Wkhtmltopdf failed (error code: %s). '
'Message: %s') % (str(process.returncode), err)) 'Message: %s') % (str(process.returncode), err))
# Save the pdf in attachment if marked # Save the pdf in attachment if marked
if reporthtml[0] is not False and save_in_attachment.get(reporthtml[0]): if reporthtml[0] is not False and save_in_attachment.get(reporthtml[0]):
@@ -464,8 +464,7 @@ class Report(osv.Model):
try: try:
self.pool['ir.attachment'].create(cr, uid, attachment) self.pool['ir.attachment'].create(cr, uid, attachment)
except AccessError: except AccessError:
_logger.info("Cannot save PDF report %r as attachment", _logger.info("Cannot save PDF report %r as attachment", attachment['name'])
attachment['name'])
else: else:
_logger.info('The PDF document %s is now saved in the database', _logger.info('The PDF document %s is now saved in the database',
attachment['name']) attachment['name'])