Merge remote-tracking branch 'odoo/master' into master-wmsstagingmig-jco
authorJosse Colpaert <jco@odoo.com>
Mon, 23 Jun 2014 08:06:42 +0000 (10:06 +0200)
committerJosse Colpaert <jco@odoo.com>
Mon, 23 Jun 2014 08:06:42 +0000 (10:06 +0200)
1  2 
addons/stock/stock.py

Simple merge