[-] FO : Fix discount display issues #PSCSX-3308
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6