projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[MERGE]: survey: fixed a bug in warning message when users exceed maximal number...
[odoo/odoo.git]
/
addons
/
web
/
static
/
src
/
js
/
core.js
diff --git
a/addons/web/static/src/js/core.js
b/addons/web/static/src/js/core.js
index
d5c096d
..
0584c49
100644
(file)
--- a/
addons/web/static/src/js/core.js
+++ b/
addons/web/static/src/js/core.js
@@
-695,6
+695,7
@@
openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
});
})
).then(function() {
+ self.on_modules_loaded();
self.on_session_valid();
});
});
@@
-728,7
+729,6
@@
openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
var head = document.head || document.getElementsByTagName('head')[0];
head.appendChild(tag);
} else {
- self.on_modules_loaded();
d.resolve();
}
return d;