Merge pull request #2027 from odoo-dev/8.0-wmsstaging7-jco
authorJosse Colpaert <jco@odoo.com>
Wed, 3 Sep 2014 19:36:01 +0000 (21:36 +0200)
committerJosse Colpaert <jco@odoo.com>
Wed, 3 Sep 2014 19:36:01 +0000 (21:36 +0200)
8.0 wmsstaging7 jco

1  2 
addons/mrp/mrp.py
addons/mrp/mrp_view.xml

Simple merge
Simple merge