From 78c2978274b9c517150a2f3392cdc0ba52173acd Mon Sep 17 00:00:00 2001
From: its-kios09 <legacyitsolution@gmail.com>
Date: Thu, 30 Oct 2025 20:07:41 +0300
Subject: [PATCH] TRUNK-6462: Align FulfillerStatus enum with FHIR Task Status
 codes

---
 api/src/main/java/org/openmrs/Order.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/org/openmrs/Order.java b/api/src/main/java/org/openmrs/Order.java
index ed74bd568e91..46640bff72e8 100644
--- a/api/src/main/java/org/openmrs/Order.java
+++ b/api/src/main/java/org/openmrs/Order.java
@@ -54,19 +54,28 @@ public enum Action {
 		DISCONTINUE,
 		RENEW
 	}
-	
+
 	/**
 	 * Valid values for the status of an order that is received from a filler
-	 * @since 2.2.0  
+	 * Aligned with FHIR Task Status: https://hl7.org/fhir/codesystem-task-status.html
+	 * @since 2.2.0
 	 * @since 2.6.1 added ON_HOLD & DECLINED
+	 * @since 2.8.x added DRAFT, REQUESTED, ACCEPTED, REJECTED, READY, CANCELLED, FAILED, ENTERED_IN_ERROR
 	 */
 	public enum FulfillerStatus {
-		RECEIVED, 
+		RECEIVED,
 		IN_PROGRESS,
 		EXCEPTION,
 		ON_HOLD,
 		DECLINED,
-		COMPLETED
+		COMPLETED,
+		DRAFT,
+		REQUESTED,
+		ACCEPTED,
+		REJECTED,
+		CANCELLED,
+		FAILED,
+		ENTERED_IN_ERROR
 	}
 	
 	private Integer orderId;