Release 2.0.5+1

Merge branch 'SCPN1-8991-8980-9059-2.0' into 'release/2.0'
SCPN1-8991-8980-9059-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!121
2025-07-10 11:32:33 +02:00 · 2025-07-10 09:31:47 +00:00 · 2025-07-10 09:54:08 +02:00 · 2025-07-09 18:17:05 +02:00 · 2025-07-02 14:37:45 +02:00 · 2025-07-01 15:43:18 +02:00
83 changed files with 1513 additions and 483 deletions
--- a/ActorPrefix.ftl
+++ b/ActorPrefix.ftl
@@ -0,0 +1,162 @@
+
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- Actor Prefix 4 cars                                                                         -->
+<#-- --------------------------------------------------------------------------------------- -->
+
+<#-- For Depot -->
+<#function RFXtoRPprefixDepot depot>
+  <#if uniqueness >
+    <#local actor = depot>
+  <#else>
+    <#if text_language_rfx ="fr">
+        <#local actor = "DEP_"+depot>
+    <#else>
+        <#if text_language_rfx ="it">
+            <#local actor = "DEP_"+depot>
+        <#else>
+            <#if text_language_rfx ="es">
+                <#local actor = "DEP_"+depot>
+            <#else>
+                <#if text_language_rfx ="pl">
+                    <#local actor = "MAG_"+depot>
+                <#else>
+                    <#if text_language_rfx ="nl">
+                        <#local actor = "DEP_"+depot>
+                    <#else>
+                        <#local actor = "DEP_"+depot>
+                    </#if>
+                </#if>
+            </#if>
+        </#if>
+    </#if>
+</#if>
+<#return (actor)>
+</#function>
+
+<#function RPtoRFXprefixDepot actor>
+  <#if uniqueness>
+    <#local depot = actor>
+  <#else>
+    <#local depot = actor[4..]>
+  </#if>
+<#return (depot)>
+</#function>
+
+
+
+<#-- For Supplier -->
+<#function RFXtoRPprefixSupplier supplier>
+  <#if uniqueness>
+    <#local actor = supplier>
+  <#else>
+    <#if text_language_rfx ="fr">
+        <#local actor = "FOU_"+supplier>
+    <#else>
+        <#if text_language_rfx ="it">
+            <#local actor = "FOR_"+supplier>
+        <#else>
+            <#if text_language_rfx ="es">
+                <#local actor = "PRO_"+supplier>
+            <#else>
+                <#if text_language_rfx ="pl">
+                    <#local actor = "DOS_"+supplier>
+                <#else>
+                    <#if text_language_rfx ="nl">
+                        <#local actor = "LEV_"+supplier>
+                    <#else>
+                        <#local actor = "SUP_"+supplier>
+                    </#if>
+                </#if>
+            </#if>
+        </#if>
+    </#if>
+</#if>
+<#return (actor)>
+</#function>
+
+<#function RPtoRFXprefixSupplier actor>
+  <#if uniqueness>
+    <#local supplier = actor>
+  <#else>
+    <#local supplier = actor[4..]>
+  </#if>
+<#return (supplier)>
+</#function>
+
+<#-- For Carrier -->
+<#function RFXtoRPprefixCarrier carrier>
+  <#if uniqueness>
+    <#local actor = carrier>
+  <#else>
+    <#if text_language_rfx ="fr">
+        <#local actor = "TRA_"+carrier>
+    <#else>
+        <#if text_language_rfx ="it">
+            <#local actor = "VET_"+carrier>
+        <#else>
+            <#if text_language_rfx ="es">
+                <#local actor = "TRA_"+carrier>
+            <#else>
+                <#if text_language_rfx ="pl">
+                    <#local actor = "PRZ_"+carrier>
+                <#else>
+                    <#if text_language_rfx ="nl">
+                        <#local actor = "VER_"+carrier>
+                    <#else>
+                        <#local actor = "CAR_"+carrier>
+                    </#if>
+                </#if>
+            </#if>
+        </#if>
+    </#if>
+</#if>
+<#return (actor)>
+</#function>
+
+<#function RPtoRFXprefixCarrier actor>
+  <#if uniqueness>
+    <#local carrier = actor>
+  <#else>
+    <#local carrier = actor[4..]>
+  </#if>
+<#return (carrier)>
+</#function>
+
+<#-- For Consignee -->
+<#function RFXtoRPprefixConsignee consignee>
+  <#if uniqueness>
+    <#local actor = consignee>
+  <#else>
+    <#if text_language_rfx ="fr">
+        <#local actor = "DES_"+consignee>
+    <#else>
+        <#if text_language_rfx ="it">
+            <#local actor = "DES_"+consignee>
+        <#else>
+            <#if text_language_rfx ="es">
+                <#local actor = "DES_"+consignee>
+            <#else>
+                <#if text_language_rfx ="pl">
+                    <#local actor = "ODB_"+consignee>
+                <#else>
+                    <#if text_language_rfx ="nl">
+                        <#local actor = "ONT_"+consignee>
+                    <#else>
+                        <#local actor = "CON_"+consignee>
+                    </#if>
+                </#if>
+            </#if>
+        </#if>
+    </#if>
+</#if>
+<#return (actor)>
+</#function>
+
+<#function RPtoRFXprefixConsignee actor>
+  <#if uniqueness>
+    <#local consignee = actor>
+  <#else>
+    <#local consignee = actor[4..]>
+  </#if>
+<#return (consignee)>
+</#function>
--- a/README.md
+++ b/README.md
@@ -6,6 +6,4 @@ These FTL core files aim to translate data flow from Reflex WMS into Reflex plat



