Merge pull request #3369 from anandpdoshi/anand-may-27

Check if company exists in re-order item