[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date
[fix] [minor] merge conflict fixed
[fix] [minor] setup print fix in sales invoice
Merge pull request #1139 from akhileshdarjee/master

[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date