Issue #20003:changes to unitcost and margin for uom conversions
Merge pull request #43 from garyhgohoos/20003fix

Issue #20003:changes to unitcost and margin for uom conversions