fixed issue with total
Merge branch 'master' of https://github.com/abhishek-jaiswal/shipment