Issue 20040: Fixes for Quote/Sales Order