[MERGE] forward port of branch saas-4 up to 1f20f61

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

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc openerp/addons/base/module/module.py
Simple merge

diff --cc openerp/addons/base/module/module_view.xml
Simple merge

diff --cc openerp/http.py
Simple merge