[MERGE] forward port of branch saas-3 up to a66f3dd
authorChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 10:33:17 +0000 (12:33 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 10:33:17 +0000 (12:33 +0200)
commitf68c83545af89d7793884b177b1f5679c8619b84
tree07b527ab27d9fb3f532267a0120f734eefdd461d
parentb466e6e6b90bb354aaf44eeb1e13ed2e1316e476
parenta66f3dd99243ee87281b3e44c9fc202609e34f49
[MERGE] forward port of branch saas-3 up to a66f3dd
addons/web/static/src/js/view_list.js
addons/web_calendar/static/src/js/web_calendar.js
openerp/addons/base/ir/ir_ui_view.py
openerp/osv/fields.py