Release 2.0.1+2

Merge branch 'to-v10-connector2.0' into 'release/2.0'
Modif typologie See merge request r-d-technique/tiers/reflex-wms-connector!101
2025-04-15 18:28:42 +02:00 · 2025-04-15 16:24:13 +00:00 · 2025-04-15 18:23:06 +02:00 · 2025-04-11 15:46:56 +02:00 · 2025-04-08 10:00:03 +02:00 · 2025-04-08 07:57:49 +00:00
54 changed files with 484 additions and 778 deletions
--- a/README.md
+++ b/README.md
@@ -1,20 +1,11 @@
 # Reflex Platform Core FTLs

-## Overview

-The **Reflex WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from Reflex WMS** into **flows compatible with Reflex Platform**.

-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.
+These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.

-## Role of the FTL Files

- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, etc.).
- These templates use the **FreeMarker** syntax to:
-  - Extract the required fields from the WMS source flow.
-  - Apply transformation rules (mapping, conversions, enrichments).
-  - Generate a **final structured JSON** for Reflex Platform.

-## Useful Resources
+You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
+

- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html)
- [Reflex Platform](https://auth.reflex-platform.com/)
--- a/RFXtoRP_HliPrepaL.ftl
+++ b/RFXtoRP_HliPrepaL.ftl
@@ -1,31 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-<#include "RFX_PartnerAPP_Settings.ftl">
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-<#case "C">
-<#--<#case "U">
-    <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
-    <#stop "no generic FTL file available yet for preparationOrderLines">
-    <#break>
-<#case "D">
-    <#-- *********************************************** Action = DELETE ******************** -->
-    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
-    <#stop "no generic FTL file available yet for preparationOrderLines">
-    <#break>
-<#break>
-
-<#default>
-<#stop>
-</#switch>
--- a/RFXtoRP_HliReceiptLr.ftl
+++ b/RFXtoRP_HliReceiptLr.ftl
@@ -1,34 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-    <#case "C">
-    <#case "U">
-        <#-- *********************************************** Action = CREATE ******************** -->
-
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
-
-        <#stop "no generic FTL file available yet for receiptLines">
-        <#break>
-
-      <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
-
-        <#stop "no generic FTL file available yet for receiptLines">
-        <#break>
-
-    <#default>
-          <#stop >
-</#switch>
-
--- a/RFXtoRP_HlrProL.ftl
+++ b/RFXtoRP_HlrProL.ftl
@@ -1,32 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
-
-      <#stop "no generic FTL file available yet for preparationOrderLines">
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
-
-      <#stop "no generic FTL file available yet for preparationOrderLines">
-      <#break>
-    <#default>
-          <#stop >
-</#switch>
-
--- a/RFXtoRP_HsaCarrier.ftl
+++ b/RFXtoRP_HsaCarrier.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,7 +20,7 @@
      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/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 Reflex WMS address is not structured    -->
        <#else>
          <#if  carrier.address??>
--- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaCons.ftl
+++ b/RFXtoRP_HsaCons.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -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">
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/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 Reflex WMS is structured    -->
        <#if actor.consignee_structured_address??>

--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -16,7 +16,7 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
-           <#if dispute.dispute_closed == true >
+          <#if dispute.dispute_closed == true >
            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
@@ -24,7 +24,7 @@
              "datas" :
              <#include "RFXtoRP_HsaDispute_Created.ftl">
            }
-            <#if TableReasonCode[dispute.dispute_reason_code]??>
+              <#if TableReasonCode[dispute.dispute_reason_code]??>
              ,
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
@@ -32,12 +32,11 @@
              "datas" :
              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
            }
-            <#else>
+              <#else>
                <#stop>
              </#if>
            <#else>
