sorted discount
Merge branch 'debtcalc' into testing