Merge pull request #1952 from nabinhait/hotfix

Country mandatory in company master
Minor fix in reorder item
Merge pull request #1953 from anandpdoshi/anand-july-18

Minor fix in reorder item
Fixes overflow tolerance