[-] BO : Fix PSCSX-3347 id_shop not well set
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6