[MERGE] forward port of branch 8.0 up to 92c7874
authorChristophe Simonis <chs@odoo.com>
Wed, 29 Oct 2014 18:45:09 +0000 (19:45 +0100)
committerChristophe Simonis <chs@odoo.com>
Wed, 29 Oct 2014 18:45:09 +0000 (19:45 +0100)
commitcf23a5dedaec67a3c34f6e4c3829f17fe8a054d0
treefc0bbda4aeb9d5b70e42c76386e484c22d26cd6f
parent8481fab1b1b3762f73ba5b472e12b702680144c2
parent92c7874eb8f4cf14c04d4d7b50853d56aef30436
[MERGE] forward port of branch 8.0 up to 92c7874
21 files changed:
addons/account/account_bank_statement.py
addons/account/account_invoice.py
addons/account/partner_view.xml
addons/board/static/src/css/dashboard.sass
addons/mrp/mrp.py
addons/product/product.py
addons/stock/stock.py
addons/web/static/src/js/openerpframework.js
addons/web_calendar/static/src/js/web_calendar.js
addons/website/models/website.py
addons/website/static/src/js/website.snippets.editor.js
addons/website_blog/models/website_blog.py
addons/website_blog/views/website_blog_templates.xml
addons/website_sale/controllers/main.py
addons/website_sale/static/src/css/website_sale.css
addons/website_sale/static/src/css/website_sale.sass
addons/website_sale/views/templates.xml
doc/conf.py
openerp/addons/base/ir/ir_model.py
openerp/models.py
openerp/tools/func.py