Merge branch 'release/2.0' into 'main-2.0'

release/2.0 into main-2.0

See merge request r-d-technique/tiers/reflex-wms-connector!258

README.md

@@ -4,11 +4,11 @@
 
 The **HARDIS WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from HARDIS WMS** into **flows compatible with HARDIS SC NETWORK**.
 
-This connector does not contain any standalone executable code: it is intended to be used by **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
+This connector does not contain any standalone executable code: it is intended to be used by **HARDIS WMS integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
 
 ## Role of the FTL Files
 
-- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, etc.).
+- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, appointment etc.).
 - These templates use the **FreeMarker** syntax to:
   - Extract the required fields from the WMS source flow.
   - Apply transformation rules (mapping, conversions, enrichments).

RFX_PartnerAPP_Settings.ftl

@@ -1,2 +1 @@
-<#-- To configure the tracking setting carrier -->
 <#assign trackingNumberSource = 3>

RFXtoRP_HfDtlStockLs.ftl

@@ -1,60 +1,60 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-<#-- sum_elt      : nb element in snapshot (optional parameter)  -->
-
-<#include "HfRpConfig.ftl">
-
-<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)>
-<#assign projectRP      = project>
-<#assign organisationRP = organisation>
-
-<#switch cloudEventMsg.action>
-    <#case "C">
-    <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)>
-
-      <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image -->
-      <#if cloudEventMsg.messageSet??>
-         <#assign idSnapshot = cloudEventMsg.messageSet />
-      <#else>
-         <#assign idSnapshot = cloudEventMsg.id />
-      </#if>
-
-        <#list reflexStockPicturesInterface.detailled_stock_list as stock>
-         <#if stock.stock_type_code != "200">
-            <#stop>
-            <#break>
-        </#if>
-      </#list>
-         [
-           {
-            <#if sum_elt??>
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted>
-             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :
-              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">
-                  <#else>
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted>
-             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :
-              <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl">
-                </#if>
-           }
-         ]
-
-      <#break>
-
-      <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop >
-      <#break>
-
-
-    <#default>
-          <#stop >
-</#switch>
-
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#-- sum_elt      : nb element in snapshot (optional parameter)  -->
+
+<#include "HfRpConfig.ftl">
+
+<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)>
+<#assign projectRP      = project>
+<#assign organisationRP = organisation>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+    <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)>
+
+      <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image -->
+      <#if cloudEventMsg.messageSet??>
+         <#assign idSnapshot = cloudEventMsg.messageSet />
+      <#else>
+         <#assign idSnapshot = cloudEventMsg.id />
+      </#if>
+
+        <#list reflexStockPicturesInterface.detailled_stock_list as stock>
+         <#if stock.stock_type_code != "200">
+            <#stop>
+            <#break>
+        </#if>
+      </#list>
+         [
+           {
+            <#if sum_elt??>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted>
+             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+             "datas" :
+              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">
+                  <#else>
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted>
+             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+             "datas" :
+              <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl">
+                </#if>
+           }
+         ]
+
+      <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop >
+      <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl

@@ -1,7 +1,7 @@
 <#-- use protobuf of class HfDtlStockLs to find HARDIS WMS fields names  -->
 
 <#--
-<#-- Best practices:
+Best practices:
   If the SK is of type:
   - string: add ?json_string (e.g. "${stock.batch_1?json_string}")
   - boolean: possible values: true and false
@@ -22,7 +22,7 @@
             <#if stock.batch_1 == "">
                   "Value": { "String" : "no batch"}
                 <#else>
-                   "Value": { "String" : "${stock.batch_1}"}
+                   "Value": { "String" : "${stock.batch_1?json_string}"}
             </#if>
             },
             {

RFXtoRP_HliPrepaL.ftl

@@ -3,7 +3,6 @@
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -18,52 +17,52 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-   <#if	preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_line_lst??>
-         [
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-            },
-            {
-
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-            }
-            <#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 = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               ,
+   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
+         <#if preparationOrder.preparation_line_lst??>
+            [
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-               }
-            </#if>   
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
                },
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
                }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#assign refIDHmap ={}>
+               <#assign hd_numberHmap ={}>
+               <#assign hd_numberHmapHUadded ={}>
+               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+               <#list preparation_line.despatched_ipg_list as despatched_ipg>
+               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? &&  !hd_numberHmap[despatched_ipg.carton_number]??)&& (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "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}>
                   ,
                   {
@@ -74,18 +73,22 @@
                   }
                </#if>
 
-            </#if>
+               </#if>
+                  </#list>
                </#list>
-            </#list>
-            <#assign refIDHmap ={}>
-         ]
-      <#else>
+               <#assign refIDHmap ={}>
+            ]
+         <#else>
          <#--   No line-->
-         <#stop >
+         <#stop>
+      </#if>
+      <#else>
+         <#--   Preparation Type not supported-->
+         <#stop>
       </#if>
    <#else>
       <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop >
+      <#stop>
    </#if>
 
 

RFXtoRP_HliReceiptLr.ftl

@@ -15,81 +15,125 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type == "030">
-          <#stop "ignored message because receipt type = transfert">
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+            }
+          ]
         <#else>
           <#if receipt.line_list ??>
           [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
 
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
 
-          }
+            }
           ]
           <#else>
-            <#--  No line-->
             <#stop>
           </#if>
