[MERGE] Merge with main branch trunk-wms
authorjke-openerp <jke@openerp.com>
Tue, 5 Nov 2013 19:09:18 +0000 (20:09 +0100)
committerjke-openerp <jke@openerp.com>
Tue, 5 Nov 2013 19:09:18 +0000 (20:09 +0100)
commitc8457ad7a63d704ae8e7e315af3b8538e69f326d
treeb9b0defa2ba9c61fc2b4e91a51b988b509a4fc55
parent1b260cc9938900b7b1c1c7729119effa1abe60c3
parent69ca0194902cd0e7b91b66d314aa3424fb0c3238
[MERGE] Merge with main branch trunk-wms

bzr revid: jke@openerp.com-20131105190918-cosbl68i4bzqxc7i
addons/stock/stock.py
addons/stock/stock_view.xml