Order Supply - Email template formatting
Order number related changes