diff --git a/addons/base/static/src/js/boot.js b/addons/base/static/src/js/boot.js index fff710a1d68..e6c9fab0831 100644 --- a/addons/base/static/src/js/boot.js +++ b/addons/base/static/src/js/boot.js @@ -50,7 +50,9 @@ openerp.base = function(instance) { openerp.base.core(instance); - openerp.base.dates(instance); + if (openerp.base.dates) { + openerp.base.dates(instance); + } openerp.base.formats(instance); openerp.base.chrome(instance); openerp.base.data(instance); diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index 588c848c248..032d3a69339 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -21,7 +21,7 @@ openerp.web_mobile.MobileWebClient = openerp.base.Widget.extend({ this.session = new openerp.base.Session("oe_errors"); this.crashmanager = new openerp.base.CrashManager(this); this.login = new openerp.web_mobile.Login(this, "oe_app"); - this.session.on_session_invalid.add(this.login.do_ask_login); +// this.session.on_session_invalid.add(this.login.do_ask_login); }, start: function() { this.session.start(); diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index f02713e6eb6..4a3e2167c02 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -21,7 +21,7 @@ openerp.web_mobile.FormView = openerp.base.Widget.extend({ id = this.list_id; model = this.action.res_model; view_id = this.action.views[1][0]; - this.dataset = new openerp.base.DataSetSearch(this.session, this.action.res_model, null, null); + this.dataset = new openerp.base.DataSetSearch(this, this.action.res_model, null, null); this.dataset.read_slice([],{}, function (result) { for (var i = 0; i < result.length; i++) { if (result[i].id == id) { diff --git a/addons/web_mobile/static/src/web_mobile.html b/addons/web_mobile/static/src/web_mobile.html index a7ab447d905..6efc28b6532 100755 --- a/addons/web_mobile/static/src/web_mobile.html +++ b/addons/web_mobile/static/src/web_mobile.html @@ -30,6 +30,7 @@ $(function() { QWeb = window.QWeb || new QWeb2.Engine(); var oe = openerp.init(); + openerp.web_mobile(oe); oe.web_mobile.mobilewebclient("moe"); });