amend Popup param and coding for SaleOrder