Fixes to Sales Invoice