summaryrefslogtreecommitdiff
path: root/addons/base/static/lib
diff options
context:
space:
mode:
authorYogesh (OpenERP) <ysa@tinyerp.com>2011-07-13 10:09:01 +0530
committerYogesh (OpenERP) <ysa@tinyerp.com>2011-07-13 10:09:01 +0530
commitca5d04e9dcc8cd510d43d82dc37d1f2d36676cdf (patch)
tree7965fd869f7b3e8c4d2aab84b9bcc613bab595e1 /addons/base/static/lib
parent2c1473cdad3e21c2945da203127552d7b036be3b (diff)
parent97966e8effa47972106d7f016532d80b64f96f99 (diff)
[MERGE] merge with trunk upto revision no 607.
bzr revid: ysa@tinyerp.com-20110713043901-fxrmq4y5fv71q8ht
Diffstat (limited to 'addons/base/static/lib')
-rw-r--r--addons/base/static/lib/qweb/qweb2.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/base/static/lib/qweb/qweb2.js b/addons/base/static/lib/qweb/qweb2.js
index e617df60183..4f136f3c98a 100644
--- a/addons/base/static/lib/qweb/qweb2.js
+++ b/addons/base/static/lib/qweb/qweb2.js
@@ -304,6 +304,7 @@ QWeb2.Engine = (function() {
" /* START TEMPLATE */ try {\n" +
(e.compile()) + "\n" +
" /* END OF TEMPLATE */ } catch(error) {\n" +
+ " if (console && console.exception) console.exception(error);\n" +
" context.engine.tools.exception('Runtime Error: ' + error, context);\n" +
" }\n" +
" return r.join('');";