Release 2.0.7+2

Merge branch 'SCPN1-9288-2.0' into 'release/2.0'
SCPN1-9288 See merge request r-d-technique/tiers/reflex-wms-connector!129
2025-09-08 10:43:06 +02:00 · 2025-09-08 08:38:13 +00:00 · 2025-09-08 10:31:29 +02:00 · 2025-08-26 16:23:14 +02:00 · 2025-08-26 13:56:52 +00:00 · 2025-08-26 15:41:00 +02:00
41 changed files with 1005 additions and 395 deletions
--- a/README.md
+++ b/README.md
@@ -1,9 +1,20 @@
 # 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**.

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

+## 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.

-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/
+## Useful Resources
+
+- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html)
+- [Reflex Platform](https://auth.reflex-platform.com/)
--- a/RFXtoRP_HliPrepaL.ftl
+++ b/RFXtoRP_HliPrepaL.ftl
@@ -0,0 +1,31 @@
+<#-- **** 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
@@ -0,0 +1,34 @@
+<#-- **** 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
@@ -0,0 +1,32 @@
+<#-- **** 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_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -17,7 +17,6 @@
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
          <#if dispute.dispute_closed == true >
-            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -35,9 +34,6 @@
              <#else>
                <#stop>
              </#if>
-            <#else>
-              <#stop "Reference is empty">
-            </#if>
          </#if>
       ]
  <#break>
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -0,0 +1,4 @@
+<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
+
+
+"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -39,19 +39,36 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
+            <#-- Claim metadata inclusion  -->
+            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
            <#-- To configure -->
            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
-            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+            <#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>
+                    "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">
-                        "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}",
+                    <#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":"${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}",
+                            "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">
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -47,7 +47,6 @@
               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                     reflexMvtStockInterface.ipg_move_type == "110" ||
                     reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                        [
                        {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@@ -56,10 +55,6 @@
                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
                        }
                        ]
-                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
-                     </#if>
               <#else>
                  <#stop>
               </#if>
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -26,19 +26,36 @@
           <#else>
              "PriorityDate": "1970-01-01T00:00:00Z",
            </#if>
-
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-
-        <#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}",
+        <#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.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.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": "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>
-          "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 reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            "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": "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>
+          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
+        <#else>
+          "LineID": "${reflexMvtStockInterface.receipt_line_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
@@ -24,7 +24,8 @@
           "datas" :
            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
        <#else>
-          <#stop "no LV for the item">
+          <#--  "no LV for the item"-->
+          <#stop>
        </#if>
         }
       ]
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -37,7 +37,7 @@
            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
            "Name" : "${logistical_variant.lv_type_code?json_string}",

-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
            "Codes": [
                       <#list logistical_variant.id_list as id>
                       {
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,7 +17,6 @@
      <#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>
@@ -64,9 +63,6 @@
                  </#if>
               </#if>
            </#if>
-         <#else>
-            <#stop "PRO reference is empty">
-         </#if>
      ]
      <#break>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -8,7 +8,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "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}",
+      <#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}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "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}",
+      <#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}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "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}",
+      <#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}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "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}",
+      <#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}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "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}",
+      <#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}"
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@@ -0,0 +1,32 @@
+<#-- **** 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
@@ -0,0 +1,32 @@
+<#-- **** 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
@@ -17,80 +17,91 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

-   <#if	preparationOrder.total_lv_validated !=0>
-         [
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.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">
-               }
-            </#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]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "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 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>
+               <#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]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+                  <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "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}>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+
+               </#if>
+                  </#list>
               </#list>
-            </#list>
-            <#assign refIDHmap ={}>
-         ]
+               <#assign refIDHmap ={}>
+            ]
+         <#else>
+         <#--   No line-->
+         <#stop>
+      </#if>
+      <#else>
+         <#--   Preparation Type not supported-->
+         <#stop>
+      </#if>
   <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop>
   </#if>