-      </#if>
+        </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-         <#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">
-                  }
+          <#if receipt.receipt_type?? && 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_confirmed == "true" >
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+            <#if receipt.receipt_type?? && 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?? && 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_ExecutionflowReceiptCompleted.ftl">
-              }
-            <#else>
-              <#if receipt.receipt_type == "030">
-                <#stop "ignored message because receipt type = transfert">
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                }
               <#else>
-                <#if receipt.line_list ??>
+                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
                   {
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                    "datas" :
-                    <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
-                  },
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                   }
                 <#else>
-                  <#--  No line-->
-                  <#stop>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
+                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                    [
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
+
+                      },
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                         <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+                      }
+                    ]
+                    <#else>
+                      <#stop> <#-- Receipt reference for transfer is empty-->
+                    </#if>
+                  <#else>
+                    <#if receipt.line_list ??>
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
+                      },
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                      }
+                    <#else>
+                      <#stop>
+                    </#if>
+                  </#if>
                 </#if>
               </#if>
             </#if>
           </#if>
-        <#else>
-          <#-- Receipt reference is empty-->
-          <#stop >
-        </#if>
        ]
       <#break>
 
@@ -97,25 +141,19 @@
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#if receipt.line_list ??>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.line_list ??>
-            {
+          {
 
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-            }
-            <#else>
-              <#--  No line-->
-              <#stop>
-            </#if>
-        <#else>
-           <#-- Receipt reference is empty-->
-          <#stop >
-        </#if>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
        ]
+       <#else>
+        <#stop> <#-- No line-->
+      </#if>
          <#break>
 
 

RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl

@@ -9,11 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        "RefID": "${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_year}${receipt.receipt_number}",
-      </#if>
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl

@@ -0,0 +1,193 @@
+<#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) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "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": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          </#if>
+        "RefDate": {
+              "DateTime": "${receipt_creation_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+      },
+      "Payload": {
+        <#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>
+      }
+    }
+    <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "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_line.origin_order_line_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_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}",
+                 <#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>
+              }
+            }
+            </#if>
+          <#else>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                "RefDate": {
+                      "DateTime": "${receipt_creation_datetime}",
+                      "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+              },
+              "Payload": {
+                  "CreationDateTime": {
+                    "DateTime": "${receipt_creation_datetime}",
+                    "AuthorTimeZone": "${time_zone_rfx}"
+                    },
+                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                <#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>
+              }
+            }
+              <#break>
+            </#if>
+            </#list>
+          </#if>
+        </#if>
+  ]

RFXtoRP_HlrProL.ftl

@@ -16,28 +16,23 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
             <#if preparation_order.line_list??>
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl">
-              }
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl">
+            }
             <#else>
               <#-- No line -->
               <#stop>
             </#if>
           <#else>
-          <#-- preparation order type not supported -->
+          <#-- Preparation order type not supported -->
             <#stop>
           </#if>
-        <#else>
-          <#-- PRO reference is empty -->
-          <#stop>
-        </#if>
        ]
   <#break>
 
@@ -46,7 +41,7 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
           <#if preparation_order.line_list??>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -59,13 +54,11 @@
             <#stop>
           </#if>
         <#else>
-          <#-- PRO reference is empty -->
+          <#-- Preparation order type not supported -->
           <#stop>
         </#if>
        ]
          <#break>
-
-
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl

@@ -9,14 +9,18 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-    "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
              }
     },
     "Payload": {
-       <#if preparation_order.line_list??>
+        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
            {

RFXtoRP_HsaCarrier.ftl

@@ -1,7 +1,10 @@
 <#-- **** input parameters  ***** -->
 <#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#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">

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -11,11 +8,7 @@
     },
     "Payload": {
       "Name": "${carrier.carrier_designation?json_string}",
-        "ManagedStock": false,
         "IsCarrier": true,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
 
     <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
 
@@ -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 HARDIS WMS address is not structured    -->
         <#else>
           <#if  carrier.address??>

RFXtoRP_HsaCarrier_ActorDeleted.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaCons.ftl

@@ -1,7 +1,10 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS- WMS  -->
+<#-- input        : message HARDIS WMS  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -15,14 +18,15 @@
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-       [
+      [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
           <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
          }
        ]
+
       <#break>
 
       <#case "D">

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -11,18 +8,12 @@
     },
     "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 HARDIS WMS is structured    -->
         <#if actor.consignee_structured_address??>
 

RFXtoRP_HsaCons_ActorDeleted.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsaDesPatch.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaDespNt.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaDispute.ftl

@@ -2,11 +2,13 @@
 <#-- input        : message HARDIS WMS  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-<#-- For dispute creation WMS to Platform -->
+
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
+
 <#assign aDateTime = .now>
+
 <#switch cloudEventMsg.action>
   <#case "C">
   <#case "U">
@@ -14,32 +16,24 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
        [
-           <#if dispute.dispute_closed == true >
-            <#-- Only for preparation and receipt disputes -->
-            <#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!="")>
+          <#if dispute.dispute_closed == true >
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsaDispute_Created.ftl">
             }
-            <#-- Create the table for reason code in RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl -->
-            <#if TableReasonCode[dispute.dispute_reason_code]??>
+              <#if TableReasonCode[dispute.dispute_reason_code]??>
               ,
             {
-              <#-- Add message in dispute tchat room -->
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
             }
-            <#else>
+              <#else>
                 <#stop>
               </#if>
-            <#else>
-              <#--  "Reference is empty"-->
-              <#stop>
-            </#if>
           </#if>
        ]
   <#break>

