SR# 6936 Add Order Type field to report
Merge remote-tracking branch 'origin/master'