tree 4c97b0defeb733fcc911652aabdcc1c7dd77eb61
parent 05d00397d091a693e994f6e4c5ed18b672dd40a9
author Jamsheer <kuttypjamsheer@gmail.com> 1529478692 +0530
committer Nabin Hait <nabinhait@gmail.com> 1529478692 +0530

Pro-rata component consistency for monthly Salary slip (#14595)

* Pro-rata component consistency for monthly Salary slip

* Resolve merge conflict