-              <#--  "Reference is empty"-->
-              <#stop>
+              <#stop "Reference is empty">
            </#if>
          </#if>
       ]
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -1,4 +0,0 @@
-<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
-
-
-"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/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>
@@ -39,26 +39,31 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
-            <#-- Claim metadata inclusion  -->
-            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
            <#-- To configure -->
            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
            <#else>
-                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
-                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
-                <#else>
-                    <#stop "WMS type code not supported">
+                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
+                    <#if dispute.dispute_reception.reception_type_code=="030">
+                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                    <#else>
+                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
+                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                        <#else>
+                            <#stop "WMS type code not supported">
+                        </#if>
+                    </#if>
                </#if>
            </#if>

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_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 +71,4 @@



+
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -57,8 +57,8 @@
                        }
                        ]
                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored, Reference receipt is empty-->
-                        <#stop >
+                        <#-- Case of IPG move type volontarilly ignored-->
+                        <#stop " Reference receipt is empty">
                     </#if>
               <#else>
                  <#stop>
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -21,38 +21,24 @@
       "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",
            </#if>
+
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-        <#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}",
-            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
-          <#else>
-            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-              "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-            </#if>
-          </#if>
+
+        <#if reflexMvtStockInterface.receipt_reference!="">
+          "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>
-          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-          <#else>
-            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-          </#if>
-        </#if>
-        <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
-          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
-        <#else>
-          "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
        </#if>
+        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,7 +18,7 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list??  && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+           <#if item.logistical_variant_list?? >
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,57 +17,56 @@
      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
      [
         <#--**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>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
-            }
-         <#else>
-            <#-- ** Collection started (300) and Preparation in progress (400)** -->
-            <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+         <#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.ExecutionflowPreparationStarted>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
               }
            <#else>
-                  <#-- ****Preparation dispatched (600)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                     {
-                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
-                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                     "datas" :
-                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                     },
-                     {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
-                     }
+               <#-- ** Collection started (300) and Preparation in progress (400)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+                  }
               <#else>
-                     <#-- ****Preparation cancelled (650)**** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                     <#-- ****Preparation dispatched (600)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                        },
+                        {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                        }
                  <#else>
-                        <#stop>
+                        <#-- ****Preparation cancelled (650)**** -->
+                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                           {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           }
+                     <#else>
+                           <#stop>
+                     </#if>
                  </#if>
               </#if>
            </#if>
+         <#else>
+            <#stop "PRO reference is empty">
         </#if>
-      <#else>
-         <#--PRO reference is empty-->
-         <#stop >
-      </#if>
      ]
      <#break>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-    "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,10 +7,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        "RefDate": {
-          "DateTime": "${preparation_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+       "RefDate": {
+        "DateTime": "${preparation_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,10 +7,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-        "RefDate": {
-          "DateTime": "${preparation_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+       "RefDate": {
+        "DateTime": "${preparation_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,10 +7,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
-          "DateTime": "${preparation_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
+        "DateTime": "${preparation_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

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

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,7 +20,7 @@
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/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 Reflex WMS address is structured    -->
        <#if actor.supplier_structured_address?? >
-
          "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
@@ -36,7 +29,6 @@
          </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
-
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if actor.optional_attributes?? >
@@ -47,7 +39,6 @@
            "CountryCode" : ""
          </#if>
        </#if>
