diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-23 19:34:50 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-23 19:34:50 +0200 |
| commit | 07fb6d88b9c0ca87545735c83afc8f271db090dd (patch) | |
| tree | 62f48db8d70ddacffe868f05cb19590776b2203a /addons/web/static/src/js/boot.js | |
| parent | ac5dc58367d9bed5a576baaa7b803a67b5d00d07 (diff) | |
| parent | 8df25dc6830c1878931b7848dbf8a9be6a2d0515 (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20120723173450-2yxayvyoiiiw9tcw
Diffstat (limited to 'addons/web/static/src/js/boot.js')
| -rw-r--r-- | addons/web/static/src/js/boot.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 86f8077b151..c1b1b984abe 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -24,7 +24,7 @@ init: function(modules) { // By default only web will be loaded, the rest will be by loaded // by openerp.web.Session on the first session_authenticate - modules = modules || ["web"]; + modules = _.union(['web'], modules || []); var new_instance = { // links to the global openerp _openerp: openerp, |