Correct discount calculation in admin when fees are involved. Closes #5103