RFXtoRP_HsaDispute_Created.ftl

@@ -8,7 +8,7 @@
         },
         "ID": {
             <#if dispute.dispute_preparation??>
-                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+               <#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" >
@@ -21,7 +21,7 @@
         },
         "Payload": {
             <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?trim?json_string}",
+                "Title":"${dispute.dispute_reference?json_string}",
              <#else>
                 "Title":"",
             </#if>
@@ -43,22 +43,44 @@
             <#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_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=="070" || dispute.dispute_type_code=="030" >
-                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+            <#if dispute.dispute_type_code=="050" > <#-- Preparation -->
+                <#if dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="">
+                    "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>
-                    <#stop "WMS type code not supported">
+                    "EntityID":"O${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_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
+                    "DisplayID":"O${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_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
+                </#if>
+            <#else>
+                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
+                    <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type -->
+                        <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" >
+                            "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_reference?? && dispute.dispute_reception.reception_reference!="">
+                                "EntityID":"R${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_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                                "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                            <#else>
+                                "EntityID":"R${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_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                                "DisplayID":"R${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_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                            </#if>
+                        </#if>
+                    <#else>
+                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
+                            "EntityID":"R${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_year_number?json_string}${dispute.dispute_reception.reception_number?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}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
             <#else>
-                <#stop "Reason code not supported">
+                <#stop "Claim reason code not supported" >
             </#if>
         }
     }
@@ -66,3 +88,4 @@
 
 
 
+

RFXtoRP_HsaDispute_MessageSent.ftl

@@ -2,7 +2,6 @@
 <#include "ReflexUtils.ftl">
 [
     {
-        <#-- Add refer -->
         "Header": {
             "ProjectID": "${projectRP}"
         },

RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl

@@ -1,7 +1,15 @@
+
 <#-- Specify table for reason code -->
-<#assign TableReasonCode = {}/>
-
+<#-- Table example for reason code to claim type ID -->
+<#-- <#assign TableReasonCode = { -->
+<#--    "001":"ID_CLAIMTYPE_1",-->
+<#--    "M1":"ID_CLAIMTYPE_2",-->
 
+<#-- }/>-->
 
+ <#assign TableReasonCode = {
 
+"M1" :"CAS"
 
+}
+/>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -21,7 +21,7 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
               "PriorityDate": "${priority_date}",
            <#else>
               "PriorityDate": "1970-01-01T00:00:00Z",
@@ -31,24 +31,24 @@
          },
         <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
           <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+            "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
           <#else>
             <#if reflexMvtStockInterface.receipt_reference?? && 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.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-              "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
             </#if>
           </#if>
         <#else>
           <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
             "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
           <#else>
-            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
           </#if>
         </#if>
         <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
@@ -66,4 +66,4 @@
     }
   }
 
-]
+]

RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl

@@ -6,7 +6,6 @@
   - boolean: possible values: true and false
   - datetime: expected format: 2025-10-30T10:12:10.000Z
   - decimal number: the separator is a point (e.g. 10.5)
