only load company if has amount
Merge branch 'develop' of github.com:jdubie/flutter into develop