Issue #20533:correctly handle PO supply orders when site changes