-
 "SegmentationKeys": [
             {
             "Key": "Grade",

RFXtoRP_HsaItmLv.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaLstCarSta.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 <#include "ActorPrefix.ftl">
@@ -19,8 +19,8 @@
       <#-- *********************************************** Action = Update ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
         <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)>
-		<#if !carrier_apt_status.status??>
-	        <#stop 'the updated appointment Status not initialized'>
+		<#if !carrier_apt_status.status?? || carrier_apt_status.appointment_year_number==0>
+	        <#stop >
         </#if>
 		[
 			{

RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl

@@ -5,7 +5,7 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+   		   <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
                 <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
                     "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
                 <#else>

RFXtoRP_HsaProStatus.ftl

@@ -16,9 +16,8 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
-      <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
+         <#if preparationStatusInterface.preparation_type_code=="010" || preparationStatusInterface.preparation_type_code=="030">
          <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
             <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@@ -66,12 +65,8 @@
                </#if>
             </#if>
          <#else>
-            <#--PRO reference is empty-->
             <#stop >
          </#if>
-      <#else>
-         <#stop >
-      </#if>
       ]
       <#break>
 

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

@@ -8,7 +8,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-    "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
     "RefDate": {
       "DateTime": "${preparation_status_datetime}",
       "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

@@ -7,7 +7,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -7,10 +7,14 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        "RefDate": {
-          "DateTime": "${preparation_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
+       "RefDate": {
+        "DateTime": "${preparation_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
 

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -7,10 +7,14 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        "RefDate": {
-          "DateTime": "${preparation_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
+       "RefDate": {
+        "DateTime": "${preparation_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
 

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -7,10 +7,14 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
        "RefDate": {
-          "DateTime": "${preparation_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
+        "DateTime": "${preparation_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
 

RFXtoRP_HsaSup.ftl

@@ -1,7 +1,10 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#-- 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">

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -11,10 +8,7 @@
     },
     "Payload": {
       "Name": "${actor.designation?json_string}",
-        "ManagedStock": false,
         "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
 
     <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
 
@@ -22,7 +16,6 @@
          {
         <#-- if HARDIS 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 HARDIS 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}",

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {

RFXtoRP_HsrCarrierApt.ftl

@@ -128,7 +128,7 @@
 <#case "D">
       <#-- *********************************************** Action = Delete ******************** -->
        [
-       <#-- Ajout des lignes-->
+
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",

RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl

@@ -6,19 +6,19 @@
     },
     "ID": {
     <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}"
-        <#else>
-            "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
-        </#if>
-    <#else>
-        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "RefID": "${carrier_apt.appointment_reference?json_string}"
-        <#else>
-            "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}"
-        </#if>
-    </#if>
-    },
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		</#if>
+    }
     "Payload": {
     "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
     <#--To configure-->

RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl

@@ -5,7 +5,7 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
                     "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>

RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl

@@ -5,7 +5,7 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
                     "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 <#else>

RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl

@@ -95,11 +95,10 @@
 					"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 					<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 						"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-						"ExecutionflowID": "${physical_receipt.physical_receipt_reference?trim?json_string}",
 					<#else>
-						"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-						"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
+						"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 					</#if>
+					"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 					"ProjectID": "${projectRP}",
 		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}<#sep>,</#sep>
@@ -127,7 +126,6 @@
 				</#if>
 			</#if>
 		</#if>
-
 		"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
 			    "DurationInSeconds": "${duration}",

RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl

@@ -5,11 +5,11 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">

RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl

@@ -7,9 +7,9 @@
         "ID": {
             <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">

RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl

@@ -50,7 +50,7 @@
 						</#if>
 					<#else>
 						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-						<#assign duration = 0 />		<#-- à confirmer -->
+						<#assign duration = 0 />
 					</#if>
 				</#if>
 			</#if>
@@ -94,11 +94,10 @@
 				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 				<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
 					"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
-					"ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}",
 				<#else>
-					"OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
-					"ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
+					"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 				</#if>
+				"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 				"ProjectID": "${projectRP}"
 			}<#sep>,</#sep>
 			</#list>

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">

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -11,20 +11,12 @@
     },
     "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 HARDIS 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}",
@@ -38,7 +30,6 @@
           </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
-
         <#-- if HARDIS WMS address is not structured    -->
         <#else>
           <#if depot.physical_depot_address??>

RFXtoRP_HsrLoadInfo.ftl

@@ -1,40 +1,40 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
-<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
-
-<#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 >
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#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>

RFXtoRP_HsrPrepa.ftl

@@ -17,70 +17,63 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-   <#if	preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_line_lst??>
-         [
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-            },
-            <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl">
-            {
-
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-            }
-
-            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
-               ,
+   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
+         <#if preparationOrder.preparation_line_lst??>
+            [
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
                "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 = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-               }
-            </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
                },
+               <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl">
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
                }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+                  }
+               </#if>
+
+               <#assign refIDHmap ={}>
+               <#assign hd_numberHmap ={}>
+               <#assign hd_numberHmapHUadded ={}>
+               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+               <#list preparation_line.despatched_ipg_list as despatched_ipg>
+               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "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}>
                   ,
                   {
@@ -91,18 +84,22 @@
                   }
                </#if>
 
-            </#if>
+               </#if>
+                  </#list>
                </#list>
-            </#list>
-            <#assign refIDHmap ={}>
-         ]
-      <#else>
+               <#assign refIDHmap ={}>
+            ]
+         <#else>
          <#--   No line-->
-         <#stop >
+         <#stop>
+      </#if>
+      <#else>
+         <#--   Preparation Type not supported-->
+         <#stop>
       </#if>
    <#else>
       <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop >
+      <#stop>
    </#if>
 
 

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -3,31 +3,35 @@
 <#include "ActorPrefix.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>
+  <#list preparationOrder.preparation_line_lst as preparation_line>
+  <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+    <#assign OrderOriginReference = "${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}">
+  <#else>
+    <#assign OrderOriginReference = "O${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.pro_year}${preparation_line.pro_number}">
+  </#if>
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+        <#if refIDHmap_local?size != 0 >
+        ,
+        </#if>
       <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-      {
+    {
       "Header": {
       "ProjectID": "${projectRP}"
       },
       "ID":{
-      "RefID": "${OrderOriginReference}"
+        "RefID": "${OrderOriginReference}"
       },
-      "Payload":{
-        "Carrier": {
-          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-        }
-        <#-- Add transport grade code
-        <#if preparationOrder.transport_grade_code!="">
-        ,
-        "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-        </#if> -->
+    "Payload":{
+      "Carrier": {
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
       }
-     }
+      <#-- Add transport grade code
+      <#if preparationOrder.transport_grade_code!="">
+      ,
+      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+      </#if> -->
+    }
+    }
     </#if>
   </#list>
   <#assign refIDHmap_local ={}>

RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl

@@ -2,9 +2,9 @@
  <#-- Uncomment if you need to use them-->
 <#--
 {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl">
-            },
+    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated>
+    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+    "datas" :
+    <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl">
+},
 -->

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -3,7 +3,7 @@
 [
 <#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.despatched_ipg_list?size != 0 && 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) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
       <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
           <#if refIDHmap_local?size != 0 >

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -2,7 +2,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
 [
-  <#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 preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
     <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
     {
@@ -77,19 +77,19 @@
            "ItemID": "${preparation_line.item_code?trim?json_string}",
            "LVBranchID": "${preparation_line.item_lv_code?json_string}",
 
-             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-				"PriorityDate": "${priority_date}",
-             <#else>
-				<#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-					<#assign priority_date = despatched_ipg.ipg_best_before_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)>
+              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                "PriorityDate": "${priority_date}",
+              <#else>
+                <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                     "PriorityDate": "${priority_date}",
-                <#else>
-					<#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-						<#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
-                        "PriorityDate": "${priority_date}",
-					<#else>
-						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+                  <#else>
+                    <#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>
@@ -111,9 +111,15 @@
 
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-        },
+         },
+      <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
         "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        "ExecutionflowID": "${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}",
+      <#else>
+        "OrderID": "O${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.pro_year}${preparation_line.pro_number}",
+        "ExecutionflowID": "O${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.pro_year}${preparation_line.pro_number}",
+      </#if>
+
         <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
           "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,29 +0,0 @@
-<#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>
-  <#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": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-        }
-      }
-      }
-    </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -34,15 +34,15 @@
           </#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>
+      <#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": {

RFXtoRP_HsrPro.ftl

@@ -16,34 +16,29 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
             <#if preparation_order.line_list??>
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
-              },
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl">
-              }
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl">
+            }
             <#else>
               <#-- No line -->
               <#stop>
             </#if>
           <#else>
