Discount cash from quota amount

Merged Santiago Said requested to merge discount-cash-from-quota-amount into 8.0-stage

Merge request reports