Enable category and product discounts to be applied separately
At the moment when you apply a discount to a category and then apply a discount to a product within that category the discounts are applied on top of each other.
This doesn't work if you want a particular product within the category to have a lesser discount than the overall category discount.
Please add the ability to specify that the product discount should be applied instead of the category discount.
