CRM-16861:apply discount to VAT/Sales Tax

Merged colemanw requested to merge github/fork/priyankakaran26/CRM-16861-VAT-discount into master

Merge request reports