Catalog code updated
Report code updated
voucher code updated
Merge pull request #288 from haramrit/dirty

Code updated according to coding guidelines