issue #21986: sales order workflow

Updated based on Vinay's feedback