[MERGE] forward port of branch saas-3 up to c666030
authorDenis Ledoux <dle@odoo.com>
Wed, 5 Nov 2014 12:40:30 +0000 (13:40 +0100)
committerDenis Ledoux <dle@odoo.com>
Wed, 5 Nov 2014 12:40:30 +0000 (13:40 +0100)
commit89716cb4d602fdd3379a0310ec0b9a56f9b88226
treed946e65f60c728fafb138d5133ca144b7b2aba87
parentafce229e5ad2aad0e0b26286b12764f9ce90a4ae
parentc666030539e70933d807b2139db1b4658ece5918
[MERGE] forward port of branch saas-3 up to c666030
addons/mrp/mrp.py
addons/web/static/src/js/view_form.js