Merge branch 'odoo/8.0' into master-wmsstaging4-jco
authorJosse Colpaert <jco@odoo.com>
Mon, 7 Jul 2014 21:34:42 +0000 (23:34 +0200)
committerJosse Colpaert <jco@odoo.com>
Mon, 7 Jul 2014 21:34:42 +0000 (23:34 +0200)
commitbeb12f71f17cfb2dea0e52cf2e4c863da4bfcc86
treed9d7e56132c3d4c891ceba2d801a55739cd1f384
parentbdfdba0de41969015db566f9cc3054629e65a25f
parente309159eb134bf65e2a091bcca482a9b4e5acddb
Merge branch 'odoo/8.0' into master-wmsstaging4-jco
addons/mrp/mrp.py
addons/mrp/stock.py
addons/purchase/purchase.py