[MERGE] forward port of branch 7.0 up to cd69dee
authorDenis Ledoux <dle@odoo.com>
Wed, 5 Nov 2014 12:39:41 +0000 (13:39 +0100)
committerDenis Ledoux <dle@odoo.com>
Wed, 5 Nov 2014 12:39:41 +0000 (13:39 +0100)
commitc666030539e70933d807b2139db1b4658ece5918
tree662a560df9e63507948e86394576e44a6c6cc8a5
parentc11451c7e818f28b3eb6c86e9e23832c96055819
parentcd69dee3f2c7a69ca2732688e1a0989473479711
[MERGE] forward port of branch 7.0 up to cd69dee
addons/mrp/mrp.py
addons/web/static/src/js/view_form.js