[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934...
authorChristophe Simonis <chs@openerp.com>
Thu, 13 Jun 2013 17:39:00 +0000 (19:39 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 13 Jun 2013 17:39:00 +0000 (19:39 +0200)
commita61e7cb0c80ae773cab9753bd8a4e7e888bbf415
tree019a235869a5e087055700895d4584c80e2f9afb
parent5ed0ac2614b9430e61dae472d657a21c037d6ee9
parent180e6e41d81e28df43b41e3cb6131225d4169a28
[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02
bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
13 files changed:
addons/web/controllers/main.py
addons/web/http.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/view_form.js
addons/web/static/src/js/view_list.js
addons/web/static/src/js/views.js
addons/web/static/src/xml/base.xml
openerp/__init__.py
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_partner.py
openerp/addons/base/res/res_partner_view.xml
openerp/addons/base/res/res_users.py