summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2017-07-11 17:29:16 +0200
committerThibault Delavallée <tde@odoo.com>2017-07-12 09:54:00 +0200
commit578edf73b9f637b0d27708c511b542a27bd7a3b8 (patch)
tree8915ae7323922efd8c79a40d339cae1f83b13015
parent9fb86d6facbf99346dddcf41096b7045663b49a4 (diff)
[FIX] point_of_sale, website_sale: correctly handle tuple return value of render_qweb_pdf
Fix related to e80238042c9d93d492ea8b06b0041aced0d81dcd .
-rw-r--r--addons/point_of_sale/controllers/main.py2
-rw-r--r--addons/website_sale/controllers/main.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 64548bfdcd7..79ec844fdf8 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -29,6 +29,6 @@ class PosController(http.Controller):
@http.route('/pos/sale_details_report', type='http', auth='user')
def print_sale_details(self, date_start=False, date_stop=False, **kw):
r = request.env['report.point_of_sale.report_saledetails']
- pdf = request.env.ref('point_of_sale.sale_details_report').with_context(date_start=date_start, date_stop=date_stop).render_qweb_pdf(r)
+ pdf, _ = request.env.ref('point_of_sale.sale_details_report').with_context(date_start=date_start, date_stop=date_stop).render_qweb_pdf(r)
pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
return request.make_response(pdf, headers=pdfhttpheaders)
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 7795ec9bd4d..05abe7627b1 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -890,8 +890,8 @@ class WebsiteSale(http.Controller):
def print_saleorder(self):
sale_order_id = request.session.get('sale_last_order_id')
if sale_order_id:
- pdf = request.env.ref('sale.action_report_saleorder').sudo().render_qweb_pdf([sale_order_id])
- pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
+ pdf, _ = request.env.ref('sale.action_report_saleorder').sudo().render_qweb_pdf([sale_order_id])
+ pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', u'%s' % len(pdf))]
return request.make_response(pdf, headers=pdfhttpheaders)
else:
return request.redirect('/shop')