Moving the Amount Calculation
Merge branch 'master' of https://github.com/fabraz/dasrefactoring