Issue #21737:correctly handle supply order override price
Issue #21718:disable _save when clearing
Merge pull request #197 from garyhgohoos/21737

Issue #21737:correctly handle supply order override price
Merge pull request #198 from garyhgohoos/21718

Issue #21718:disable _save when clearing