[+] BO : Allow discounts (specific prices) to be set tax excl. or tax incl. (see #PSCSX-3180)
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6