-
         },
      <#if actor.optional_attributes?? >
        "Phones": ["${actor.optional_attributes.telephone?json_string}",
--- a/RFXtoRP_HsaSup_ActorDeleted.ftl
+++ b/RFXtoRP_HsaSup_ActorDeleted.ftl
@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsrDepot.ftl
+++ b/RFXtoRP_HsrDepot.ftl
@@ -17,7 +17,7 @@
      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/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 Reflex WMS address is structured    -->
        <#if depot.physical_depot_structured_address?? >
-
          "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
@@ -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 Reflex WMS address is not structured    -->
        <#else>
          <#if depot.physical_depot_address??>
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@@ -1,32 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
-
-      <#stop "no generic FTL file available yet for Pack Branch">
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
-
-      <#stop "no generic FTL file available yet for  Pack Branch">
-      <#break>
-    <#default>
-          <#stop >
-</#switch>
-
--- a/RFXtoRP_HsrPackOrder.ftl
+++ b/RFXtoRP_HsrPackOrder.ftl
@@ -1,32 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
-
-      <#stop "no generic FTL file available yet for Pack Order">
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
-
-      <#stop "no generic FTL file available yet for Pack Order">
-      <#break>
-    <#default>
-          <#stop >
-</#switch>
-
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -18,7 +18,6 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

   <#if	preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_line_lst??>
         [
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -41,12 +40,6 @@
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
               }
            </#if>

@@ -81,28 +74,23 @@
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
-                  <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
-                  }
-               </#if>
+               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+               }
+            </#if>

            </#if>
               </#list>
            </#list>
            <#assign refIDHmap ={}>
         ]
-      <#else>
-         <#--   No line-->
-         <#stop >
-      </#if>
   <#else>
-      <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop >
+      <#stop "no confirmed quantity for the preparation - preparation closed">
   </#if>


--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -4,30 +4,30 @@
 [
  <#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 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}"
+      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
      },
-      "Payload":{
-        "Carrier": {
-          "ActorID": "${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 ={}>
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -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,9 @@

       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-        },
-        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+         },
+       "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/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 ={}>
-]
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,27 +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.line_list??>
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
-              }
-            <#else>
-              <#-- No line -->
-              <#stop>
-            </#if>
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+            <#-- Only if preparation order not confirmed  -->
+            <#if preparation_order.preparation_order_confirmed == "false" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            }
+           <#else>
+           <#-- preparation order already confirmed -->
+            <#stop>
+           </#if>
+
          <#else>
          <#-- preparation order type not supported -->
-            <#stop>
+          <#stop>
          </#if>
        <#else>
-          <#-- PRO reference is empty -->
-          <#stop>
+          <#stop "PRO reference is empty">
        </#if>
       ]
  <#break>
@@ -47,20 +49,14 @@
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          <#if preparation_order.line_list??>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-            }
-          <#else>
-            <#-- No line -->
-            <#stop>
-          </#if>
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+        }
        <#else>
-          <#-- PRO reference is empty -->
-          <#stop>
+          <#stop "PRO reference is empty">
        </#if>
       ]
         <#break>
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-    "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -31,54 +31,43 @@
        },
       "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.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
          <#else>
-            "Actor":
-             {
-              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-              "Address" :
-                {
-                 "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}" ]
-                }
+            <#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":
+              {
+                "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>
         },
-        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
+        "OrderID":"${preparation_order.originator_reference?trim?json_string}",
       <#if preparation_order.line_list??>
       "Lines" : [
           <#list preparation_order.line_list as preparation_order_line >
@@ -117,8 +106,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>
             }
         }
    }
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -16,10 +16,24 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type == "030">
-          <#stop "ignored message because receipt type = transfert">
+        <#if receipt.receipt_type = "030">
+        [
+          {
+            <#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>
-          <#if receipt.line_list ??>
          [
          {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -36,15 +50,10 @@

          }
          ]
-          <#else>
-            <#--  No line-->
-            <#stop>
-          </#if>
+        </#if>
+      <#else>
+        <#stop "Receipt reference is empty">
      </#if>
-    <#else>
-      <#--  "Receipt reference is empty"-->
-      <#stop>
-    </#if>
      <#break>
    <#case "U">
       <#-- *********************************************** Action = UPDATE ******************** -->
@@ -52,48 +61,38 @@
      <#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 = "030" && receipt.receipt_confirmed == "true" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+            }
          <#else>
-            <#if receipt.receipt_confirmed == "true" >
+            <#if receipt.receipt_confirmed == "true">
              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+            }
+            <#else>
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-              }
-            <#else>
-              <#if receipt.receipt_type == "030">
-                <#stop "ignored message because receipt type = transfert">
-              <#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>
-                  <#--  No line-->
-                  <#stop>
-                </#if>
-              </#if>
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+              },
+              {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+            }
            </#if>
          </#if>
        <#else>