-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/
-
- 
+You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
--- a/RFX_PartnerAPP_Settings.ftl
+++ b/RFX_PartnerAPP_Settings.ftl
@@ -0,0 +1 @@
+<#assign trackingNumberSource = 3>
--- a/RFXtoRP_HfDtlStockLs.ftl
+++ b/RFXtoRP_HfDtlStockLs.ftl
@@ -50,11 +50,11 @@

      <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported">
+      <#stop >
      <#break>


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
+++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
@@ -1,4 +1,6 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  <#list reflexStockPicturesInterface.detailled_stock_list as stock>
  {
@@ -6,10 +8,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-        "RefID": "${stock.physical_depot_code}"
+      "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
      },
    "Payload": {
-       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+       <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
      "Snapshot": {
        "EndDateTime": {
           "DateTime": "${generation_date}",
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -1,4 +1,6 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  <#list reflexStockPicturesInterface.detailled_stock_list as stock>
  {
@@ -6,8 +8,8 @@
      "ProjectID": "${projectRP}"
    },
    "Payload": {
-      "ActorID": "${stock.physical_depot_code}",
-      <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+      "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}",
+      <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
      "Snapshot": {
        "DateTime": {
           "DateTime": "${generation_date}",
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
@@ -25,7 +25,7 @@
            },

            {
-            <#assign manufacturing_datetime = RfxDateTimetoUTC(stock.Date_of_manufacture,time_zone_offset_rfx) />  
+            <#assign manufacturing_datetime = RfxDateTimetoUTCWithTimezone(stock.Date_of_manufacture,time_zone_rfx) />
            "Key": "ManufacturingDate",
            "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
--- a/RFXtoRP_HfGrade.ftl
+++ b/RFXtoRP_HfGrade.ftl
@@ -14,6 +14,6 @@


 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>

--- a/RFXtoRP_HfLvTypeList.ftl
+++ b/RFXtoRP_HfLvTypeList.ftl
@@ -16,6 +16,6 @@


 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>

--- a/RFXtoRP_HfOwner.ftl
+++ b/RFXtoRP_HfOwner.ftl
@@ -14,6 +14,6 @@


 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>

--- a/RFXtoRP_HfRpConfig.ftl
+++ b/RFXtoRP_HfRpConfig.ftl
@@ -28,6 +28,6 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsaCarrier.ftl
+++ b/RFXtoRP_HsaCarrier.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,7 +20,7 @@
      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">
@@ -41,6 +44,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -4,20 +4,13 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+            "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}"
    },
-
    "Payload": {
      "Name": "${carrier.carrier_designation?json_string}",
-        "ManagedStock": false,
        "IsCarrier": true,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->

-    <#--
    <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
-    -->
-

     "Address":
         {
@@ -37,7 +30,6 @@
          </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
-
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if  carrier.address??>
--- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
@@ -4,9 +4,8 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}"
    },
-
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsaCons.ftl
+++ b/RFXtoRP_HsaCons.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,12 +20,13 @@
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
      [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
         }
       ]
+
      <#break>

      <#case "D">
@@ -41,6 +45,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -4,23 +4,16 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
    },
-
    "Payload": {
      "Name": "${actor.designation?json_string}",
-        "ManagedStock": false,
        "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->

-    <#--
    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
-    -->

    "Address":
        {
-
        <#-- if Reflex WMS is structured    -->
        <#if actor.consignee_structured_address??>

--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -4,9 +4,8 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
    },
-
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -0,0 +1,54 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
+       [
+          <#if dispute.dispute_closed == true >
+            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsaDispute_Created.ftl">
+            }
+              <#if TableReasonCode[dispute.dispute_reason_code]??>
+              ,
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
+            }
+              <#else>
+                <#stop>
+              </#if>
+            <#else>
+              <#stop "Reference is empty">
+            </#if>
+          </#if>
+       ]
+  <#break>
+
+  <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop>
+      <#break>
+
+
+    <#default>
+          <#stop>
+</#switch>
+
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -0,0 +1,4 @@
+<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
+
+
+"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -0,0 +1,76 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "Table.ftl">
+[
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+            <#if dispute.dispute_preparation??>
+               <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+            <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
+                "Title":"${dispute.dispute_reference?json_string}",
+             <#else>
+                "Title":"",
+            </#if>
+            "Criticality":"${TableCriticality[dispute.dispute_criticity]}",
+            "Amount": {
+                <#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) />
+                <#if isCurrencyCode>
+                    "Currency" : "${dispute.dispute_amount_unit?upper_case?json_string}",
+                <#else>
+                    <#if TableAmount[dispute.dispute_amount_unit?json_string]??>
+                        "Currency" : "${TableAmount[dispute.dispute_amount_unit?json_string]}",
+                    <#else>
+                        "Currency" : "XXX",
+                    </#if>
+                </#if>
+                "Value": "${dispute.dispute_amount}"
+             },
+            <#-- Claim metadata inclusion  -->
+            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
+            <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
+            <#if dispute.dispute_type_code=="050" >
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+            <#else>
+                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
+                    <#if dispute.dispute_reception.reception_type_code=="030">
+                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                    <#else>
+                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
+                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                        <#else>
+                            <#stop "WMS type code not supported">
+                        </#if>
+                    </#if>
+                </#if>
+            </#if>
+
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
+            <#else>
+                <#stop "Claim reason code not supported" >
+            </#if>
+        }
+    }
+]
+
+
+
+
--- a/RFXtoRP_HsaDispute_MessageSent.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent.ftl
@@ -0,0 +1,124 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+[
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+           <#if dispute.dispute_preparation??>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+
+            <#if dispute.dispute_preparation??>
+                "Message": "${dispute.dispute_reference?trim?json_string}"
+            <#else>
+                <#if dispute.dispute_reception??>
+                    "Message": "${dispute.dispute_reception.reception_reference?trim?json_string}"
+                </#if>
+            </#if>
+
+        }
+    },
+     <#if dispute.dispute_quantity!=0 && dispute.dispute_item??>
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+            <#if dispute.dispute_preparation??>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+                "Message": "${dispute.dispute_item.item_code?trim?json_string} - ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
+        }
+    },
+    <#elseif dispute.dispute_item??>
+     {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+            <#if dispute.dispute_preparation??>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+                "Message": "${dispute.dispute_item.item_code?trim?json_string}"
+        }
+    },
+    <#elseif dispute.dispute_quantity!=0>
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+            <#if dispute.dispute_preparation??>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+                "Message": "${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
+        }
+    },
+    </#if>
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "ID": {
+            <#if dispute.dispute_preparation??>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_reception??>
+                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
+                </#if>
+            </#if>
+        },
+        "Payload": {
+
+            "Message": " ${dispute.dispute_description?trim?json_string}"
+
+        }
+    }
+
+]
--- a/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
+++ b/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
@@ -0,0 +1,7 @@
+<#-- Specify table for reason code -->
+<#assign TableReasonCode = {}/>
+
+
+
+
+
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -28,7 +28,11 @@
            reflexMvtStockInterface.ipg_move_type == "370" ||
            reflexMvtStockInterface.ipg_move_type == "400" ||
            reflexMvtStockInterface.ipg_move_type == "410" ||
-            reflexMvtStockInterface.ipg_move_type == "420"
+            reflexMvtStockInterface.ipg_move_type == "420" ||
+            reflexMvtStockInterface.ipg_move_type == "455" ||
+            reflexMvtStockInterface.ipg_move_type == "460" ||
+            reflexMvtStockInterface.ipg_move_type == "465" ||
+            (reflexMvtStockInterface.ipg_move_type == "520" && reflexMvtStockInterface.ipg_move_creation_program == "HFST69")
            >
            [
            {
@@ -68,11 +72,11 @@

      <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported - Case D ">
+      <#stop >
      <#break>


    <#default>
-          <#stop "event not supported">
+          <#stop>
 </#switch>

--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -1,7 +1,8 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
-    <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+    <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
    {
    "Header": {
@@ -29,13 +30,16 @@
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
+
        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
        <#else>
          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
        </#if>
        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -1,5 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">

 <#assign MoveType_KV = {"130":"STOCK_MOVEMENT_TYPE_PRODUCTION",
            "200":"STOCK_MOVEMENT_TYPE_FIX",
@@ -14,10 +15,14 @@
            "370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
            "400":"STOCK_MOVEMENT_TYPE_FIX",
            "410":"STOCK_MOVEMENT_TYPE_FIX",
-            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>
-<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
+            "455":"STOCK_MOVEMENT_TYPE_FIX",
+            "460":"STOCK_MOVEMENT_TYPE_FIX",
+            "465":"STOCK_MOVEMENT_TYPE_FIX",
+            "520":"STOCK_MOVEMENT_TYPE_OUTBOUND"
+            }>
+<#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
-
 [
  {
    "Header": {
@@ -38,7 +43,7 @@

        "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}"
      },
-      "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+      "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
      "Movement": {

       "DateTime": {
@@ -48,7 +53,11 @@
        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code?json_string}",
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
+        <#if reflexMvtStockInterface.ipg_move_type == "520" >
+          "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+        <#else>
          "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
+        </#if>
        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
        <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
          "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
@@ -57,7 +66,7 @@
        "Quantity":
        {
        "LVID": "${quantity_in_base_lv_RP_Cst}",
-        <#if reflexMvtStockInterface.move_sign == "+">
+        <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs <= 0 >
          "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
        <#else>
          "Value": -${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,7 +18,7 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? >
+           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
@@ -46,6 +46,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsaItmLv.ftl
+++ b/RFXtoRP_HsaItmLv.ftl
@@ -40,6 +40,6 @@
       ]
      <#break>
    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -24,7 +24,9 @@
      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,

      <#-- Item Photo URI could be added here -->
-      <#--"PhotoURI": " ", -->
+      <#if item.url?? && item.url!="">
+        "PhotoURI": "${item.url?json_string}",
+      </#if>

    <#-- Loop for the Logistical Variants - LV -->
        <#if item.logistical_variant_list??>
--- a/RFXtoRP_HsaLstCarSta.ftl
+++ b/RFXtoRP_HsaLstCarSta.ftl
@@ -0,0 +1,40 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
+</#switch>
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -72,10 +72,10 @@

   <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported (case D)">
+      <#stop >
      <#break>

   <#default>
-      <#stop "event not supported">
+      <#stop >
 </#switch>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />

 [
  {
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaSup.ftl
+++ b/RFXtoRP_HsaSup.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,7 +20,7 @@
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">
@@ -41,6 +44,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -4,25 +4,18 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}"
    },
-
    "Payload": {
      "Name": "${actor.designation?json_string}",
-        "ManagedStock": false,
        "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->

-    <#--
    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
-    -->

      "Address":
         {
        <#-- if Reflex WMS address is structured    -->
        <#if actor.supplier_structured_address?? >
-
          "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
@@ -36,7 +29,6 @@
          </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
-
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if actor.optional_attributes?? >
@@ -47,7 +39,6 @@
            "CountryCode" : ""
          </#if>
        </#if>
-
         },
      <#if actor.optional_attributes?? >
        "Phones": ["${actor.optional_attributes.telephone?json_string}",
--- a/RFXtoRP_HsaSup_ActorDeleted.ftl
+++ b/RFXtoRP_HsaSup_ActorDeleted.ftl
@@ -4,9 +4,8 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}"
    },
-
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -0,0 +1,40 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
+</#switch>
--- a/RFXtoRP_HsrDepot.ftl
+++ b/RFXtoRP_HsrDepot.ftl
@@ -17,7 +17,7 @@
      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">
@@ -41,6 +41,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -1,28 +1,22 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}"
    },
-
    "Payload": {
      "Name": "${depot.physical_depot_designation?json_string}",
-        "ManagedStock": true,
        "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
-    <#--
    <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
-    -->
-
      "Address":
         {
        <#-- if Reflex WMS address is structured    -->
        <#if depot.physical_depot_structured_address?? >
-
          "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
@@ -36,21 +30,23 @@
          </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
-
        <#-- if Reflex WMS address is not structured    -->
        <#else>
+          <#if depot.physical_depot_address??>
          "Name": "${depot.physical_depot_address.company_name?json_string}",
          "StreetAddressOne" : "${depot.physical_depot_address.address_1?json_string}",
          "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}",
          "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}",
          "CountryCode" : ""
          </#if>
-
+        </#if>
         },
+         <#if depot.physical_depot_address??>
        "Phones": ["${depot.physical_depot_address.telephone?json_string}",
                  "${depot.physical_depot_address.other_number?json_string}"
                  ],
-       "Typology": "TYPOLOGY_UNKNOWN"
+        </#if>
+       "Typology": "TYPOLOGY_WAREHOUSE"
       }
  }
 ]
--- a/RFXtoRP_HsrDepot_ActorDeleted.ftl
+++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl
@@ -1,12 +1,14 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}"
    },
-
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsrLoadInfo.ftl
+++ b/RFXtoRP_HsrLoadInfo.ftl
@@ -0,0 +1,40 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
+</#switch>
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -6,6 +6,7 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">

 <#assign aDateTime = .now>

@@ -39,20 +40,17 @@
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
               }
            </#if>

            <#assign refIDHmap ={}>
