bug fix
confrict removed
fix failing tests
Merge branch 'master' into prevention-management
fixing stock location process
Cloned from online
Merge branch 'spare-part-module' into spare-part-module-impl
Spare part test modified
Merge branch 'spare-part-module' of github.com:clintonhealthaccess/memms into spare-part-module
Merge branch 'spare-part-module' into spare-part-module-impl
Merge branch 'spare-part-module-impl' of https://github.com/clintonhealthaccess/memms into spare-part-module-impl
-aPeople involved not working(corrective maintenance) resolved
Merge branch 'spare-part-module' of github.com:clintonhealthaccess/memms into spare-part-type-impl
Tests fixed
removed unnecessary comments
Runtime error fixed at MMC
Runtime error fixed for Location MMC
Merge branch 'spare-part-module-impl' into spare-part-module
status DISPOSED changed to OPERATIONAL while saving object
Merge branch 'spare-part-module-impl' into spare-part-module