[MERGE] forward port of branch saas-4 up to 1f20f61
authorChristophe Simonis <chs@odoo.com>
Sun, 22 Jun 2014 13:33:22 +0000 (15:33 +0200)
committerChristophe Simonis <chs@odoo.com>
Sun, 22 Jun 2014 13:33:22 +0000 (15:33 +0200)
commit4cb5381deecdf28d2a0f6b1e7f4b16a611ec9de9
tree6113f40cf7639b43dbe83e61416ac598c2289c72
parentc9f6587dbca08eca029d44bacc8fe587c6460028
parent1f20f61ab4f6acf79f4db6ba9a17c1282014ef5f
[MERGE] forward port of branch saas-4 up to 1f20f61
addons/sale/sale.py
addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/js/view_form.js
openerp/addons/base/module/module.py
openerp/addons/base/module/module_view.xml
openerp/http.py