[MERGE] forward port of branch 8.0 up to 1e6b7a5
authorChristophe Simonis <chs@odoo.com>
Thu, 31 Jul 2014 09:23:03 +0000 (11:23 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 31 Jul 2014 09:23:03 +0000 (11:23 +0200)
1  2 
addons/stock/stock.py

Simple merge