Merge pull request #3855 from nabinhait/discount

discount percentage should not be reset to zero on applying price list