Merge pull request #2480 from nabinhait/fix1

Fixes for discount amount