+            <#assign hd_numberHmap ={}>
+            <#assign hd_numberHmapHUadded ={}>
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-            <#if despatched_ipg.consignment_unit_id!="">
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
               {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
@@ -75,6 +73,17 @@
               "datas" :
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+               }
+            </#if>
+
            </#if>
               </#list>
            </#list>
@@ -88,9 +97,9 @@
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
-<#stop "event not supported (Case D)">
+<#stop>
 <#break>

 <#default>
-<#stop "event not supported">
+<#stop>
 </#switch>
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,5 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
  <#assign refIDHmap_local ={}>
   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
@@ -14,11 +15,11 @@
      "ProjectID": "${projectRP}"
      },
      "ID":{
-      "RefID": "${OrderOriginReference}"
+      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
      },
    "Payload":{
      "Carrier": {
-          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
      }
      <#-- Add transport grade code
      <#if preparationOrder.transport_grade_code!="">
--- a/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl
@@ -2,8 +2,6 @@

 <#--
 "MetaData" :[
-             
-          ]
-
+]
 -->
 "MetaData": [            ]
--- a/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl
@@ -24,7 +24,6 @@
            <#else>
            "Value": { "Bool" : "False"}
            },
-           
            {
            <#assign manufacturing_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
            "Key": "ManufacturingDate",
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />

-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3>
    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
        <#if refIDHmap?size != 0 >
--- a/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl
@@ -0,0 +1,27 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+<#assign dispatched_datetime5 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
+  {
+    "Header": {
+    "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID":"${despatched_ipg.hd_number}",
+      "RefDate": {
+              "DateTime": "${dispatched_datetime5}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+    "Payload": {
+      "HandlingunitID": "${despatched_ipg.hd_number}"
+	    <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
+      ,
+	      "HUCarrier":{
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+	        }
+	    </#if>
+    }
+  }
+]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
          <#if refIDHmap_local?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,8 +1,10 @@
+<#include "ReflexUtils.ftl">
 <#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
    "Header": {
      "ProjectID": "${projectRP}"
@@ -74,12 +76,9 @@
       "Goods": {
           "ItemID": "${preparation_line.item_code?trim?json_string}",
           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
-              "PriorityDate": "${priority_date}",
-                <#else>
-                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-                    <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+
+          <#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}",
          <#else>
            <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
@@ -90,8 +89,12 @@
                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                    "PriorityDate": "${priority_date}",
                  <#else>
-                                    <#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 />
+                    <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+							"PriorityDate": "${priority_date}",
+						<#else>
+							<#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+								<#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
 								"PriorityDate": "${priority_date}",
 							<#else>
 								<#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
@@ -109,13 +112,14 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+       "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
          "LineID": "${preparation_line.pro_line_number!0}",
        </#if>
-       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
+        "ActorID": "${RFXtoRPprefixDepot(preparationOrder.physical_depot_code?trim?json_string)}",
        "Quantity": {
          "LVID": "${quantity_in_base_lv_RP_Cst}",
          "Value": ${despatched_ipg.quantity_lvs}
@@ -124,7 +128,6 @@
      }
      ]
    }
-
  }<#sep>,</#sep>
  </#list>
  <#sep>,</#sep>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,28 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-  <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  <#if !refIDHmap_local[OrderOriginReference]?? >
-      <#if refIDHmap_local?size != 0 >
-    ,
-    </#if>
-    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
-      "Header": {
-      "ProjectID": "${projectRP}"
-      },
-      "ID":{
-      "RefID": "${OrderOriginReference}"
-      },
-    "Payload":{
-      "Carrier": {
-          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
-      }
-    }
-    }
-  </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -1,13 +1,54 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+<#include "RFX_PartnerAPP_Settings.ftl">
 [
-
+<#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
  {
    "Header": {
    "ProjectID": "${projectRP}"
    },
    "ID": {
-			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      <#switch trackingNumberSource>
+        <#case 1>
+          <#if despatched_ipg.consignment_unit_id!="">
+			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+          </#if>
+        <#break>
+        <#case 2>
+          <#if despatched_ipg.carton_number != "000000000000000000">
+              "RefID":"${despatched_ipg.carton_number}",
+            <#else>
+              "RefID":"${despatched_ipg.hd_number}",
+          </#if>
+        <#break>
+        <#case 3>
+          <#if despatched_ipg.consignment_unit_id!="">
+            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+          <#else>
+            <#if despatched_ipg.carton_number != "000000000000000000">
+              "RefID":"${despatched_ipg.carton_number}",
+            <#else>
+              "RefID":"${despatched_ipg.hd_number}",
+            </#if>
+          </#if>
+        <#break>
+        <#default>
+      <#if despatched_ipg.consignment_unit_id!="">
+			  "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+      <#else>
+        <#if despatched_ipg.carton_number != "000000000000000000">
+          "RefID":"${despatched_ipg.carton_number}",
+        <#else>
+          "RefID":"${despatched_ipg.hd_number}",
+        </#if>
+      </#if>
+        </#switch>
+
+      "RefDate": {
+              "DateTime": "${dispatched_datetime4}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+        }
      },
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000">
@@ -18,9 +59,8 @@
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
    ,
 	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code?json_string}"
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
 	    }
-
 	  </#if>
    }
  }
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -29,17 +29,17 @@
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
            }
           <#else>
-            <#stop "preparation order already confirmed">
+           <#-- preparation order already confirmed -->
+            <#stop>
           </#if>

          <#else>
-          <#stop "preparation order type not supported">
+          <#-- preparation order type not supported -->
+          <#stop>
          </#if>
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-
-
       ]
  <#break>

@@ -63,6 +63,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.modification_datetime,time_zone_rfx) />
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -1,14 +1,15 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,21 +27,14 @@
                "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
        </#if> -->
        "ShipFrom": {
-        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+          "ActorID": "${RFXtoRPprefixDepot(preparation_order.physical_depot_code?trim?json_string)}"
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#if
-          <#-- preparation_order.address.type_code == "" &&
-          preparation_order.address.title_code == "" &&
-          preparation_order.address.first_name == "" &&
-          preparation_order.address.last_name == "" &&
-          preparation_order.address.mail_address == "" &&
-          preparation_order.address.contact_type_code == "" &&
-          preparation_order.address.mobile_phone_number == "" &&
-          preparation_order.address.land_line_phone_number == "" &&
-          preparation_order.address.fax_number == "" && -->
-          preparation_order.address.address_type_code == "" &&
+          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
+          <#else>
+            <#if preparation_order.address.address_type_code == "" &&
            preparation_order.address.name_or_company_name == "" &&
            preparation_order.address.additional_address_data_1 == "" &&
            preparation_order.address.additional_address_data_2 == "" &&
@@ -48,7 +42,7 @@
            preparation_order.address.territorial_division_code == "" &&
            preparation_order.address.postal_code == "" &&
            preparation_order.address.iso_country_code == "">
-            "ActorID": "${preparation_order.end_consignee_code}"
+              "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
            <#else>
              "Actor":
              {
@@ -71,8 +65,9 @@
                    "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
                  }
            </#if>
+          </#if>
         },
-
+        "OrderID":"${preparation_order.originator_reference?trim?json_string}",
       <#if preparation_order.line_list??>
       "Lines" : [
           <#list preparation_order.line_list as preparation_order_line >
@@ -84,7 +79,6 @@
                </#if>
          <#-- Line Metadata inclusion -->
          <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
-
             "RequestedContent":
             {
                   "Goods":
@@ -95,10 +89,8 @@
                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />
                           "PriorityDate": "${forced_priority_date}",
                      </#if>
-
              <#--  Segmentation Keys inclusion -->
            <#include "RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl">
-
               },
               "Quantity" :
               {
@@ -110,13 +102,18 @@
           </#list>
         ],
         </#if>
-
         "RequestedMilestones" :
          {
             "RequestedDeliveryDateTime" :
             {
+              <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
+                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
+                "DateTime": "${intermediate_delivery_start_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+              <#else>
                "DateTime": "${planned_final_delivery_start_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"
+              </#if>
             }
         }
    }
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -17,7 +17,22 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
        <#if receipt.receipt_type = "030">
-        <#stop "ignored message because receipt type = transfert">
+        [
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+          }
+          ]
        <#else>
          [
          {
@@ -46,6 +61,30 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
+            }
+            <#else>
+              <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+            }
+          <#else>
+                <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  }
+                <#else>
                  <#if receipt.receipt_confirmed == "true" >
              {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
@@ -53,9 +92,6 @@
              "datas" :
              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
            }
-          <#else>
-            <#if receipt.receipt_type = "030">
-              <#stop "ignored message because receipt type = transfert">
            <#else>
              {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -71,6 +107,8 @@
            }
            </#if>
          </#if>
+              </#if>
+            </#if>
        <#else>
          <#stop "Receipt reference is empty">
        </#if>
@@ -98,6 +136,6 @@


    <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>

--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />

 [
  {
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -1,14 +1,15 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
-  <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
     "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -25,19 +26,26 @@

      "ShipFrom":
      {
-      "ActorID": "${receipt.original_code?trim?json_string}"
+        <#if receipt.receipt_type == '020'>
+          "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
+        <#else>
+        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+        </#if>
      },
        "ShipTo"  :
      {
-      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
      },
      "ShipToAcked": true,
+      "OrderID":"${receipt.receipt_reference?trim?json_string}",

      <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
+        "Carrier":
+        {
+          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+        },
      </#if>

-
      <#if receipt.line_list??>
       "Lines" : [
          <#list receipt.line_list as line>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
 [
  {
     "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />

 [
  {
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
+         "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -0,0 +1,24 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      <#else>
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      </#if>
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
+]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -0,0 +1,98 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  {
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      <#else>
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      </#if>
+      "RefDate": {
+            "DateTime": "${receipt_creation_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+             }
+    },
+    "Payload": {
+         "CreationDateTime": {
+           "DateTime": "${receipt_creation_datetime}",
+           "AuthorTimeZone": "${time_zone_rfx}"
+             },
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
+       <#-- Header Metadata inclusion -->
+       <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
+
+      "ShipFrom":
+      {
+        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+      },
+        "ShipTo"  :
+      {
+         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+      },
+      "ShipToAcked": true,
+
+      <#if receipt.carrier_informations.carrier_code != "">
+        "Carrier":
+        {
+          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+        },
+      </#if>
+
+      <#if receipt.line_list??>
+       "Lines" : [
+          <#list receipt.line_list as line>
+        {
+          "LineID": "${line.receipt_line_number}",
+          <#-- Line Metadata inclusion -->
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
+          "RequestedContent":
+          {
+            "Goods":
+            {
+              "ItemID":   "${line.item_code?trim?json_string!"0"}",
+              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
+              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                   "PriorityDate": "${line_without_detail_priority_date}",
+              <#else>
+                <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${line_detail_priority_date}",
+                <#else>
+                    "PriorityDate": "1970-01-01T00:00:00Z",
+                </#if>
+              </#if>
+              <#-- Segmentation Keys inclusion -->
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
+            },
+            "Quantity" :
+            {
+              "LVID":   "${quantity_in_base_lv_RP_Cst}",
+              "Value":  "${line.order_quantity_in_lv!0}"
+            }
+          }
+
+        }
+      <#sep>,</#sep>
+          </#list>
+         ],
+      </#if>
+
+         "RequestedMilestones" :
+         {
+             "RequestedDeliveryDateTime" :
+             {
+                "DateTime": "${receipt_datetime}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+             }
+         }
+    }
+  }
+]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -0,0 +1,23 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+[
+  {
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      <#else>
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      </#if>
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
+]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -0,0 +1,25 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+         "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      <#else>
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      </#if>
+       "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {}
+
+  }
+]
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@@ -22,22 +22,21 @@
 	      "AuthorTimeZone": "${time_zone_rfx}"
 	    },
 	    "TechMessage": {
-	      "Code": "${restResponsetMsg.status}",
+	      "Code": "${restResponsetMsg.status!"no Code"}",
 	      "Label": ${strJsonBody}
 	      },
 	    "UserMessage": {
-	      "Code": "${restResponsetMsg.status}",
+	      "Code": "${restResponsetMsg.status!"no Code"}",
 	      "Label": ${strJsonBody},
 	      "Params": []
 	    },
 	    "DetailElements": [],
-	    "CorrelationID": "${id.correlationid}",
-	    "ContextPayload": "rfxresponse",
+	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
+	    "ContextPayload": ${strJsonBody},
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
-	    "Task": "${id.apiRestReflexID}",
-	    "OriginalID": "${id.refid?trim?json_string}",
+	    "Task": "${id.apiRestReflexID!"no Task"}",
+	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
 ]
-
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -4,16 +4,57 @@
 <#-- organisation : organisationtId in ReflexPlatform  -->

 <#assign restResponsetMsg = JsonUtil.jsonToMap(input)>
-<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)>
+<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id!"{}")>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>


 <#assign aDateTime = .now>
+<#assign no_apiRestReflexID = "no apiRestReflexID"> 
+<#assign no_status = -99999> 
+
+
+<#switch id.apiRestReflexID!no_apiRestReflexID>
+	 <#case no_apiRestReflexID>
+	   [
+		   {
+			 <#if restResponsetMsg.body?? >
+			   <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+			 <#else>
+			   <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+			 </#if>
+			 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+			 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+			 "datas" :
+				<#include "RFXtoRP_PlatformLogCreate.ftl">
+		   }
+	   ]
+	   <#break>
 				   
-<#switch id.apiRestReflexID>
 	  <#case "preparation_orders_post">
-			 <#switch restResponsetMsg.status>
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+				   <#break>
+				   
 	             <#case 200>
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
@@ -63,7 +104,7 @@
 					     <#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "{}" />
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}}" />
 						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -81,7 +122,29 @@
 			   <#break>

    	<#case "receipts_post">
