From e3f829683f2bb02409c475ad74b0be8ba5ffa778 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 12 May 2026 11:32:55 +0200
Subject: [PATCH] SCPN1-10706

---
 RPtoRFX_PrepOrder.ftl | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 64d66b8..3bbf34c 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -11,11 +11,7 @@
 <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in HARDIS WMS to use this feature -->
 <#assign defaultactor ="VIZ">
 <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
-	<#if (executionflow.ShipTo.ActorID?length gt 4) >
-		<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
-	<#else>
-		<#assign actorID = "${executionflow.ShipTo.ActorID}" >
-	</#if>
+	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
 <#else>
 	<#assign actorID = defaultactor >
 </#if>
@@ -26,11 +22,7 @@
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		<#if (executionflow.ShipFrom.ActorID?length gt 4) >
-				"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
-			<#else>
-				"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
-		</#if>
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
 		"originator_code": "${originator_code}"
 	},
 	"payload" :