/ Add check in object model
Merge pull request #486 from PhpMadman/patch-1

[-] FO : In stock sort is now removed when Stock managment is disabled
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development