[MERGE]merge main view editor branch upto 890 revision.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Mon, 24 Oct 2011 13:12:18 +0000 (18:42 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Mon, 24 Oct 2011 13:12:18 +0000 (18:42 +0530)
commit1e27353ed75cae9b415ce7c24ccaa7ccaca0446d
treee2c717762f2e5c6820a1a3329e25a94190a2f917
parent59f3ab077f4d44b443033069932ca489777fbd13
parentf1f48e69f0e654487234ced0537a03dd46fb3e12
[MERGE]merge main view editor branch upto 890 revision.

bzr revid: kch@tinyerp.com-20111024131218-p6liwm82irnd3q4c
addons/web/controllers/main.py
addons/web/static/src/js/data_import.js
addons/web/static/src/js/search.js
addons/web/static/src/js/view_form.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml