From 956105fc3807f5c6655cf2637a19b5d7647fe434 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 16 Sep 2024 16:12:43 +0200
Subject: [PATCH] modifs uniqueness

---
 ...RP_HfDtlStockLs_ActorSnapshotCompleted.ftl | 46 +++++++++++++++----
 RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl     | 41 ++++++++++++++---
 RFXtoRP_HsaCarrier_ActorCreated.ftl           | 17 +++++--
 RFXtoRP_HsaCarrier_ActorDeleted.ftl           | 16 ++++++-
 RFXtoRP_HsaCons_ActorCreated.ftl              | 18 ++++++--
 RFXtoRP_HsaCons_ActorDeleted.ftl              | 15 +++++-
 RFXtoRP_HsaIpgMove_GoodsReceived.ftl          | 28 ++++++++---
 RFXtoRP_HsaIpgMove_StockMoved.ftl             | 11 ++++-
 RFXtoRP_HsaSup_ActorCreated.ftl               | 17 +++++--
 RFXtoRP_HsaSup_ActorDeleted.ftl               | 15 +++++-
 RFXtoRP_HsrDepot_ActorDeleted.ftl             | 16 ++++++-
 RFXtoRP_HsrPrepa_CarrierUpdated.ftl           | 15 ++++--
 ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 17 ++++++-
 RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl      | 16 ++++++-
 RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl       | 14 +++++-
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl      | 29 +++++++++++-
 ...P_HsrReceiptList_ExecutionflowDetected.ftl | 29 +++++++++++-
 17 files changed, 309 insertions(+), 51 deletions(-)

diff --git a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
index 6e6600b..64f5ed7 100644
--- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
+++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
@@ -1,27 +1,53 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+
 [
   <#list reflexStockPicturesInterface.detailled_stock_list as stock>
   {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
-        "RefID": "${stock.physical_depot_code}"
-            },
-    "Payload": {      
+       <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${stock.physical_depot_code}"
+        <#else>
+          "ActorID": "DEP${stock.physical_depot_code}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${stock.physical_depot_code}"
+        <#else>
+          "ActorID": "DEP${stock.physical_depot_code}"
+        </#if>
+      </#if>
+      },
+    "Payload": {
        <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
       "Snapshot": {
         "EndDateTime": {
-           "DateTime": "${generation_date}",  
-           "AuthorTimeZone": "${time_zone_rfx}"              
-         },   
+           "DateTime": "${generation_date}",
+           "AuthorTimeZone": "${time_zone_rfx}"
+         },
+         <#if text_language_rfx="fr">
+            <#if uniqueness?? && uniqueness!="" >
               "ID":  "${stock.physical_depot_code}-${idSnapshot}",
-              "MessageNb": ${sum_elt}
+            <#else>
+              "ID":  "DEP${stock.physical_depot_code}-${idSnapshot}",
+            </#if>
+          <#else>
+            <#if uniqueness?? && uniqueness!="" >
+              "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+            <#else>
+              "ID":  "DEP${stock.physical_depot_code}-${idSnapshot}",
+            </#if>
+          </#if>
+          "MessageNb": ${sum_elt}
        }
-             
+
     }
   }
   <#break>
-  </#list>  
+  </#list>
 ]
 
diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
index deed817..882466e 100644
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -1,4 +1,5 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
 [
   <#list reflexStockPicturesInterface.detailled_stock_list as stock>
   {
@@ -6,19 +7,45 @@
       "ProjectID": "${projectRP}"
     },
     "Payload": {
-      "ActorID": "${stock.physical_depot_code}",
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${stock.physical_depot_code}",
+        <#else>
+          "ActorID": "DEP${stock.physical_depot_code}",
+        </#if>
+     <#else>
+      <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${stock.physical_depot_code}",
+        <#else>
+          "ActorID": "DEP${stock.physical_depot_code}",
+        </#if>
+      </#if>
+
       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
       "Snapshot": {
         "DateTime": {
            "DateTime": "${generation_date}",
            "AuthorTimeZone": "${time_zone_rfx}"
          },
-              "ID":  "${stock.physical_depot_code}-${idSnapshot}",
-              "Quantity":
-              {
-                "Value" : "${stock.quantity_in_base_lvs!"0"}",
-                "LVID": "${quantity_in_base_lv_RP_Cst}"
-              }
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+        <#else>
+          "ID":  "DEP${stock.physical_depot_code}-${idSnapshot}",
+        </#if>
+      <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+        <#else>
+          "ID":  "DEP${stock.physical_depot_code}-${idSnapshot}",
+        </#if>
+      </#if>
+
+      "Quantity":
+      {
+        "Value" : "${stock.quantity_in_base_lvs!"0"}",
+        "LVID": "${quantity_in_base_lv_RP_Cst}"
+      }
        },
 
        "Goods": {
diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl
index 44c4c11..8869d32 100644
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -1,13 +1,22 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if uniqueness?? && uniqueness!="" >
-        "RefID": "${carrier.carrier_code?trim?json_string}"
-      <#else>
-        "RefID": "CA${carrier.carrier_code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${carrier.carrier_code?trim?json_string}"
+        <#else>
+          "RefID": "TRA${carrier.carrier_code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${carrier.carrier_code?trim?json_string}"
+        <#else>
+          "RefID": "CAR${carrier.carrier_code?trim?json_string}"
+        </#if>
       </#if>
     },
 
diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
index 5e131c4..bccbc47 100644
--- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
@@ -1,10 +1,24 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${carrier.carrier_code?trim?json_string}"
+        <#else>
+          "RefID": "TRA${carrier.carrier_code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${carrier.carrier_code?trim?json_string}"
+        <#else>
+          "RefID": "CAR${carrier.carrier_code?trim?json_string}"
+        </#if>
+      </#if>
+
     },
 
     "Payload": {}
diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl
index 9730ecd..bf287d4 100644
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -1,14 +1,24 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if uniqueness?? && uniqueness!="" >
-        "RefID": "${actor.code?trim?json_string}"
-      <#else>
-        "RefID": "C${actor.code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "DES${actor.code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "CON${actor.code?trim?json_string}"
+        </#if>
       </#if>
+
     },
 
     "Payload": {
diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl
index 6fbfb45..46b44cb 100644
--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -1,10 +1,23 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "DES${actor.code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "CON${actor.code?trim?json_string}"
+        </#if>
+      </#if>
     },
 
     "Payload": {}
diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index 0575947..516bc26 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -29,22 +29,38 @@
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
+
         <#if reflexMvtStockInterface.receipt_reference!="">
           "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
         <#else>
-          <#if uniqueness?? && uniqueness!="" >
-            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+          <#if text_language_rfx="fr">
+            <#if uniqueness?? && uniqueness!="" >
+              "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+            <#else>
+              "ExecutionflowID": "DEP${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+            </#if>
           <#else>
-            "ExecutionflowID": "D${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+            <#if uniqueness?? && uniqueness!="" >
+              "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+            <#else>
+              "ExecutionflowID": "DEP${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+            </#if>
           </#if>
-
         </#if>
         "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        <#if uniqueness?? && uniqueness!="" >
+        <#if text_language_rfx="fr">
+          <#if uniqueness?? && uniqueness!="" >
             "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
           <#else>
-            "ActorID": "D${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+            "ActorID": "DEP${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
           </#if>
+        <#else>
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+          <#else>
+            "ActorID": "DEP${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+          </#if>
+        </#if>
 
         "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl
index 513f146..467ee19 100644
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -42,11 +42,20 @@
 
         "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}"
       },
+      <#if text_language_rfx="fr">
         <#if uniqueness?? && uniqueness!="" >
           "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
         <#else>
-          "ActorID": "D${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+          "ActorID": "DEP${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
         </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+        <#else>
+          "ActorID": "DEP${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+        </#if>
+      </#if>
+
       "Movement": {
 
        "DateTime": {
diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl
index 89ae6ba..97329af 100644
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -1,13 +1,22 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if uniqueness?? && uniqueness!="" >
-        "RefID": "${actor.code?trim?json_string}"
-      <#else>
-        "RefID": "S${actor.code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "FOU${actor.code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "SUP${actor.code?trim?json_string}"
+        </#if>
       </#if>
     },
 
diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl
index 6fbfb45..109bc2f 100644
--- a/RFXtoRP_HsaSup_ActorDeleted.ftl
+++ b/RFXtoRP_HsaSup_ActorDeleted.ftl
@@ -1,10 +1,23 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "FOU${actor.code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${actor.code?trim?json_string}"
+        <#else>
+          "RefID": "SUP${actor.code?trim?json_string}"
+        </#if>
+      </#if>
     },
 
     "Payload": {}
diff --git a/RFXtoRP_HsrDepot_ActorDeleted.ftl b/RFXtoRP_HsrDepot_ActorDeleted.ftl
index d4e070a..9523b0a 100644
--- a/RFXtoRP_HsrDepot_ActorDeleted.ftl
+++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl
@@ -1,10 +1,24 @@
+<#include "HfRpConfig.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${depot.physical_depot_code?trim?json_string}"
+        <#else>
+          "RefID": "DEP${depot.physical_depot_code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "RefID": "${depot.physical_depot_code?trim?json_string}"
+        <#else>
+          "RefID": "DEP${depot.physical_depot_code?trim?json_string}"
+        </#if>
+      </#if>
+
     },
 
     "Payload": {}
diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
index 31b33f0..547813b 100644
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -18,11 +18,20 @@
       },
     "Payload":{
       "Carrier": {
-        <#if uniqueness?? && uniqueness!="" >
-           "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+        <#if text_language_rfx="fr">
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
           <#else>
-           "ActorID":"CA${preparationOrder.load_data.carrier_code?trim?json_string}"
+            "ActorID":"TRA${preparationOrder.load_data.carrier_code?trim?json_string}"
           </#if>
+        <#else>
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+          <#else>
+            "ActorID":"CAR${preparationOrder.load_data.carrier_code?trim?json_string}"
+          </#if>
+        </#if>
+
       }
       <#-- Add transport grade code
       <#if preparationOrder.transport_grade_code!="">
diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
index b5e3f74..7f84b32 100644
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -74,7 +74,7 @@
        "Goods": {
            "ItemID": "${preparation_line.item_code?trim?json_string}",
            "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           
+
              <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
 				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
 				"PriorityDate": "${priority_date}",
@@ -116,7 +116,20 @@
         <#else>
           "LineID": "${preparation_line.pro_line_number!0}",
         </#if>
-       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
+        <#if text_language_rfx="fr">
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
+          <#else>
+            "ActorID": "DEP${preparationOrder.physical_depot_code?trim?json_string}",
+          </#if>
+        <#else>
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
+          <#else>
+            "ActorID": "DEP${preparationOrder.physical_depot_code?trim?json_string}",
+          </#if>
+        </#if>
+
        "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
             "Value": ${despatched_ipg.quantity_lvs}
diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
index 7a41e47..e723198 100644
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -18,7 +18,21 @@
       },
     "Payload":{
       "Carrier": {
-          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+        <#if text_language_rfx="fr">
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+          <#else>
+            "ActorID":"TRA${preparationOrder.load_data.carrier_code?trim?json_string}"
+          </#if>
+        <#else>
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+          <#else>
+            "ActorID":"CAR${preparationOrder.load_data.carrier_code?trim?json_string}"
+          </#if>
+        </#if>
+
+
       }
     }
     }
diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
index 107c511..37ecb2f 100644
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -18,7 +18,19 @@
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
     ,
 	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code?json_string}"
