Merge pull request #3476 from nabinhait/develop

Expense Approver Query and discount label