diff options
| author | Raphael Collet <rco@openerp.com> | 2012-08-31 16:53:05 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-08-31 16:53:05 +0200 |
| commit | 0304a1eadad77620c1939a4c7734d4a24d420d32 (patch) | |
| tree | 63441f0d83d6a0074590abd24a496a0f3b2a8904 /addons/web/static/src/js/coresetup.js | |
| parent | e79baa9e8a5759a3626c15dba76b1f03d8ecd098 (diff) | |
| parent | 21a645fb6dbf01319cb10ff94c8dbfbda141332e (diff) | |
[MERGE] from trunk
bzr revid: jam@tinyerp.com-20120831045217-xoy25yc9ignfi94v
bzr revid: rco@openerp.com-20120831145305-4wf3sl8un59k61he
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 8e0f4da4148..38cf57387d1 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -35,7 +35,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess this.username = false; this.user_context= {}; this.db = false; - this.openerp_entreprise = false; this.module_list = instance._modules.slice(); this.module_loaded = {}; _(this.module_list).each(function (mod) { @@ -78,8 +77,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess db: result.db, username: result.login, uid: result.uid, - user_context: result.context, - openerp_entreprise: result.openerp_entreprise + user_context: result.context }); }); }, @@ -103,8 +101,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess db: result.db, username: result.login, uid: result.uid, - user_context: result.context, - openerp_entreprise: result.openerp_entreprise + user_context: result.context }); if (!_volatile) { self.set_cookie('session_id', self.session_id); |