upto labprocess correction

upto labprocess correction, c&d, delivery order
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/DeliveryordersController.php
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit fa9b20e57e52a71ab482b41d6badadc125177821.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/DeliveryordersController.php