Changes
Changed files
Latest changes
Latest commit
Merge branch 'master' of https://github.com/KevinMarete/ADT
Latest changes
Latest changes
CM use crypto-coccal meningitis in other illnesses not from indications
CM changes in order controller
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/controllers/order.php
	application/views/sections/link.php
	application/views/stock_transaction_v.php
	assets/cdrr_satellite.xls
	assets/cdrr_stand_alone.xls
	assets/order_merge.xls
	assets/viral_load.json
Merged with Eunice
Print drugs issued
Generate pdf drug issued transactions
Generate PDF label
Changelox updated
updates from marete,jgat
changes:ordering has no duplicates
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/sections/link.php
	assets/viral_load.json
Routine refill bug
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/controllers/order.php
	application/views/stock_transaction_v.php