[MERGE] forward port of branch 8.0 up to 2e092ac

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/procurement/procurement.py
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/stock/product.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge

diff --cc openerp/addons/base/ir/ir_actions.py
Simple merge

diff --cc openerp/models.py
Simple merge

diff --cc openerp/service/server.py
Simple merge