[MERGE] forward port of branch saas-3 up to 3d80dc2
authorChristophe Simonis <chs@odoo.com>
Thu, 4 Sep 2014 15:51:42 +0000 (17:51 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 4 Sep 2014 15:51:42 +0000 (17:51 +0200)
commit9363bc9182b3eb70980b3a80e3ea2d4809f44840
treee30c6c89fb35ca558e904abb33070ba3a807ec40
parent05683f05b535cab94f9e01dae1f4701428c38020
parent3d80dc2bbfcda08e787159d2711ac0dc56f81ad6
[MERGE] forward port of branch saas-3 up to 3d80dc2
addons/calendar/__openerp__.py
addons/calendar/calendar.py
addons/calendar/calendar_data.xml
addons/crm_partner_assign/crm_portal_view.xml
addons/sale/sale.py
addons/web/static/src/js/views.js