-          <#-- preparation order type not supported -->
+          <#-- Preparation order type not supported -->
             <#stop>
           </#if>
-        <#else>
-          <#-- PRO reference is empty -->
-          <#stop>
-        </#if>
        ]
   <#break>
 
@@ -52,7 +47,7 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
           <#if preparation_order.line_list??>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -65,13 +60,11 @@
             <#stop>
           </#if>
         <#else>
-          <#-- PRO reference is empty -->
+          <#-- Preparation order type not supported -->
           <#stop>
         </#if>
        ]
          <#break>
-
-
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -7,7 +7,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrPro_ExecutionflowCustomFieldsUpdated.ftl

@@ -34,7 +34,11 @@
                 "Value": "${preparation_order.preparation_order_number}"
             }
         ],
-        "RefID": "${preparation_order.originator_reference?trim?json_string}"
+        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+            "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}"
+        <#else>
+            "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}"
+        </#if>
         }
     }
 ]

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -9,33 +9,37 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-    "CustomFields": [
-      {
-        "Key": "depot_code",
-        "Value": "${preparation_order.physical_depot_code?trim?json_string}"
-      },
-      {
-        "Key": "activity_code",
-        "Value": "${preparation_order.activity_code?trim?json_string}"
-      },
-      {
-        "Key": "originator_code",
-        "Value": "${preparation_order.originator_code?trim?json_string}"
-      },
-      {
-        "Key": "reference",
-        "Value": "${preparation_order.originator_reference?trim?json_string}"
-      },
-      {
-        "Key": "order_year",
-        "Value": "${preparation_order.preparation_order_year}"
-      },
-      {
-        "Key": "order_number",
-        "Value": "${preparation_order.preparation_order_number}"
-      }
-    ],
-    "RefID": "${preparation_order.originator_reference?trim?json_string}",
+       "CustomFields": [
+            {
+                "Key": "depot_code",
+                "Value": "${preparation_order.physical_depot_code?trim?json_string}"
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${preparation_order.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${preparation_order.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${preparation_order.originator_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${preparation_order.preparation_order_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${preparation_order.preparation_order_number}"
+            }
+        ],
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "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}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -57,54 +61,51 @@
         },
        "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 == "" &&
-          preparation_order.address.name_or_company_name == "" &&
-          preparation_order.address.additional_address_data_1 == "" &&
-          preparation_order.address.additional_address_data_2 == "" &&
-          preparation_order.address.post_code_area_name == "" &&
-          preparation_order.address.territorial_division_code == "" &&
-          preparation_order.address.postal_code == "" &&
-          preparation_order.address.iso_country_code == "">
-            "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+          <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true">
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
           <#else>
-            "Actor":
-             {
-              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-              "Address" :
+            <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!="">
+              "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_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 == "" &&
+              preparation_order.address.post_code_area_name == "" &&
+              preparation_order.address.territorial_division_code == "" &&
+              preparation_order.address.postal_code == "" &&
+              preparation_order.address.iso_country_code == "">
+                "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+              <#else>
+                "Actor":
                 {
-                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
-                 <#if isCountryCode>
-                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
-                 <#else>
-                  "CountryCode" : "",
-                 </#if>
-                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
-                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
-                 }
-                  },
-              "Contact" :
-                {
-                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                  "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}" ]
-                }
+                  "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+                  "Address" :
+                    {
+                    "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                    "CountryCode" : "${preparation_order.address.iso_country_code!""}",
+                    "PostalCode" : "${preparation_order.address.postal_code!""}",
+                    "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                    "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                    "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
+                    }
+                      },
+                  "Contact" :
+                    {
+                      "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
+                      "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
+                      "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
+                      "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>
           </#if>
-         },
-        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
+          },
+        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          "OrderID": "${preparation_order.originator_reference?trim?json_string}",
+        <#else>
+          "OrderID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        </#if>
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
@@ -143,8 +144,14 @@
           {
              "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}"
+                "AuthorTimeZone": "${time_zone_rfx}"
+              </#if>
              }
          }
     }

RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl

@@ -1,20 +1,10 @@
 <#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->
 
-<#--
 <#-- Best practices:
   If the SK is of type:
   - string: add ?json_string (e.g. "${stock.batch_1?json_string}")
   - boolean: possible values: true and false
   - datetime: expected format: 2025-10-30T10:12:10.000Z
-  - decimal number: the separator is a point (e.g. 10.5)
-
-"MetaData": [
-          {
-            "Key": "OrderType",
-            "Value": { "String" : "${preparation_order.optional_attributes.reason_code}"}
-          }
-       ],
--->
-
+  - decimal number: the separator is a point (e.g. 10.5)-->
 
 "MetaData": [        ]

RFXtoRP_HsrReceiptList.ftl

@@ -15,33 +15,52 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#if receipt.receipt_type == "030">
-          <#stop "ignored message because receipt type = transfert">
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl">
+            }
+          ]
         <#else>
           <#if receipt.line_list ??>
           [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
 
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl">
-          }
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCustomFieldsUpdated>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl">
+            }
           ]
           <#else>
-            <#--  No line-->
             <#stop>
           </#if>
         </#if>
@@ -51,41 +70,77 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-         <#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">
-                  }
+          <#if receipt.receipt_type?? && 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_confirmed == "true" >
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+            <#if receipt.receipt_type?? && 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?? && 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_ExecutionflowReceiptCompleted.ftl">
-              }
-            <#else>
-              <#if receipt.receipt_type == "030">
-                <#stop "ignored message because receipt type = transfert">
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                }
               <#else>
-                <#if receipt.line_list ??>
+                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
                   {
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                    "datas" :
-                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-                  },
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                   "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                   }
                 <#else>
-                  <#--  No line-->
-                  <#stop>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
+                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                    [
+                      {
+                        <#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>
+                      <#stop> <#-- Receipt reference for transfer is empty-->
+                    </#if>
+                  <#else>
+                    <#if receipt.line_list ??>
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                      },
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                      }
+                    <#else>
+                      <#stop>
+                    </#if>
+                  </#if>
                 </#if>
               </#if>
             </#if>
@@ -97,20 +152,19 @@
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#if receipt.line_list ??>
        [
-          <#if receipt.line_list ??>
-            {
+          {
 
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-            }
-            <#else>
-              <#--  No line-->
-              <#stop>
-            </#if>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
        ]
+       <#else>
+        <#stop> <#-- No line-->
+      </#if>
          <#break>
 
 

RFXtoRP_HsrReceiptList_CustomFieldsUpdated.ftl

@@ -34,11 +34,7 @@
                 "Value": "${receipt.receipt_number}"
             }
         ],
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-            "RefID": "${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_year}${receipt.receipt_number}"
-        </#if>
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}"
         }
     }
 ]

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -1,48 +1,20 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
+
 [
-  <#if receipt.line_list??>
-    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-          <#if refIDHmap_local?size != 0 >
-          ,
-          </#if>
-          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-          },
-            "Payload": {
-            }
-          }
-        </#if>
-      <#else>
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${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_year}${receipt.receipt_number}",
-            </#if>
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-      </#if>
-    </#list>
-  </#if>
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
 ]

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -9,37 +9,33 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-    "CustomFields": [
-      {
-        "Key": "depot_code",
-        "Value": "${receipt.physical_depot_code?trim?json_string}"
-      },
-      {
-        "Key": "activity_code",
-        "Value": "${receipt.activity_code?trim?json_string}"
-      },
-      {
-        "Key": "originator_code",
-        "Value": "${receipt.originator_code?trim?json_string}"
-      },
-      {
-        "Key": "reference",
-        "Value": "${receipt.receipt_reference?trim?json_string}"
-      },
-      {
-        "Key": "order_year",
-        "Value": "${receipt.receipt_year}"
-      },
-      {
-        "Key": "order_number",
-        "Value": "${receipt.receipt_number}"
-      }
-    ],
-      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        "RefID": "${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_year}${receipt.receipt_number}",
-      </#if>
+      "CustomFields": [
+            {
+                "Key": "depot_code",
+                "Value": "${receipt.physical_depot_code?trim?json_string}"
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            }
+        ],
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -59,7 +55,7 @@
         <#if receipt.receipt_type == '020'>
           "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
         <#else>
-        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+          "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
         </#if>
       },
         "ShipTo"  :
@@ -67,18 +63,18 @@
          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
       "ShipToAcked": true,