--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -3,8 +3,12 @@
 <#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>
+  <#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 >
        ,
@@ -15,7 +19,7 @@
      "ProjectID": "${projectRP}"
      },
      "ID":{
-      "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}"
+        "RefID": "${OrderOriginReference}"
      },
    "Payload":{
      "Carrier": {
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/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 >
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/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) />
    {
@@ -112,8 +112,14 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-       "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.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+        "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}",
+      <#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>
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,30 +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 == "010" || preparation_order.preparation_type_code == "030">
-            <#-- Only if preparation order not confirmed  -->
-            <#if preparation_order.preparation_order_confirmed == "false" >
+            <#if preparation_order.line_list??>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
            }
-           <#else>
-           <#-- preparation order already confirmed -->
-            <#stop>
-           </#if>
-
+            <#else>
+              <#-- No line -->
+              <#stop>
+            </#if>
          <#else>
-          <#-- preparation order type not supported -->
-          <#stop>
+          <#-- Preparation order type not supported -->
+            <#stop>
          </#if>
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
       ]
  <#break>

@@ -48,20 +41,24 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-        }
+        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
+          <#if preparation_order.line_list??>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#-- No line -->
+            <#stop>
+          </#if>
        <#else>
-          <#stop "PRO reference is empty">
+          <#-- Preparation order type not supported -->
+          <#stop>
        </#if>
       ]
         <#break>
-
-
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "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}",
+      <#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}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -9,7 +9,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "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}",
+      <#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}"
@@ -31,43 +35,51 @@
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
-            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_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>
-            <#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)}"
+            <#if preparation_order.preparation_type_code == "030">
+              "ActorID": "${RFXtoRPprefixDepot(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 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>
          </#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 >
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,103 +15,126 @@

      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type = "030">
-        [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+        <#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.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.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.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">

-          }
+            }
          ]
+          <#else>
+            <#stop>
+          </#if>
        </#if>
-      <#else>
-        <#stop "Receipt reference is empty">
-      </#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_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+          <#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_type == "030" && receipt.receipt_confirmed == "true">
+          <#else>
+            <#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 == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                  }
-                <#else>
-                  <#if receipt.receipt_confirmed == "true" >
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-            }
            <#else>
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              <#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_ExecutionflowDetected.ftl">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
-            </#if>
-          </#if>
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                }
+              <#else>
+                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                  }
+                <#else>
+                  <#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>
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
+          </#if>
       ]
      <#break>

@@ -119,8 +142,8 @@
      <#-- *********************************************** Action = DELETE ******************** -->
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#if receipt.line_list ??>
       [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
          {

            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -128,10 +151,10 @@
            "datas" :
            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
          }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
       ]
+       <#else>
+        <#stop> <#-- No line-->
+      </#if>
         <#break>


--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "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}",
+      "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}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "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}",
+        "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}"
@@ -26,15 +26,22 @@

      "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.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":
        {
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -7,7 +7,7 @@
      "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}",
+      "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}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -8,8 +8,8 @@
      "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": {
+      "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}"
      }
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -1,24 +1,67 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
-  {
-    "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}"
+  <#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": {
      }
-    },
-    "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>
 ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -1,98 +1,278 @@
 <#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 ={}>
 [
-  {
-  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-            "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-             }
-    },
-    "Payload": {
-         "CreationDateTime": {
-           "DateTime": "${receipt_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"
-             },
+  <#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": {
+        "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>
        "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":
+        <#-- Header Metadata inclusion -->
+        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
+        "ShipFrom":
        {
-          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+          "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
        },
-      </#if>
-
-      <#if receipt.line_list??>
-       "Lines" : [
-          <#list receipt.line_list as line>
+          "ShipTo"  :
        {
-          "LineID": "${line.receipt_line_number}",
-          <#-- Line Metadata inclusion -->
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-          "RequestedContent":
+          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+        },
+        "ShipToAcked": true,
+        <#if receipt.carrier_informations.carrier_code != "">
+          "Carrier":
          {
-            "Goods":
+            "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":
            {
-              "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}",
+              "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>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
+                  <#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>
-              </#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}"
+                <#-- 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}"
-             }
-         }
+        <#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>
+  ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -1,23 +1,67 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-     "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}"
+  <#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": {
      }
-    },
-    "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>
 ]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -1,25 +1,67 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
