Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco
authorJosse Colpaert <jco@odoo.com>
Fri, 30 May 2014 08:24:31 +0000 (10:24 +0200)
committerJosse Colpaert <jco@odoo.com>
Fri, 30 May 2014 08:24:31 +0000 (10:24 +0200)
1  2 
addons/stock/stock_view.xml

Simple merge