[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)
commit1e6b7a5f787491855e719265f9837801c598a1c1
tree8d8fc89451cb767e5c40c3cc230fec880ce476a0
parentfd4fd35e3239c771ab9d692f47f61770ae882965
parentc86f217f7e9d654cb690c6a00c4f87b62d430516
[MERGE] forward port of branch saas-5 up to c86f217
addons/stock/stock.py