-			 <#switch restResponsetMsg.status>
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+				   <#break>
+				   
 	             <#case 200>
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
@@ -121,7 +184,7 @@
 						<#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "{}" />
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
 						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -137,7 +200,6 @@
 				   ]
               </#switch>
 		       <#break>
-
 	  <#default>
 	        <#stop>
 </#switch>
--- a/RFXtoRP_RestResponseAllocationError.ftl
+++ b/RFXtoRP_RestResponseAllocationError.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${id.refid?trim?json_string}",
+         "RefID": "${id.refid!"no RefID"?trim?json_string}",
       "RefDate": {
        "DateTime": "${aDateTime?iso_utc}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_RfxConfigurationRp.ftl
+++ b/RFXtoRP_RfxConfigurationRp.ftl
@@ -4,33 +4,40 @@

 <#noparse>
 <#-- if LVID is egal to **quantity_in_base_lv** keyword then LVID is egal to base VL of the item -->
- <#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" > 
- <#assign rfx_date_format_default = "yyyy-MM-dd" > 
+<#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" >
+<#assign rfx_date_format_default = "yyyy-MM-dd" >


- <#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}>
- <#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}>
- <#assign area_unit_KV_rfx   = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}>
- <#assign volume_unit_KV_rfx = {"MM³":"CUBIC_MILLIMETER","CM³":"CUBIC_CENTIMETER","DM³":"CUBIC_DECIMETER","M³":"CUBIC_METER","CI":"CUBIC_INCH","CF":"CUBIC_FOOT","CY":"CUBIC_YARD","ML":"MILLI_LITER","CL":"CENTI_LITER","DL":"DECI_LITER","LIT":"LITER","HL":"HECTO_LITER","FT":"US_FLUID_OUNCE","USG":"US_GAL","PI":"IMPERIAL_PINT","GL":"IMPERIAL_GAL"}>
+<#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}>
+<#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}>
+<#assign area_unit_KV_rfx   = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}>
+<#assign volume_unit_KV_rfx = {"MM³":"CUBIC_MILLIMETER","CM³":"CUBIC_CENTIMETER","DM³":"CUBIC_DECIMETER","M³":"CUBIC_METER","CI":"CUBIC_INCH","CF":"CUBIC_FOOT","CY":"CUBIC_YARD","ML":"MILLI_LITER","CL":"CENTI_LITER","DL":"DECI_LITER","LIT":"LITER","HL":"HECTO_LITER","FT":"US_FLUID_OUNCE","USG":"US_GAL","PI":"IMPERIAL_PINT","GL":"IMPERIAL_GAL"}>

- </#noparse>
+</#noparse>

- <#noparse><#assign length_unit_rfx             = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"></#noparse> 
- <#noparse><#assign distance_unit_rfx           = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"></#noparse> 
- <#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"></#noparse> 
- <#noparse><#assign weight_unit_rfx             = weight_unit_KV_rfx[</#noparse>"${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"></#noparse> 
- <#noparse><#assign area_unit_rfx               = area_unit_KV_rfx[</#noparse>"${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"></#noparse> 
- <#noparse><#assign volume_unit_rfx             = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"></#noparse> 
- <#noparse><#assign number_of_litres_unit_rfx   = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"></#noparse> 
+<#noparse><#assign length_unit_rfx             = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"></#noparse>
+<#noparse><#assign distance_unit_rfx           = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"></#noparse>
+<#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"></#noparse>
+<#noparse><#assign weight_unit_rfx             = weight_unit_KV_rfx[</#noparse>"${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"></#noparse>
+<#noparse><#assign area_unit_rfx               = area_unit_KV_rfx[</#noparse>"${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"></#noparse>
+<#noparse><#assign volume_unit_rfx             = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"></#noparse>
+<#noparse><#assign number_of_litres_unit_rfx   = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"></#noparse>



- <#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#noparse>"></#noparse>
- <#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+00:00"}<#noparse>"></#noparse>  
+<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"Europe/Paris"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+01:00"}<#noparse>"></#noparse>


- <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>
- <#noparse><#assign text_language_rfx   = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse> 
+<#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>
+<#noparse><#assign text_language_rfx   = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse>
 </#list>

+<#list file.reflex_platform_project_list?filter(j -> j.name == projectRP) as reflex_platform_project_uniqueness>
+ <#if reflex_platform_project_uniqueness.site_code_unicity??>
+<#noparse><#assign uniqueness = </#noparse>${reflex_platform_project_uniqueness.site_code_unicity?c}<#noparse>></#noparse>
+<#else>
+<#noparse><#assign uniqueness = </#noparse>false<#noparse>></#noparse>
+</#if>
+</#list>

--- a/RP_connector.ftl
+++ b/RP_connector.ftl
@@ -0,0 +1,38 @@
+<#-- ****
+Connector provides some of parameters through the class connectorParameters
+those parameters are stored in FTL file Conf-connector.ftl for later use in some of the data ftl files
+*** -->
+
+<#-- *********************************************** Parameter global ******************** -->
+<#assign file = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+<#assign aDateTime = .now>
+
+<#noparse><#-- Date of last generation : </#noparse>${aDateTime}<#noparse> --></#noparse>
+<#noparse><#-- /!\ Warning the file is generated, if you modify it manually, do not enable automatic update via the pipeline --></#noparse>
+
+<#noparse><#-- Possible values for SupplyOfTheTrackingNumber parameter : --></#noparse>
+<#noparse><#-- 0 : Always empty --></#noparse>
+<#noparse><#-- 1 : Always use Reflex WMS tracking --></#noparse>
+<#noparse><#-- 2 : Always use the HU number --></#noparse>
+<#noparse><#-- 3 : Use Reflex tracking if it exists, the HU number otherwise --></#noparse>
+
+<#list file.parameters as parameter>
+<#switch parameter.type>
+  <#case "string">
+     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = "</#noparse>${parameter.value!""}<#noparse>"></#noparse>
+     <#break>
+
+  <#case "integer">
+     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = </#noparse>${parameter.value!0}<#noparse>></#noparse>
+     <#break>
+
+  <#case "boolean">
+     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = </#noparse>${(parameter.value!false)?c}<#noparse>></#noparse>
+     <#break>
+
+  <#default>
+
+</#switch>
+</#list>
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -46,6 +46,6 @@
 		   ]
 			<#break>
 	  <#default>
