adding date option to transanction report
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev
fixing conflict in dev services.js