-
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID":"R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      </#if>
       <#if receipt.carrier_informations.carrier_code != "">
         "Carrier":
         {
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
-       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        "OrderID": "${receipt.receipt_reference?trim?json_string}",
-      <#else>
-        "OrderID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-      </#if>
+
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>

RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl

@@ -7,7 +7,6 @@
   - boolean: possible values: true and false
   - datetime: expected format: 2025-10-30T10:12:10.000Z
   - decimal number: the separator is a point (e.g. 10.5)
-
 "MetaData": [
           {
             "Key": "OrderType",

RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl

@@ -7,7 +7,6 @@
   - boolean: possible values: true and false
   - datetime: expected format: 2025-10-30T10:12:10.000Z
   - decimal number: the separator is a point (e.g. 10.5)
-
 "SegmentationKeys": [
             {
             "Key": "Grade",

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,48 +1,19 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
 [
-  <#if receipt.line_list??>
-    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-          <#if refIDHmap_local?size != 0 >
-          ,
-          </#if>
-          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-          },
-            "Payload": {
-            }
-          }
-        </#if>
-      <#else>
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${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_year}${receipt.receipt_number}",
-            </#if>
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-      </#if>
-    </#list>
-  </#if>
+  {
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
 ]

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -1,48 +1,21 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+
 [
-  <#if receipt.line_list??>
-    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-          <#if refIDHmap_local?size != 0 >
-          ,
-          </#if>
-          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-          },
-            "Payload": {
-            }
-          }
-        </#if>
-      <#else>
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-              "RefID": "${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_year}${receipt.receipt_number}",
-            </#if>
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-      </#if>
-    </#list>
-  </#if>
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {}
+
+  }
 ]

RFXtoRP_HsrReceiptList_TransfertCustomFieldsUpdated.ftl

@@ -0,0 +1,48 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+    {
+        "Header": {
+            "ProjectID": "${projectRP}"
+        },
+        "Payload" :{},
+        "ID":{
+            "CustomFields": [
+            {
+                "Key": "depot_code",
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
+                <#else>
+                    "Value": "${receipt.physical_depot_code?trim?json_string}"
+                </#if>
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            }
+        ],
+            <#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": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}"
+          </#if>
+        }
+    }
+]

RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl

@@ -0,0 +1,67 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "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": {
+      }
+  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "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_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+            "RefDate": {
+            "DateTime": "${receipt_status_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -0,0 +1,307 @@
+<#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) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+         "CustomFields": [
+            {
+                "Key": "depot_code",
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
+                <#else>
+                    "Value": "${receipt.physical_depot_code?trim?json_string}"
+                </#if>
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            }
+        ],
+          <#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": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          </#if>
+        "RefDate": {
+              "DateTime": "${receipt_creation_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+      },
+      "Payload": {
+        "CreationDateTime": {
+          "DateTime": "${receipt_creation_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+          },
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "OrderID": "${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+        </#if>
+        <#-- 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}"
+              }
+          }
+      }
+    }
+    <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "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_line.origin_order_line_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_line.origin_order_line_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_line.origin_order_line_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}"
+                      }
+                  }
+              }
+            }
+            </#if>
+          <#else>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                "RefDate": {
+                      "DateTime": "${receipt_creation_datetime}",
+                      "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+              },
+              "Payload": {
+                  "CreationDateTime": {
+                    "DateTime": "${receipt_creation_datetime}",
+                    "AuthorTimeZone": "${time_zone_rfx}"
+                    },
+                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?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}"
+                      }
+                  }
+              }
+            }
+              <#break>
+            </#if>
+            </#list>
+          </#if>
+        </#if>
+  ]

RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl

@@ -0,0 +1,67 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "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": {
+      }
+  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "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_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]

RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl

@@ -0,0 +1,67 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "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": {
+      }
+  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "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_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]

RFXtoRP_Receipt_ExecutionflowDeleted.ftl

@@ -0,0 +1,11 @@
+[
+	{
+	  "Header": {
+	    "ProjectID": "${projectRP}"
+	  },
+	  "ID": {
+	       "RefID": "${id.refid?json_string}"
+	  },
+	  "Payload": {}
+	}
+]

RFXtoRP_Receipt_ShipToAcked.ftl

@@ -1,15 +0,0 @@
-[
-	{ 
-	  "Header": {
-	    "ProjectID": "${projectRP}"	   
-	  },
-	  "ID": {
-	       "RefID": "${id.refid?json_string}"
-	  },
-	   
-	  "Payload": {
-	     "ShipToAcked": true
-	  }
-	   
-	}
-]

RFXtoRP_RestResponse.ftl

@@ -153,10 +153,10 @@
 				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
 				[
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
-						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						"datas" :
-						<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+												"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+												"datas" :
+						<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
 					}
 				]
 				<#else>

RP_connector.ftl

@@ -16,7 +16,7 @@ those parameters are stored in FTL file Conf-connector.ftl for later use in some
 <#noparse><#-- 0 : Always empty --></#noparse>
 <#noparse><#-- 1 : Always use HARDIS WMS tracking --></#noparse>
 <#noparse><#-- 2 : Always use the HU number --></#noparse>
-<#noparse><#-- 3 : Use Reflex tracking if it exists, the HU number otherwise --></#noparse>
+<#noparse><#-- 3 : Use HARDIS WMS tracking if it exists, the HU number otherwise --></#noparse>
 
 <#list file.parameters as parameter>
 <#switch parameter.type>

RPtoRFX_AppointmentEvent.ftl

@@ -11,7 +11,7 @@
 <#assign organisationRP = organisation>
 
 <#switch eventRP.event>
