Issue #22956:correctly set _supplyOrderType in populate when PR converted to PO
Issue #23021:honor location restrictions
Merge pull request #305 from garyhgohoos/22956

Issue #22956:correctly set _supplyOrderType in populate when PR converte...
Merge pull request #306 from garyhgohoos/23021

Issue #23021:honor location restrictions