[*] BO : Fix #PSCSX-3734, Do not display specific price if currency is not activated
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6