updates
conflicts in stock_entry
[Bug Fixes][Sample Allocation]
[Hr & Selling Changes]
Merge branch 'master' of https://github.com/saurabh6790/tru_app_back