[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Wed, 23 Apr 2014 09:55:28 +0000 (11:55 +0200)
committerJosse Colpaert <jco@openerp.com>
Wed, 23 Apr 2014 09:55:28 +0000 (11:55 +0200)
commit5807343602669c1745f0284aef5773dd1a6bb236
tree10d8c0057d6c7c2a522aadcbe2c86086e9ccc754
parentea456d4458cd5eaef28de507ea8a5a721bb06b44
parentd69f5e20ec4d78890a9ca576fa2ba7de18f73cf2
[MERGE] Merge from trunk-wms

bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/stock/procurement.py
addons/stock/stock.py
addons/stock/stock_view.xml