diff options
| author | jke-openerp <jke@openerp.com> | 2013-12-18 14:10:34 +0100 |
|---|---|---|
| committer | jke-openerp <jke@openerp.com> | 2013-12-18 14:10:34 +0100 |
| commit | e4469e0aeb13a7b43efdc0dba1db64ce9eb2f96d (patch) | |
| tree | 2b34f9b086e8851ae0d120d94b06cdd4cdabc821 /addons/web | |
| parent | b5059e1d525b0e774923fade7c1b2f183c499622 (diff) | |
| parent | 0fd50c4750a5ca336954c5c6e4ca1fe414bd42aa (diff) | |
[MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131218131034-61e6su19shmrgakz
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/search.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index bfbc1e0b067..51d433a2656 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -37,6 +37,7 @@ This module provides the core of the OpenERP Web Client. "static/lib/jquery.tipsy/jquery.tipsy.js", "static/lib/jquery.textext/jquery.textext.js", "static/lib/jquery.timeago/jquery.timeago.js", + "static/lib/bootstrap/js/bootstrap.js", "static/lib/qweb/qweb2.js", "static/lib/underscore/underscore.js", "static/lib/underscore.string/lib/underscore.string.js", diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index c3ef682bfcc..45170e08a96 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -535,7 +535,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea resp(_(arguments).chain() .compact() .map(function (completion) { - console.log(completion); if (completion.length && completion[0].facet !== undefined) { completion[0].first = true; } |