Merge pull request #5396 from rohitwaghchaure/enhancement_point_of_sales

[POS] enhancement and minor fixes