+        <#if text_language_rfx="fr">
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+          <#else>
+            "ActorID":"TRA${preparationOrder.load_data.carrier_code?trim?json_string}"
+          </#if>
+        <#else>
+          <#if uniqueness?? && uniqueness!="" >
+            "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+          <#else>
+            "ActorID":"CAR${preparationOrder.load_data.carrier_code?trim?json_string}"
+          </#if>
+        </#if>
 	  }
 
 	  </#if>
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index 1de6b02..5c73f6b 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -26,7 +26,20 @@
                 "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
         </#if> -->
         "ShipFrom": {
-        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+          <#if text_language_rfx="fr">
+            <#if uniqueness?? && uniqueness!="" >
+              "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+            <#else>
+              "ActorID": "DEP${preparation_order.physical_depot_code?trim?json_string}"
+            </#if>
+          <#else>
+            <#if uniqueness?? && uniqueness!="" >
+              "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+            <#else>
+              "ActorID": "DEP${preparation_order.physical_depot_code?trim?json_string}"
+            </#if>
+          </#if>
+
         },
        "ShipFromAcked": true,
          "ShipTo": {
@@ -48,7 +61,19 @@
           preparation_order.address.territorial_division_code == "" &&
           preparation_order.address.postal_code == "" &&
           preparation_order.address.iso_country_code == "">
-            "ActorID": "${preparation_order.end_consignee_code}"
+            <#if text_language_rfx="fr">
+              <#if uniqueness?? && uniqueness!="" >
+                "ActorID": "${preparation_order.end_consignee_code}"
+              <#else>
+                "ActorID": "DES${preparation_order.end_consignee_code}"
+              </#if>
+            <#else>
+              <#if uniqueness?? && uniqueness!="" >
+                "ActorID": "${preparation_order.end_consignee_code}"
+              <#else>
+                "ActorID": "CON${preparation_order.end_consignee_code}"
+              </#if>
+            </#if>
           <#else>
             "Actor":
              {
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index d941559..e52daef 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -29,12 +29,37 @@
       },
         "ShipTo"  :
       {
-      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+      <#if text_language_rfx="fr">
+        <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+        <#else>
+          "ActorID": "DEP${receipt.physical_depot_code?trim?json_string}"
+        </#if>
+     <#else>
+        <#if uniqueness?? && uniqueness!="" >
+          "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+        <#else>
+          "ActorID": "DEP${receipt.physical_depot_code?trim?json_string}"
+        </#if>
+      </#if>
+
       },
       "ShipToAcked": true,
 
       <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
+        <#if text_language_rfx="fr">
+          <#if uniqueness?? && uniqueness!="" >
+            "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
+          <#else>
+            "Carrier" : {"ActorID": "TRA${receipt.carrier_informations.carrier_code?trim?json_string}"},
+          </#if>
+        <#else>
+          <#if uniqueness?? && uniqueness!="" >
+            "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
+          <#else>
+            "Carrier" : {"ActorID": "CAR${receipt.carrier_informations.carrier_code?trim?json_string}"},
+          </#if>
+        </#if>
       </#if>