Issue 20040: More fixes for Sales Order Views