updated sorting logic
Unit of measurement calculation for ledger
Merge pull request #522 from freefony/refactor/unit-of-measure-for-ledger

Unit of measurement calculation for ledger
Merge branch 'upstream-develop' into feature/update-stock-graph-with-stock-balance

Conflicts:
	app/scripts/services/bundle-service.js