[MERGE] forward port of branch 7.0 up to bbb8d8f2

addons/account/account_invoice_view.xml

addons/account/account_move_line.py

addons/base_vat/base_vat.py

addons/delivery/delivery.py

addons/gamification/views/badge.xml

addons/hr_holidays/hr_holidays.py

addons/mail/mail_thread.py

addons/project/report/project_report.py

addons/purchase_analytic_plans/purchase_analytic_plans.py

addons/stock/stock.py

addons/web/static/src/js/views.js

addons/website/static/src/css/snippets.css

addons/website/static/src/css/snippets.sass

addons/website_membership/controllers/main.py

openerp/addons/base/ir/ir_fields.py

openerp/addons/base/ir/ir_values.py

openerp/tools/safe_eval.py