[*] BO : Fix #PSCSX-3001, Automatically assign shop id if employee has access to only one shop
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6