-          <#-- Receipt reference is empty-->
-          <#stop >
+          <#stop "Receipt reference is empty">
        </#if>
       ]
      <#break>
@@ -104,21 +103,15 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#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>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
        <#else>
-           <#-- Receipt reference is empty-->
-          <#stop >
+          <#stop "Receipt reference is empty">
        </#if>
       ]
         <#break>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -1,46 +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!="">
-        <#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>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-              "RefID": "${receipt.receipt_reference?trim?json_string}",
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-        </#if>
-      </#if>
-    </#list>
-  </#if>
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
 ]
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,17 +26,14 @@

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

      <#if receipt.carrier_informations.carrier_code != "">
        "Carrier":
@@ -44,7 +41,7 @@
          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
        },
      </#if>
-      "OrderID": "${receipt.receipt_reference?trim?json_string}",
+
      <#if receipt.line_list??>
       "Lines" : [
          <#list receipt.line_list as line>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -1,46 +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!="">
-        <#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>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-              "RefID": "${receipt.receipt_reference?trim?json_string}",
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-        </#if>
-      </#if>
-    </#list>
-  </#if>
+  {
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
 ]
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -1,46 +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!="">
-        <#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>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-              "RefID": "${receipt.receipt_reference?trim?json_string}",
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-        </#if>
-      </#if>
-    </#list>
-  </#if>
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+         "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+       "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {}
+
+  }
 ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -0,0 +1,20 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
+]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -0,0 +1,94 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  {
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "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}",
+      "RefDate": {
+            "DateTime": "${receipt_creation_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+             }
+    },
+    "Payload": {
+         "CreationDateTime": {
+           "DateTime": "${receipt_creation_datetime}",
+           "AuthorTimeZone": "${time_zone_rfx}"
+             },
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
+       <#-- Header Metadata inclusion -->
+       <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
+
+      "ShipFrom":
+      {
+        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+      },
+        "ShipTo"  :
+      {
+         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+      },
+      "ShipToAcked": true,
+
+      <#if receipt.carrier_informations.carrier_code != "">
+        "Carrier":
+        {
+          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+        },
+      </#if>
+
+      <#if receipt.line_list??>
+       "Lines" : [
+          <#list receipt.line_list as line>
+        {
+          "LineID": "${line.receipt_line_number}",
+          <#-- Line Metadata inclusion -->
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
+          "RequestedContent":
+          {
+            "Goods":
+            {
+              "ItemID":   "${line.item_code?trim?json_string!"0"}",
+              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
+              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                   "PriorityDate": "${line_without_detail_priority_date}",
+              <#else>
+                <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${line_detail_priority_date}",
+                <#else>
+                    "PriorityDate": "1970-01-01T00:00:00Z",
+                </#if>
+              </#if>
+              <#-- Segmentation Keys inclusion -->
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
+            },
+            "Quantity" :
+            {
+              "LVID":   "${quantity_in_base_lv_RP_Cst}",
+              "Value":  "${line.order_quantity_in_lv!0}"
+            }
+          }
+
+        }
+      <#sep>,</#sep>
+          </#list>
+         ],
+      </#if>
+
+         "RequestedMilestones" :
+         {
+             "RequestedDeliveryDateTime" :
+             {
+                "DateTime": "${receipt_datetime}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+             }
+         }
+    }
+  }
+]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -0,0 +1,19 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+[
+  {
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "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}",
+      "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+    "Payload": {
+    }
+  }
+]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -0,0 +1,21 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+         "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}",
+       "RefDate": {
+        "DateTime": "${receipt_status_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {}
+
+  }
+]
--- a/RPtoRFX_PrepOrder.ftl
+++ b/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": {
@@ -27,7 +27,6 @@
 	},
 	"payload" :
 	 {
-		<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
 		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
@@ -44,7 +43,6 @@
        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
-			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
@@ -84,17 +82,12 @@
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-				<#else>
-				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-				<#else>
-				<#assign SegmentationKeys_Map = {} />
 				</#if>
 				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 				{
-				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -105,6 +98,13 @@
 				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
+				<#--
+				"stock_reservation": "false",
+				"forced_priority_date_min_lead_time": "false",
+				"temp_substitution_possible": "false",
+				"substitution_possible": "false"
+				-->
+
 				}
 			<#sep>,</#sep>
 			</#list>
--- a/RPtoRFX_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- 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... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_PrepOrder_LineMetadata.ftl
+++ b/RPtoRFX_PrepOrder_LineMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- 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... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_PrepOrder_OptionalAttributes.ftl
+++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl
@@ -1,8 +0,0 @@
-<#-- Here are the fields that can be added
-"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
-"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
-"reason_code": "str",
-"planned_preparation_date": "0000-00-00",
-"despatch_grouping": "string",
-"reservation_end_datetime": "0000-00-00T00:00:00",
-->
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -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": {
@@ -13,7 +13,6 @@
 	},
 	"payload" :
 	 {
-		<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
 		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}",