-	        <#stop "Event not processed">
+	        <#stop >
 </#switch>

--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -1,4 +1,6 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
+<#include "ActorPrefix.ftl">
+<#include "HfRpConfig.ftl">
 <#-- Valeurs par défaut Adresse -->
 <#-- Default values -->
 <#assign typecode ="010">
@@ -9,22 +11,23 @@
 <#-- 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>

 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
 		"originator_code": "${originator_code}"
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
 		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
@@ -41,6 +44,7 @@
        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
+			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
@@ -54,12 +58,16 @@
 				"address_type_code" : "${adresstypecode}",
 				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
 				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				<#if executionflow.ShipTo.Actor.Address.Name?? && executionflow.ShipTo.Actor.Address.Name!="">
+					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Address.Name!"")?json_string}",
+				<#else>
 					"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				</#if>
 				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
-					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}",
 				</#if>
 				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
-					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
+					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]?json_string}",
 				</#if>
 				"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
 				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
@@ -76,12 +84,17 @@
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 				{
+				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -89,7 +102,7 @@
 				"owner_code_to_prepare" :"${owner_code_to_prepare}",
 				"grade_code_to_prepare" :"${grade_code_to_prepare}",
 				"input_order_data": "false",
-				"batch_1": "${batch_1}",
+				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
 				<#--
@@ -99,6 +112,7 @@
 				"substitution_possible": "false"
 				-->

+
 				}
 			<#sep>,</#sep>
 			</#list>
--- a/RPtoRFX_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_PrepOrder_LineMetadata.ftl
+++ b/RPtoRFX_PrepOrder_LineMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_PrepOrder_OptionalAttributes.ftl
+++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl
@@ -0,0 +1,8 @@
+<#-- Here are the fields that can be added
+"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
+"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
+"reason_code": "str",
+"planned_preparation_date": "0000-00-00",
+"despatch_grouping": "string",
+"reservation_end_datetime": "0000-00-00T00:00:00",
+-->
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -1,22 +1,25 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
+<#include "ActorPrefix.ftl">
+<#include "HfRpConfig.ftl">

 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"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" :
 	 {
+		<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
 		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"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)}",
@@ -35,22 +38,26 @@
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
 			{
+				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1!""}",					
+				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
 			   		<#--"held_for_check": "false",
-			   		"held _for_repacking": "false",
 			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
 		 		}
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/Table.ftl
+++ b/Table.ftl
@@ -0,0 +1,15 @@
+<#-- Table criticality -->
+<#assign TableCriticality = {
+    "1": "CLAIM_CRITICALITY_LOW",
+    "2":"CLAIM_CRITICALITY_MEDIUM",
+    "3":"CLAIM_CRITICALITY_HIGH",
+    "4":"CLAIM_CRITICALITY_BLOCKING"
+ }>
+
+ <#-- Table Amount -->
+<#assign TableAmount = {
+    "$": "USD",
+    "£":"GBP",
+    "DH":"MAD"
+ }>
+
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.24+1
+2.0.5+1
@@ -1 +1 @@
 .2.24+1
 .0.5+1