[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207...
authorChristophe Simonis <chs@openerp.com>
Wed, 7 May 2014 17:01:12 +0000 (19:01 +0200)
committerChristophe Simonis <chs@openerp.com>
Wed, 7 May 2014 17:01:12 +0000 (19:01 +0200)
commitb8089a1521f731c07c40cda12a5787be3fd386ac
tree7ef6eb80b54a064e203d65fcf15d462034f025ae
parent7654b7699c304594e2130ecf7a1ef33e0c68960f
parent9a271eef168df0df94e0d8cecf85f037320187ef
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1

bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
16 files changed:
addons/account/account_invoice.py
addons/account/account_move_line.py
addons/account_followup/account_followup.py
addons/crm/static/description/index.html
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/mail/mail_mail.py
addons/mail/mail_thread.py
addons/point_of_sale/point_of_sale.py
addons/report/models/report.py
addons/stock/product.py
addons/stock/stock.py
addons/stock/stock_view.xml
addons/website/static/src/js/website.editor.js
addons/website/static/src/js/website.snippets.editor.js
addons/website_forum/controllers/main.py
addons/website_forum/views/website_forum.xml