[*] FO : Fix #PSCSX-3236, apply specific fixed price for combinations only (product.js)
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6