Sales Order Fixes
Merge pull request #549 from sandal-smuggler/Sales-Order-Fix-106

Sales Order Fixes