diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 91b998c76c9..62b6fa319e0 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -126,6 +126,7 @@ class ir_http(orm.AbstractModel): return response def _handle_exception(self, exception=None, code=500): + res = super(ir_http, self)._handle_exception(exception) if isinstance(exception, werkzeug.exceptions.HTTPException) and hasattr(exception, 'response') and exception.response: return exception.response @@ -168,7 +169,7 @@ class ir_http(orm.AbstractModel): html = request.website._render('website.http_error', values) return werkzeug.wrappers.Response(html, status=code, content_type='text/html;charset=utf-8') - return super(ir_http, self)._handle_exception(exception) + return res class ModelConverter(ir.ir_http.ModelConverter): def __init__(self, url_map, model=False, domain='[]'): diff --git a/openerp/http.py b/openerp/http.py index c63a795b6a7..c5924b5d15d 100644 --- a/openerp/http.py +++ b/openerp/http.py @@ -267,7 +267,7 @@ class WebRequest(object): """Called within an except block to allow converting exceptions to abitrary responses. Anything returned (except None) will be used as response.""" - raise + self._failed = exception # prevent tx commit def _call_function(self, *args, **kwargs): request = self @@ -449,8 +449,8 @@ class JsonRequest(WebRequest): """Called within an except block to allow converting exceptions to abitrary responses. Anything returned (except None) will be used as response.""" + super(JsonRequest, self)._handle_exception(exception) _logger.exception("Exception during JSON request handling.") - self._failed = exception # prevent tx commit error = { 'code': 200, 'message': "OpenERP Server Error", diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index 6ce69578a8e..8d6edb88688 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -107,7 +107,7 @@ class NumberedCanvas(canvas.Canvas): self.setFont("Helvetica", 8) self.drawRightString((self._pagesize[0]-30), (self._pagesize[1]-40), " %(this)i / %(total)i" % { - 'this': self._pageNumber+1, + 'this': self._pageNumber, 'total': page_count, } ) @@ -1007,8 +1007,6 @@ class _rml_template(object): if story_cnt > 0: fis.append(platypus.PageBreak()) fis += r.render(node_story) - # Reset Page Number with new story tag - fis.append(PageReset()) story_cnt += 1 try: if self.localcontext and self.localcontext.get('internal_header',False):