Merge pull request #1814 from anandpdoshi/anand-wip

Don't set warehouse when creating serial no, fixed currency exchange error message