Procurement Tracker and subcontracting report bugs

Tracker and subcontracting report edge cases and calculations fixed.