From 81720b254733d701ab3c6cb37b315b9b9073676a Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 8 Oct 2024 10:20:15 +0200
Subject: [PATCH] modifs

---
 RPtoRFX_PrepOrder.ftl               | 2 +-
 RPtoRFX_Receipt.ftl                 | 6 +++---
 RPtoRFX_Receipt_DefaultLineData.ftl | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl
index 0f18d90..6328f50 100644
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -9,7 +9,7 @@
 <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
 <#assign defaultactor ="VIZ">
 <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
-	<#assign actorID = executionflow.ShipTo.ActorID >
+	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
 <#else>
 	<#assign actorID = defaultactor >
 </#if>
diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl
index 838293a..afb06f5 100644
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -6,7 +6,7 @@
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${executionflow.ShipTo.ActorID!""}",
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipTo.ActorID!"")}",
 		"originator_code": "${originator_code}"
 	},
 	"payload" :
@@ -15,8 +15,8 @@
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}",
 		"work_mode_code" :     "${work_mode_code}",
-		"original_code"  : "${executionflow.ShipFrom.ActorID}",
-		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
+		"original_code"  : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}",
+		"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
 
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
diff --git a/RPtoRFX_Receipt_DefaultLineData.ftl b/RPtoRFX_Receipt_DefaultLineData.ftl
index 112da79..8c09d53 100644
--- a/RPtoRFX_Receipt_DefaultLineData.ftl
+++ b/RPtoRFX_Receipt_DefaultLineData.ftl
@@ -2,7 +2,7 @@
 <#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
 
 <#-- How to use MD or SK map
-    Example : 
+    Example :
     <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
 
     If your SK is :