[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Fri, 11 Apr 2014 09:59:28 +0000 (11:59 +0200)
committerJosse Colpaert <jco@openerp.com>
Fri, 11 Apr 2014 09:59:28 +0000 (11:59 +0200)
commit36b12e4339305a326b2b2048062255a4fa376ee8
tree8a9d56173d577b058c1bb99232ee49502410e4f8
parentaeea3f8b4e0608e454427f74e4b5c3ffb9267628
parentd31e02fb3ff5a712bf2041ace6aa19fc5876c772
[MERGE] Merge from trunk-wms

bzr revid: jco@openerp.com-20140411095928-jnlqi15cn7zz491d
addons/stock/__openerp__.py
addons/stock/procurement.py
addons/stock/stock.py
addons/stock/stock_view.xml
addons/stock_account/stock_account.py