Issue 20040: Extracted more stuff out for Quote/Sales Order.