[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)
commitecb02bc8abcd8e1bd6d432abff15750b4e581138
treec776074055bd19b2dae9859e54ef7accb96dbcfd
parente374eb4309096a244205c5fef6d16dacd5372a84
parent54b0e0ad523d217b05a2ae2855ad9787a85d0afb
[MERGE] Merge from trunk-wms

bzr revid: jco@openerp.com-20140327142024-ullrstsauxt5ji10
addons/product/product.py
addons/product/product_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml