Added batch and other changes to keep inventory computations simple
Merge branch 'master' of https://github.com/dservgun/erp