TRUNK-4389 Added orderType check

(cherry picked from commit 08e0bc1ddac0499972d491103d72c313aef77128)

Conflicts:
	api/src/test/java/org/openmrs/OrderTest.java