CRM-14653 fix
Merge pull request #60 from monishdeb/discount-fixes

CRM-14653 fixes