Merge pull request #13718 from Zlash65/enterprise

Department tree improv and moved Currency field up the list in Company