[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)
1  2 
addons/mrp/mrp.py
addons/web/static/src/js/view_form.js

Simple merge
Simple merge