-  {
-    "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}"
+  <#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": {
      }
-    },
-
-    "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>
 ]
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -44,6 +44,7 @@
        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
+			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
@@ -83,9 +84,13 @@
 				<#-- ******* 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">
 				{
@@ -100,14 +105,6 @@
 				"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_OptionalAttributes.ftl
+++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl
@@ -0,0 +1,8 @@
+<#-- Here are the fields that can be added
+"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
+"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
+"reason_code": "str",
+"planned_preparation_date": "0000-00-00",
+"despatch_grouping": "string",
+"reservation_end_datetime": "0000-00-00T00:00:00",
+-->
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -38,9 +38,13 @@
 			<#-- ******* 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">
 			{
@@ -53,15 +57,9 @@
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
-			   		"hold_code": "false", -->
+					<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
 					"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_OptionalAttributes.ftl
+++ b/RPtoRFX_Receipt_OptionalAttributes.ftl
@@ -0,0 +1,16 @@
+<#-- 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 @@
-2.0.2+2
+2.0.7+2
Author	SHA1	Message	Date
frea	8cb5f4d0b5	Release 2.0.7+2	2025-09-08 10:43:06 +02:00
Francis Reat	75f791bf62	Merge branch 'SCPN1-9288-2.0' into 'release/2.0' SCPN1-9288 See merge request r-d-technique/tiers/reflex-wms-connector!129	2025-09-08 08:38:13 +00:00
Laurie Montant	aab63ed3ee	Corrections 250908 (cherry picked from commit `6b0d53926f`)	2025-09-08 10:31:29 +02:00
frea	3c579500ef	Release 2.0.7+1	2025-08-26 16:23:14 +02:00
Francis Reat	c04c8c581f	Merge branch 'v11-connector-2.0' into 'release/2.0' v11-connector-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!124	2025-08-26 13:56:52 +00:00
GROUP\frea	7cdacb981b	Merge branch 'develop' into v11-connector-2.0 # Conflicts: # README.md # RFXtoRP_HsrReceiptList.ftl # RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl # RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl # RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl # RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl # RPtoRFX_PrepOrder.ftl # RPtoRFX_Receipt_LineMetadata.ftl # VERSION	2025-08-26 15:41:00 +02:00
Vincent Le Maitre	18adbf609d	Release 2.0.6+1	2025-08-26 11:03:29 +02:00
Laurie Montant	9a456ac412	modif hsaipgmove receipt number line	2025-08-25 16:47:37 +02:00
Laurie Montant	cb8f9d84b2	readme	2025-08-07 16:38:25 +02:00
Laurie Montant	f6fb052e8c	Modif OptionalAttributes	2025-08-07 11:03:45 +02:00
Laurie Montant	828fe74f5b	controle line-list	2025-08-06 11:03:31 +02:00
Laurie Montant	fa59170f4d	Controle line_list	2025-08-06 10:12:28 +02:00
Laurie Montant	db7d673b07	ajout controle	2025-08-05 17:19:51 +02:00
Laurie Montant	92b4f80170	Modif	2025-08-05 17:10:28 +02:00
Laurie Montant	5063703e56	Enlever un controle sur le D transfert	2025-08-05 16:43:20 +02:00
Laurie Montant	544cecb4f2	Modif RPtoRFX	2025-08-05 13:54:38 +02:00
Laurie Montant	06bd2c2520	SCPN1-9104	2025-07-22 11:39:19 +02:00
Laurie Montant	c4d328235f	SCPN1-9104	2025-07-22 11:36:46 +02:00
Laurie Montant	6adc190531	SCPN1-9104	2025-07-22 11:33:16 +02:00
Laurie Montant	4419794595	SCPN1-9104	2025-07-22 11:30:28 +02:00
Laurie Montant	2544ee3983	SCPN1-9104	2025-07-22 11:26:53 +02:00
Laurie Montant	3e978f8d75	SCPN1-9104	2025-07-22 11:20:18 +02:00
Laurie Montant	bef91763b1	SCPN1-9104	2025-07-22 11:11:07 +02:00
Laurie Montant	f7ff9071af	SCPN1-9104	2025-07-22 11:03:32 +02:00
Laurie Montant	0f5052308b	SCPN1-9104	2025-07-22 10:38:18 +02:00
Laurie Montant	842bdac857	SCPN1-9104	2025-07-22 10:23:40 +02:00
Laurie Montant	974cb0a3d4	supression commentaire	2025-07-18 17:02:50 +02:00
GROUP\frea	3d2670b9a2	SCPN1-9084	2025-07-15 14:57:59 +02:00
Laurie Montant	43855289ed	hsadispute	2025-07-11 16:56:56 +02:00
Laurie Montant	25044dca56	hsadispute	2025-07-11 16:52:38 +02:00
Laurie Montant	7f6442450b	hsadispute	2025-07-11 15:58:42 +02:00
Laurie Montant	9d6fabef0b	hsadispute	2025-07-11 15:26:33 +02:00
Laurie Montant	577d5272e9	hsadispute	2025-07-11 15:19:18 +02:00
Laurie Montant	42fd531289	Hsadispute	2025-07-11 14:49:09 +02:00
Laurie Montant	bc7b677ada	modif hsaipgmove	2025-07-10 12:00:51 +02:00
Laurie Montant	f829fa6310	modif réception	2025-07-10 11:57:52 +02:00
Laurie Montant	d9445d9ad5	modif	2025-07-10 11:39:46 +02:00
frea	6f361e1ffe	Release 2.0.5+1	2025-07-10 11:32:33 +02:00
Francis Reat	43e0a5ad0d	Merge branch 'SCPN1-8991-8980-9059-2.0' into 'release/2.0' SCPN1-8991-8980-9059-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!121	2025-07-10 09:31:47 +00:00
Laurie Montant	a605e98ccd	modif hsadispute created	2025-07-10 11:04:16 +02:00
Laurie Montant	804ceb25f3	Modif Réception	2025-07-10 10:33:34 +02:00
GROUP\frea	17184ed314	SCPN1-9059	2025-07-10 09:55:20 +02:00
GROUP\frea	2a036decc0	SCPN1-9059	2025-07-10 09:54:08 +02:00
Laurie Montant	70b437619a	SCPN1-9059	2025-07-09 18:17:05 +02:00
Laurie Montant	a60c20d707	SCPN1-8871	2025-07-09 16:42:20 +02:00
Laurie Montant	da69788478	SCPN1-9059	2025-07-09 15:10:20 +02:00
Laurie Montant	5d7427b0a0	SCPN1-9059	2025-07-09 15:00:03 +02:00
Laurie Montant	94e988ac56	Modif hsaIpgMove	2025-07-08 17:22:01 +02:00
Laurie Montant	a5e4cad965	Modif HsrPro Detected	2025-07-08 17:06:42 +02:00
Laurie Montant	c33c54ed92	Modif HsrPrepa Carrier Updated	2025-07-08 16:55:20 +02:00
Laurie Montant	03ca7d0ef7	modif Hsrprepa Carrier Updated	2025-07-08 16:53:43 +02:00
Laurie Montant	4ffaf0ec73	SCPN1-8871	2025-07-03 15:09:53 +02:00
GROUP\frea	bcd2d995c2	SCPN1-8987	2025-07-02 15:51:11 +02:00
Laurie Montant	578afb23ef	SCPN1-8980 (cherry picked from commit `f5971a6b06`)	2025-07-02 14:37:45 +02:00
GROUP\frea	a85eb86c99	SCPN1-8991 (cherry picked from commit `9d7293d92e`) (cherry picked from commit `fb329894cc`)	2025-07-01 15:44:15 +02:00
GROUP\frea	fb329894cc	SCPN1-8991 (cherry picked from commit `9d7293d92e`)	2025-07-01 15:43:18 +02:00
Laurie Montant	f5971a6b06	SCPN1-8980	2025-06-30 16:03:38 +02:00
Laurie Montant	4256228eb1	Modif	2025-06-25 11:00:55 +02:00
Laurie Montant	a610e0b077	modif	2025-06-24 18:10:49 +02:00
Laurie Montant	6fb9fd6685	SCPN1-8863	2025-06-24 18:04:55 +02:00
Laurie Montant	b40bde6d19	SCPN1-8863	2025-06-24 17:44:55 +02:00
Laurie Montant	cfc2c35e4f	SCPN1-8863	2025-06-24 17:22:11 +02:00
Laurie Montant	bdc59a2c20	modifs transfert	2025-06-24 10:59:07 +02:00
frea	706d1d057a	Release 2.0.4+1	2025-06-20 17:57:11 +02:00
Laurie Montant	af99f0d11f	Ajout controle	2025-06-16 11:38:53 +02:00
Laurie Montant	645a1cda86	ajout controle	2025-06-16 11:21:49 +02:00
Laurie Montant	18cecd64aa	Ajout controle	2025-06-16 11:12:20 +02:00
Laurie Montant	93db70c433	Correction syntaxe	2025-06-16 11:06:43 +02:00
Laurie Montant	0e9d31ea17	Ajout controle	2025-06-16 11:03:02 +02:00
Laurie Montant	9c27dbf768	Ajout controle	2025-06-16 10:54:19 +02:00
Laurie Montant	877e31529a	SCPN1-8871	2025-06-13 15:19:49 +02:00
Laurie Montant	6ebda9ab09	SCPN1-8871	2025-06-13 15:04:29 +02:00
Laurie Montant	54d0fc4575	SCPN1-8871	2025-06-13 11:58:42 +02:00
Laurie Montant	8d74d8f085	SCPN1-8871	2025-06-13 11:49:45 +02:00
Laurie Montant	53640ab313	SCPN1-8863	2025-06-12 13:40:35 +02:00
Laurie Montant	8d9072da4a	SCPN1-8863	2025-06-12 13:06:35 +02:00
Laurie Montant	fa17314de3	SCPN1-8863	2025-06-12 11:52:26 +02:00
Laurie Montant	b01ba5205b	SCPN1-8871	2025-06-11 15:09:44 +02:00
Laurie Montant	2abe538825	SCPN1-8871	2025-06-11 15:07:19 +02:00
Laurie Montant	f1ef756198	SCPN1-8871	2025-06-11 14:32:31 +02:00
Laurie Montant	ab6aef0026	SCPN1-8871	2025-06-11 14:15:45 +02:00
Laurie Montant	122122db8c	SCPN1-8864	2025-06-11 12:09:43 +02:00
Laurie Montant	14b8a9a534	SCPN1-8864	2025-06-11 12:00:09 +02:00
Laurie Montant	372f5d2239	SCPN1-8864	2025-06-11 09:25:28 +02:00
Laurie Montant	4c3d6fbea6	SCPN1-8871	2025-06-10 17:07:09 +02:00
Laurie Montant	5e4bcbccbe	SCPN1-8871	2025-06-10 15:49:55 +02:00
Laurie Montant	72ec763cc5	SCPN1-8871	2025-06-10 14:51:50 +02:00
Laurie Montant	a17bfd876c	SCPN1-8871	2025-06-10 14:48:31 +02:00
Laurie Montant	bbe97fba7f	SCPN1-8871	2025-06-10 14:47:59 +02:00
Laurie Montant	44830bcd10	SCPN1-8871	2025-06-10 14:34:34 +02:00
Laurie Montant	a6a42f79a6	SCPN1-8871	2025-06-10 13:29:55 +02:00
Laurie Montant	1be3af7cf1	SCPN1-8871	2025-06-10 11:50:03 +02:00
Laurie Montant	44e8afd18c	SCPN1-8871	2025-06-09 17:36:12 +02:00
Laurie Montant	236dc49de2	SCPN1-8871	2025-06-09 17:23:29 +02:00
Laurie Montant	3f916b564d	SCPN1-8871	2025-06-09 17:06:34 +02:00
Laurie Montant	5b74e7f1d3	SCPN1-8871	2025-06-09 16:56:53 +02:00
Laurie Montant	c3163e39d3	SCPN1-8871	2025-06-09 16:25:27 +02:00
Laurie Montant	34beb5fddf	SCPN1-8871	2025-06-09 16:18:40 +02:00
Laurie Montant	1d6222e6cc	SCPN1-8871	2025-06-09 15:56:49 +02:00
Laurie Montant	40f4396dfa	SCPN1-8871	2025-06-09 15:37:47 +02:00
Laurie Montant	8d453bd599	SCPN1-8871	2025-06-09 15:28:26 +02:00
Laurie Montant	6e855c31dd	SCPN1-8863	2025-06-06 17:23:27 +02:00
Laurie Montant	2e68e1e839	SCPN1-8863	2025-06-06 17:11:50 +02:00
Laurie Montant	8ea0c3a1c2	SCPN1-8863	2025-06-06 17:05:51 +02:00
Laurie Montant	6823a0aeb1	SCPN1-8863	2025-06-06 16:55:24 +02:00
Laurie Montant	fcc7d30336	SCPN1-8863	2025-06-06 16:44:41 +02:00
Laurie Montant	ca36d6688e	SCPN1-8863	2025-06-06 16:25:00 +02:00
frea	20404a16df	Release 2.0.3+1	2025-05-27 09:57:49 +02:00
Francis Reat	7d4a28d5bb	Merge branch 'SCPN1-8800-2.0' into 'release/2.0' SCPN1-8800 into release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!111	2025-05-27 07:10:46 +00:00
Laurie Montant	78642ec0d6	SCPN1-8800 (cherry picked from commit `9a7f669192`)	2025-05-26 16:59:21 +02:00
Laurie Montant	9a7f669192	SCPN1-8800	2025-05-26 10:08:22 +02:00
frea	b0e7dc18d7	SCPN1-8696	2025-05-13 10:59:34 +02:00
Laurie Montant	6b1d598a75	SCPN1-8729	2025-05-12 13:41:38 +02:00
Laurie Montant	871648ca6d	SCPN1-8728	2025-05-12 10:00:32 +02:00
Laurie Montant	003a4e1e59	SCPN1-8728	2025-05-12 09:51:54 +02:00
Laurie Montant	b7743f00fb	SCPN1-8695	2025-04-28 13:44:29 +02:00
Laurie Montant	ffad895309	SCPN1-8696	2025-04-28 13:31:39 +02:00
Cedric Rodier	c7bce6018b	clean README	2025-04-25 08:56:02 +00:00
Laurie Montant	1ced677ec6	SCPN1-8583	2025-04-24 15:48:02 +02:00
Laurie Montant	a1c4b8a4ac	Modif typologie	2025-04-15 14:29:22 +02:00
Vincent Le Maitre	b72199c8b2	Snapshot reflex-wms-connector 2.1.0-SNAPSHOT	2025-04-08 10:00:02 +02:00
@@ -1 +1 @@
 .0.2+2
 .0.7+2