From f3c8cc50c8e59294d7b0f9c9dbda4a0d673a3d5e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 May 2014 17:18:12 +0200
Subject: [IMP] Include openerpframework in common assets. Add module list in
 bundle

---
 addons/web/static/src/js/boot.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/web/static/src/js/boot.js')

diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index cd58c3bb10a..5fad3d0a140 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -22,7 +22,7 @@
         // this unique id will be replaced by hostname_databasename by
         // openerp.web.Session on the first connection
         _session_id: "instance0",
-        _modules: ['web'],
+        _modules: openerp._modules || ['web'],
         web_mobile: {},
         /**
          * OpenERP instance constructor
@@ -30,8 +30,8 @@
          * @param {Array|String} modules list of modules to initialize
          */
         init: function(modules) {
-            if (modules === null) {
-                modules = [];
+            if (modules === undefined) {
+                modules = openerp._modules;
             }
             modules = _.without(modules, "web");
             if (inited)
-- 
cgit v1.2.3