[MERGE] forward port of branch 8.0 up to fd4fd35
authorChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 18:52:43 +0000 (20:52 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 30 Jul 2014 18:52:43 +0000 (20:52 +0200)
commit4946327eac689ec6271950ec8a375b26e344e283
treef5959b7358f9e911d1952b66f308251d678fb2be
parentfeb2dff05771c93e5c62ad1b1495bafaee832b29
parentfd4fd35e3239c771ab9d692f47f61770ae882965
[MERGE] forward port of branch 8.0 up to fd4fd35
19 files changed:
addons/account/account_invoice.py
addons/account_anglo_saxon/test/anglo_saxon.yml
addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
addons/fleet/fleet.py
addons/fleet/fleet_view.xml
addons/mail/res_config.py
addons/mail/res_config_view.xml
addons/mail/tests/test_mail_features.py
addons/sale/sale.py
addons/sale/sale_view.xml
addons/stock/doc/stock.rst
addons/stock/stock.py
addons/website/controllers/main.py
addons/website/views/website_templates.xml
addons/website_blog/static/src/js/website_blog.inline.discussion.js
addons/website_forum/models/forum.py
openerp/addons/base/ir/ir_qweb.py
openerp/addons/base/res/res_partner_view.xml
openerp/release.py