[MERGE] forward port of branch 8.0 up to 92183e5
authorChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 16:23:46 +0000 (18:23 +0200)
committerChristophe Simonis <chs@odoo.com>
Fri, 24 Oct 2014 16:23:46 +0000 (18:23 +0200)
commit27979746fb18de15f20da3c4bba939f1a7c73b2f
tree3401e307821a3e3e659c1e703625429fc631eae2
parent8e7204942dfee3a4261fa63717ee95c21c0ffb9f
parent92183e59a72a2d13831896a7519ad8b35854e156
[MERGE] forward port of branch 8.0 up to 92183e5
addons/event_sale/models/event.py
addons/event_sale/models/sale_order.py
addons/mail/static/src/js/mail.js
addons/sale/sale.py
addons/web/controllers/main.py
addons/website_event_sale/controllers/main.py
addons/website_event_sale/views/website_event_sale.xml
addons/website_sale/controllers/main.py
addons/website_sale/views/templates.xml