@@ -38,17 +37,12 @@
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-				<#else>
-				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-				<#else>
-				<#assign SegmentationKeys_Map = {} />
 				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
 			{
-				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -57,9 +51,15 @@
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-				<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
-				"hold_for_specific_code": "false"
+			   		<#--"held_for_check": "false",
+			   		"hold_code": "false", -->
+					"hold_for_specific_code": "false"
 		 		}
+		  		<#--"quality_control_attributes": {
+	        		"qcf_to_create_for_receipt_line": "false",
+	         		"exclude_item_from_inspection": "false"
+  				} -->
+
 			}<#sep>,</#sep>
 		</#list>
 		]
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- 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... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- 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... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_Receipt_OptionalAttributes.ftl
+++ b/RPtoRFX_Receipt_OptionalAttributes.ftl
@@ -1,16 +0,0 @@
-<#-- Here are the fields that can be added
-"batch_2": "string",
-"batch_3": "string",
-"anticipated_receipt_line_activity_code": "str",
-"anticipated_receipt_line_physical_depot_code": "str",
-"anticipated_receipt_line_originator_code": "string",
-"anticipated_receipt_reference": "string",
-"anticipated_receipt_planned_date": "0000-00-00",
-"anticipated_receipt_reference_line_no": 999999,
-"reservation_consignee_code": "string",
-"reservation_consignee_group_code": "string",
-"pro_reservation_reference": "string",
-"held_for_check": "false",
-"held_for_repacking": "false",
-"hold_code": "str"
-->
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.44+1
+2.0.1+2
Author	SHA1	Message	Date
freat	2752e5b26e	Release 2.0.1+2	2025-04-15 18:28:42 +02:00
Francis Reat	6b0a3f0b24	Merge branch 'to-v10-connector2.0' into 'release/2.0' Modif typologie See merge request r-d-technique/tiers/reflex-wms-connector!101	2025-04-15 16:24:13 +00:00
Laurie Montant	c4f2161edb	Modif typologie (cherry picked from commit `a1c4b8a4ac`)	2025-04-15 18:23:06 +02:00
freat	80736c4a30	Release 2.0.1+1	2025-04-11 15:46:56 +02:00
Vincent Le Maitre	e2a8404311	Release 2.0.0+1	2025-04-08 10:00:03 +02:00
Vincent LEMAITRE	11ab7068cd	New Major version 2.y.z	2025-04-08 07:57:49 +00:00
frea	3aee512fa1	adjsut version	2025-04-07 13:46:35 +02:00
frea	40d767406a	change executuionflow.Order.ID to eventRP.refid	2025-03-27 15:21:59 +01:00
Laurie Montant	d5efde68a9	modifs recipt	2025-03-24 15:59:20 +01:00
Laurie Montant	f31be2092e	modifs	2025-03-21 17:19:13 +01:00
Laurie Montant	24564d199e	claim	2025-03-21 17:09:37 +01:00
Laurie Montant	5397b211b4	depot actor	2025-03-21 11:31:45 +01:00
Laurie Montant	c3e584c43b	claim reference empty	2025-03-21 11:22:43 +01:00
Laurie Montant	cdc4ab6c3c	claim	2025-03-20 17:52:49 +01:00
Laurie Montant	9b4506912c	modifs actor	2025-03-20 17:44:33 +01:00
frea	e7fa9ec7b7	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-03-20 17:29:25 +01:00
frea	53c400be49	SCPN1-8474	2025-03-20 17:28:57 +01:00
Laurie Montant	bb6e68a697	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-03-20 17:21:27 +01:00
Laurie Montant	969560a0d1	modifs claim	2025-03-20 17:21:20 +01:00
frea	3f693dc4cb	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-03-20 17:10:26 +01:00
frea	02e8dc2566	SCPN1-8474	2025-03-20 17:09:41 +01:00
Laurie Montant	546891463b	modifs claim	2025-03-20 17:09:16 +01:00
frea	c5afde166a	SCPN1-8401 la correction a été perdue...	2025-03-19 17:50:55 +01:00
Laurie Montant	9e16ebae85	claim	2025-03-19 16:54:47 +01:00
Laurie Montant	546d46fc42	modifs	2025-03-19 15:11:14 +01:00
Laurie Montant	f14616784a	modifs	2025-03-19 15:06:59 +01:00
frea	4115d9ec5f	SCPN1-8483 (cherry picked from commit `8ee7527ba4`)	2025-03-19 11:47:41 +01:00
Laurie Montant	9d99c0c65e	displayID	2025-03-19 10:44:16 +01:00
Laurie Montant	ff25781b84	claim	2025-03-13 15:07:49 +01:00
Laurie Montant	a045b37b7b	claim	2025-03-13 11:51:44 +01:00
Laurie Montant	337b011d4e	claim	2025-03-13 11:47:09 +01:00
Laurie Montant	7b4dfe0288	claim	2025-03-13 11:39:29 +01:00
Laurie Montant	da75ead70f	claim	2025-03-13 11:32:04 +01:00
Laurie Montant	b168b16931	claim	2025-03-13 11:28:34 +01:00
Laurie Montant	f76d632303	claim	2025-03-13 10:20:22 +01:00
frea	5963948635	update URL in readme.md	2025-03-12 15:05:01 +01:00
Laurie Montant	80965f3927	UTC	2025-03-12 10:14:55 +01:00
Laurie Montant	7ae70dae92	Ajout OrderID	2025-03-11 16:19:35 +01:00
frea	dbffc01a70	SCPN1-8401 (cherry picked from commit 0cec20a8aa91ce5d958a9d6087d4778f86f2c5fd)	2025-03-07 14:17:28 +01:00
frea	2681a4dc24	SCPN1-8401 (syntaxe error in RXftoRP-HsrReceiptList_ExecutionflowDetected.ftl et RXftoRP-HsrReceiptList_ExecutionflowReceiptComplet.ftl)	2025-03-06 16:13:36 +01:00
frea	9380d39bb6	SCPN1-8401 (syntaxe error in RXftoRP-HsrPro_ExecutionflowDetected.ftl)	2025-03-04 14:28:12 +01:00
Cedric Rodier	ba13f7cf59	add version 2.0 support	2025-03-03 11:01:03 +00:00
@@ -1 +1 @@
 .2.44+1
 .0.1+2