report ba and ismo
Merge branch 'development'
fix layout pdf
fix formula report sold
show info more readable
show info more readable
fix available ba method
fix available ba method

Conflicts:
	app/models/service.rb
fix blank state
fix blank state
fix format
Merge branch 'development'

Conflicts:
	app/models/service.rb
	app/views/reports/print_pdf.html.erb
stuff rake
Merge branch 'development'
add calculation
fix formula
Revert "fix formula"

This reverts commit 528cb919834f982e65f21d41222c5d18f04f91d6.
fix formula
Merge branch 'development'
fix csv