Merge pull request #3479 from nabinhait/develop

[fix][report] Payment period based on invoice date