Issue #24111:fix markup pricing and margins with uom conversion
Issue #24111:clarify margin calculation
Merge pull request #408 from garyhgohoos/24111

Issue #24111:fix markup pricing and margins with yom conversion
goes with http://github.com/xtuple/xtuple/pull/1654
Merge pull request #424 from xtuple/4_5_x

4 5 x