[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024...
authorChristophe Simonis <chs@openerp.com>
Tue, 18 Mar 2014 13:27:41 +0000 (14:27 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 18 Mar 2014 13:27:41 +0000 (14:27 +0100)
commit99a3c459764e79b5457f7c9a0d875f6894c8d8c7
tree6a981121db4a6f04abba99a152fb2c7a09b9661f
parent1395c9ee0e14ce2c35dbf6258678d3b032d52c73
parentcac0c9600a806ae8783b1bed5f11ca97107bf450
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v

bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
addons/account/account.py
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml
addons/mail/mail_thread.py
addons/point_of_sale/point_of_sale.py
addons/website/static/src/css/website.css
addons/website/static/src/css/website.sass
addons/website/static/src/js/website.snippets.editor.js
addons/website/static/src/xml/website.editor.xml
addons/website_sale/controllers/main.py
addons/website_sale/views/website_sale.xml