[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Thu, 27 Mar 2014 14:20:24 +0000 (15:20 +0100)
committerJosse Colpaert <jco@openerp.com>
Thu, 27 Mar 2014 14:20:24 +0000 (15:20 +0100)
bzr revid: jco@openerp.com-20140327142024-ullrstsauxt5ji10

1  2 
addons/product/product.py
addons/product/product_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml

Simple merge
Simple merge
Simple merge
Simple merge