[MERGE] forward port of branch saas-5 up to c86f217
authorChristophe Simonis <chs@odoo.com>
Thu, 31 Jul 2014 09:22:29 +0000 (11:22 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 31 Jul 2014 09:22:29 +0000 (11:22 +0200)
1  2 
addons/stock/stock.py

Simple merge