diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-11-05 10:56:21 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-11-05 10:56:21 +0100 |
| commit | 4b494f77f6bfc652abf2b73b08c71591243b1b20 (patch) | |
| tree | 558a4a8ad7f7f46b91bbc1a4b7470401aa489c5b /addons/web/static/src/js/coresetup.js | |
| parent | 1f91931fa3485046a8e471dfaa783197ef573855 (diff) | |
| parent | 74cda3df5bdf6be39358d804ea268401ee677401 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20121105095621-a88fpp6irnatpzmr
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index cf533ed0b59..18e6683cb42 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -536,7 +536,8 @@ instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which o instance.web.qweb.debug = instance.session.debug; instance.web.qweb.default_dict = { '_' : _, - '_t' : instance.web._t + '_t' : instance.web._t, + 'JSON': JSON, }; instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node |