Merge pull request #7702 from mbauskar/hotfix

[minor] payment entry company trigger