-<#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+<#-- *********************************************** Action = CREATE ******************** -->
 	<#case "Created">
 		<#assign appointment = eventRP.data />
 		[
@@ -29,7 +29,7 @@
 		<#assign appointment = eventRP.data />
 	[
 		<#if eventRP.commissionsUpdated>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions !="">
+			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions != "">
 					<#if eventRP.appointmentCustomFields?has_content>
 						{
 							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
@@ -94,7 +94,7 @@
         </#if>
 		]
 	<#break>
-<#-- *********************************************** Action = SlotUpdated ******************** -->
+<#-- *********************************************** Action = Canceled ******************** -->
 	<#case "Canceled">
 		<#assign appointment = eventRP.data />
 		[

RPtoRFX_CarrierAppointmentCreated.ftl

@@ -12,7 +12,7 @@
 	       <#case "APPOINTMENT_TYPE_LOADING">
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
-              <#if appointment.TimeZone?? && appointment.TimeZone!="">
+               <#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
 				<#else>
@@ -57,8 +57,8 @@
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
 						"appointment_designation":"${(appointment.Reason!"")?json_string}",
-			    </#if>
-		   </#if>
+				</#if>
+			</#if>
 		</#if>
 		"constant_appointment": "false"
 	 }

RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl

@@ -12,7 +12,7 @@
 		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
 		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
 		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
-       	<#switch appointment.AppointmentType>
+       <#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -21,9 +21,9 @@
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
-			<#break>
+		   <#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
 		   		<#else>

RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl

@@ -11,7 +11,7 @@
 		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
        <#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
-		   		"unloading_appointment" : "false",
+				"unloading_appointment" : "false",
 				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -21,17 +21,17 @@
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 				</#if>
 			<#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-		   		"unloading_appointment" : "true",
+		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+				"unloading_appointment" : "true",
 				"load_appointment" : "false",
-			   <#if appointment.TimeZone?? && appointment.TimeZone!="">
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
 		   		<#else>
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
 		   		</#if>
-				<#break>
+			<#break>
 	       <#default>
 	         <#stop "appointment.AppointmentType not implemented" >
         </#switch>

RPtoRFX_ExecutionflowEvent.ftl

@@ -17,7 +17,7 @@
 
 <#switch eventRP.event>
 	  <#case "Created">
-	  <#case "Renotified">
+	  	<#case "Renotified">
 			 <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 			<#assign executionflow = eventRP.data />
 

RPtoRFX_PrepOrder.ftl

@@ -17,7 +17,7 @@
 </#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": {

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -16,8 +16,8 @@
 
 <#assign activity_code = ""/>
 <#assign originator_code = ""/>
-<#assign preparation_type_code = ""/>
-<#assign requested_delivery_date_type = ""/>
+<#assign preparation_type_code = "010"/>
+<#assign requested_delivery_date_type = "010"/>
 <#assign consolidated_delivery_flag ="false"/>
 <#assign pick_sequence_code = ""/>
 <#assign protected_flag ="false"/>
@@ -26,7 +26,7 @@
 
 <#-- A supprimer si utilisation de la table de correspondance-->
 <#--To be deleted if using the correspondence table-->
-<#assign load_grouping = "default">
+<#assign load_grouping = "">
 
 
 <#-- Table de correspondance Transporteur/Code regroupement chargement,

RPtoRFX_PrepOrder_HeaderMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- 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"]??>

RPtoRFX_PrepOrder_LineMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- 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"]??>

RPtoRFX_Receipt.ftl

@@ -3,7 +3,7 @@
 <#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": {
@@ -20,7 +20,6 @@
 		"work_mode_code" :     "${work_mode_code}",
 		"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)}",
 		<#else>
@@ -57,9 +56,9 @@
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-				<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
-				"hold_for_specific_code": "false"
-		 		}
+					<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
+					"hold_for_specific_code": "false"
+				}
 			}<#sep>,</#sep>
 		</#list>
 		]

RPtoRFX_Receipt_HeaderMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- 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"]??>

RPtoRFX_Receipt_LineMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- 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"]??>
@@ -14,4 +14,4 @@
                }
             ]
       </#if>,
--->
+-->

RPtoRFX_Receipt_OptionalAttributes.ftl

@@ -1,5 +1,5 @@
 <#-- Here are the fields that can be added
-"batch_2": "string",
+ "batch_2": "string",
 "batch_3": "string",
 "anticipated_receipt_line_activity_code": "str",
 "anticipated_receipt_line_physical_depot_code": "str",

ReflexUtils.ftl

@@ -1,6 +1,6 @@
-<#-- --------------------------------------------------------------------------------------- -->
-<#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
-<#-- --------------------------------------------------------------------------------------- -->
+<#-- -------------------------------------------------------------------------------------------- -->
+<#-- Concat HARDIS WMS timestamp with HARDIS WMS time zone and format this date in ISO UTC format -->
+<#-- -------------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
   <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>
@@ -25,23 +25,22 @@
     <#return (endDate?long - startDate?long) / 1000 >
 </#function>
 
-
 <#-- --------------------------------------------------------------------------------------- -->
-<#-- Split email reflex into json array string                                               -->
+<#-- Split email HARDIS WMS into json array string                                           -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->
 <#--  return "["john.doe@hardis-group.com","name@hardis-group.com"]"                         -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
 <#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
-<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
-<#if str != "[">
-<#local str += ",">
-</#if>
-<#local str += "\"">
-<#local str += email>
-<#local str += "\"">
-</#if>
+  <#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
+    <#if str != "[">
+    <#local str += ",">
+    </#if>
+    <#local str += "\"">
+    <#local str += email>
+    <#local str += "\"">
+  </#if>
 </#list>
 <#local str += "]">
 <#return (str)>

VERSION

@@ -1 +1 @@
-1.2.58+3
+2.0.20+4