Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / website / models / ir_http.py

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 44f9dca..ac92036 100644 (file)
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -211,6 +211,8 @@ class ir_http(orm.AbstractModel):
                     # if parent excplicitely returns a plain response, then we don't touch it
                     return response
             except Exception, e:
+                if openerp.tools.config['dev_mode'] and (not isinstance(exception, ir_qweb.QWebException) or not exception.qweb.get('cause')):
+                    raise
                 exception = e
 
             values = dict(