diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 85f92c7b572..8305552e640 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -469,6 +469,25 @@ openerp.base.Session = openerp.base.Controller.extend( /** @lends openerp.base.S }); }, do_load_modules_debug: function(result) { +// function create_script_load_listener(elem,registry_item,flag,onload) { +// elem.onload = elem.onreadystatechange = function() { +// if ((elem.readyState && elem.readyState != "complete" && elem.readyState != "loaded") || registry_item[flag]) return; +// elem.onload = elem.onreadystatechange = null; +// onload(); +// }; + +// domscript.onload = function() { +// if ( ! domscript.onloadDone ) { +// domscript.onloadDone = true; +// init(); +// } +// }; +// domscript.onreadystatechange = function() { +// if ( ( "loaded" === domscript.readyState || "complete" === domscript.readyState ) && ! domscript.onloadDone ) { +// domscript.onloadDone = true; +// init(); +// } +// } $LAB.setOptions({AlwaysPreserveOrder: true}) .script(result) .wait(this.on_modules_loaded); diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 790a442f810..25dcca611bd 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -2218,8 +2218,10 @@ openerp.base.form.widgets = new openerp.base.Registry({ 'url' : 'openerp.base.form.FieldUrl', 'text' : 'openerp.base.form.FieldText', 'text_wiki' : 'openerp.base.form.FieldText', - 'date' : 'openerp.base.form.FieldDate', - 'datetime' : 'openerp.base.form.FieldDatetime', +// 'date' : 'openerp.base.form.FieldDate', +// 'datetime' : 'openerp.base.form.FieldDatetime', + 'date' : 'openerp.base.form.FieldChar', + 'datetime' : 'openerp.base.form.FieldChar', 'selection' : 'openerp.base.form.FieldSelection', 'many2one' : 'openerp.base.form.FieldMany2One', 'many2many' : 'openerp.base.form.FieldMany2Many',