[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Wed, 26 Mar 2014 15:51:50 +0000 (16:51 +0100)
committerJosse Colpaert <jco@openerp.com>
Wed, 26 Mar 2014 15:51:50 +0000 (16:51 +0100)
bzr revid: jco@openerp.com-20140326155150-4y47ny5gyvjezlm9

1  2 
addons/product/product.py
addons/report/controllers/main.py
addons/stock/stock_view.xml

Simple merge
Simple merge
Simple merge