Merge pull request #5629 from saurabh6790/erp_v7_fix

[Minor][fix] Holiday list message fix and company attr fix