Release 1.2.38+2

Merge branch 'to-v10-connector1.2' into 'release/1.2'
update FTL See merge request r-d-technique/tiers/reflex-wms-connector!100
2025-04-15 18:32:12 +02:00 · 2025-04-15 16:24:24 +00:00 · 2025-04-15 18:15:06 +02:00 · 2025-04-11 10:38:27 +02:00
59 changed files with 349 additions and 1175 deletions
--- a/README.md
+++ b/README.md
@@ -1,20 +1,11 @@
 # Reflex Platform Core FTLs

-## Overview

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

-This connector does not contain any standalone executable code: it is intended to be used by **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
+These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.

-## Role of the FTL Files

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

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

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

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,7 +17,7 @@
      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
@@ -8,7 +11,11 @@
    },
    "Payload": {
      "Name": "${carrier.carrier_designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": true,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+

    <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,

@@ -30,6 +37,7 @@
          </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
+
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if  carrier.address??>
--- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaCons.ftl
+++ b/RFXtoRP_HsaCons.ftl
@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">

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

      <#case "D">
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
@@ -8,12 +11,18 @@
    },
    "Payload": {
      "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+

    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,

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

--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -17,6 +17,7 @@
      <#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}",
@@ -34,6 +35,9 @@
            <#else>
                <#stop>
              </#if>
+            <#else>
+              <#stop "Reference is empty">
+            </#if>
          </#if>
       ]
  <#break>
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -1,4 +0,0 @@
-<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
-
-
-"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -21,7 +21,7 @@
        },
        "Payload": {
            <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?json_string}",
+                "Title":"${dispute.dispute_reference?trim?json_string}",
             <#else>
                "Title":"",
            </#if>
@@ -39,48 +39,24 @@
                </#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" > <#-- 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}",
+            <#if dispute.dispute_type_code=="050" >
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
            <#else>
-                    "EntityID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
-                    "DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
-                </#if>
-            <#else>
-                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
-                    <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type -->
-                        <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" >
-                            "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                        <#else>
-                            <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
-                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                                "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                            <#else>
-                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                                "DisplayID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                            </#if>
-                        </#if>
-                    <#else>
-                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
-                            "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
-                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
+                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
                <#else>
                    <#stop "WMS type code not supported">
                </#if>
            </#if>
-                </#if>
-            </#if>

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
            <#else>
-                <#stop "Claim reason code not supported" >
+                <#stop "Reason code not supported">
            </#if>
        }
    }
@@ -88,4 +64,3 @@



-
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -47,6 +47,7 @@
               <#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>
@@ -55,6 +56,10 @@
                        <#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
@@ -21,7 +21,7 @@
       "Goods": {
           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
+           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
              "PriorityDate": "${priority_date}",
           <#else>
              "PriorityDate": "1970-01-01T00:00:00Z",
@@ -29,33 +29,14 @@
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-        <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
-          <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.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}",
+        <#if reflexMvtStockInterface.receipt_reference!="">
+          "ExecutionflowID": "${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}",
+          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
        </#if>
-          </#if>
-        <#else>
-          <#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>
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,14 +18,13 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+           <#if item.logistical_variant_list?? >
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
        <#else>
-          <#--  "no LV for the item"-->
-          <#stop>
+          <#stop "no LV for the item">
        </#if>
         }
       ]
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@@ -12,7 +12,7 @@
           {
          "LVID": "${lv.logistical_variant_code?json_string}",
          "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??  && (lv.id_list?size == lv.id_list?filter(l ->l??)?size)>
+          <#if lv.id_list??>
          "Codes": [
                   <#list lv.id_list as id>
                   {
--- 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?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
+              <#if logistical_variant.id_list??>
            "Codes": [
                       <#list logistical_variant.id_list as id>
                       {
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,6 +17,7 @@
      <#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>
@@ -63,6 +64,9 @@
                  </#if>
               </#if>
            </#if>
+         <#else>
+            <#stop "PRO reference is empty">
+         </#if>
      ]
      <#break>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -8,11 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -7,11 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,11 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,11 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,11 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaSup.ftl
+++ b/RFXtoRP_HsaSup.ftl
@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,7 +17,7 @@
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
@@ -8,7 +11,10 @@
    },
    "Payload": {
      "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->

    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,

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

-   <#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??>
+   <#if	preparationOrder.total_lv_validated !=0>
         [
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -42,13 +40,19 @@
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
               }
            </#if>

            <#assign refIDHmap ={}>
            <#assign hd_numberHmap ={}>
            <#assign hd_numberHmapHUadded ={}>
-               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+            <#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))>
@@ -92,16 +96,7 @@
            <#assign refIDHmap ={}>
         ]
   <#else>
-         <#--   No line-->
-         <#stop>
-      </#if>
-      <#else>
-         <#--   Preparation Type not supported-->
-         <#stop>
-      </#if>
-   <#else>
-      <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop>
+      <#stop "no confirmed quantity for the preparation - preparation closed">
   </#if>


--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -3,12 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
  <#assign refIDHmap_local ={}>
-  <#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>
+   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
    <#if !refIDHmap_local[OrderOriginReference]?? >
        <#if refIDHmap_local?size != 0 >
        ,
--- 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) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
          <#if refIDHmap_local?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -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 ) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
@@ -112,14 +112,8 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-      <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
         "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        "ExecutionflowID": "${preparation_line.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>
-
+       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -0,0 +1,29 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  <#assign refIDHmap_local ={}>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+  <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+    ,
+    </#if>
+    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      }
+    }
+    }
+  </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
+]
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,9 +16,12 @@
      <#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">
-            <#if preparation_order.line_list??>
+            <#-- Only if preparation order not confirmed  -->
+            <#if preparation_order.preparation_order_confirmed == "false" >
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -26,12 +29,16 @@
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
            }
           <#else>
-              <#-- No line -->
+           <#-- preparation order already confirmed -->
+            <#stop>
+           </#if>
+
+          <#else>
+          <#-- preparation order type not supported -->
          <#stop>
          </#if>
        <#else>
-          <#-- Preparation order type not supported -->
-            <#stop>
+          <#stop "PRO reference is empty">
        </#if>
       ]
  <#break>
@@ -41,8 +48,7 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
-          <#if preparation_order.line_list??>
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
        {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -50,15 +56,12 @@
          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
        }
        <#else>
-            <#-- No line -->
-            <#stop>
-          </#if>
-        <#else>
-          <#-- Preparation order type not supported -->
-          <#stop>
+          <#stop "PRO reference is empty">
        </#if>
       ]
         <#break>
+
+
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,11 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -9,11 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#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>
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -35,13 +31,17 @@
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#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.preparation_type_code == "030">
-              "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
-            <#else>
-              <#if preparation_order.address.address_type_code == "" &&
+          <#if
+          <#-- preparation_order.address.type_code == "" &&
+          preparation_order.address.title_code == "" &&
+          preparation_order.address.first_name == "" &&
+          preparation_order.address.last_name == "" &&
+          preparation_order.address.mail_address == "" &&
+          preparation_order.address.contact_type_code == "" &&
+          preparation_order.address.mobile_phone_number == "" &&
+          preparation_order.address.land_line_phone_number == "" &&
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" &&
          preparation_order.address.name_or_company_name == "" &&
          preparation_order.address.additional_address_data_1 == "" &&
          preparation_order.address.additional_address_data_2 == "" &&
@@ -57,8 +57,13 @@
              "Address" :
                {
                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                    "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                    "PostalCode" : "${preparation_order.address.postal_code!""}",
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
+                 <#if isCountryCode>
+                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
+                 <#else>
+                  "CountryCode" : "",
+                 </#if>
+                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
@@ -72,14 +77,8 @@
                  "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>
         },
-        <#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 >
@@ -118,14 +117,8 @@
          {
             "RequestedDeliveryDateTime" :
             {
-              <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
-                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
-                "DateTime": "${intermediate_delivery_start_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-              <#else>
                "DateTime": "${planned_final_delivery_start_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
-              </#if>
             }
         }
    }
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,25 +15,10 @@

      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-        <#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">
-
-            }
-          ]
+      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
+        <#if receipt.receipt_type = "030">
+        <#stop "ignored message because receipt type = transfert">
        <#else>
-          <#if receipt.line_list ??>
          [
          {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -50,9 +35,9 @@

          }
          ]
-          <#else>
-            <#stop>
        </#if>
+      <#else>
+        <#stop "Receipt reference is empty">
      </#if>
      <#break>
    <#case "U">
@@ -60,31 +45,8 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
-          <#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?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-            }
-            <#else>
-              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                }
-              <#else>
-                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.receipt_confirmed == "true" >
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -92,29 +54,9 @@
              <#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">
-
-                      }
-                    ]
+            <#if receipt.receipt_type = "030">
+              <#stop "ignored message because receipt type = transfert">
            <#else>
-                      <#stop> <#-- Receipt reference for transfer is empty-->
-                    </#if>
-                  <#else>
-                    <#if receipt.line_list ??>
              {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -127,13 +69,10 @@
              "datas" :
              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
            }
+            </#if>
+          </#if>
        <#else>
-                      <#stop>
-                    </#if>
-                  </#if>
-                </#if>
-              </#if>
-            </#if>
+          <#stop "Receipt reference is empty">
        </#if>
       ]
      <#break>
@@ -142,8 +81,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>
@@ -151,10 +90,10 @@
            "datas" :
            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
          }
-       ]
        <#else>
-        <#stop> <#-- No line-->
+          <#stop "Receipt reference is empty">
        </#if>
+       ]
         <#break>


--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,22 +26,14 @@

      "ShipFrom":
      {
-        <#if receipt.receipt_type == '020'>
-          "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
-        <#else>
        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-        </#if>
      },
        "ShipTo"  :
      {
         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
      },
      "ShipToAcked": true,
-      <#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": "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}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+         "RefID": "${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -1,67 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        </#if>
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-  }
-  <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                 <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                </#if>
-                "RefDate": {
-                "DateTime": "${receipt_status_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-                }
-            },
-              "Payload": {
-              }
-            }
-          </#if>
-        <#else>
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-            "RefDate": {
-            "DateTime": "${receipt_status_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-          <#break>
-        </#if>
-      </#list>
-    </#if>
-  </#if>
-]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -1,277 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-<#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-<#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-          <#else>
-            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-          </#if>
-        "RefDate": {
-              "DateTime": "${receipt_creation_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-      },
-      "Payload": {
-        "CreationDateTime": {
-          "DateTime": "${receipt_creation_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-          },
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "OrderID": "${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-        </#if>
-        <#-- Header Metadata inclusion -->
-        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-        "ShipFrom":
-        {
-          "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-        },
-          "ShipTo"  :
-        {
-          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-        },
-        "ShipToAcked": true,
-        <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier":
-          {
-            "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-          },
-        </#if>
-        <#if receipt.line_list??>
-        "Lines" : [
-            <#list receipt.line_list as line>
-          {
-            "LineID": "${line.receipt_line_number}",
-            <#-- Line Metadata inclusion -->
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-            "RequestedContent":
-            {
-              "Goods":
-              {
-                "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_without_detail_priority_date}",
-                <#else>
-                  <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                      <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                      "PriorityDate": "${line_detail_priority_date}",
-                  <#else>
-                      "PriorityDate": "1970-01-01T00:00:00Z",
-                  </#if>
-                </#if>
-                <#-- Segmentation Keys inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-              },
-              "Quantity" :
-              {
-                "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                "Value":  "${line.order_quantity_in_lv!0}"
-              }
-            }
-          }
-        <#sep>,</#sep>
-            </#list>
-          ],
-        </#if>
-          "RequestedMilestones" :
-          {
-              "RequestedDeliveryDateTime" :
-              {
-                  "DateTime": "${receipt_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-              }
-          }
-      }
-    }
-    <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-              <#else>
-                "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-              </#if>
-                "RefDate": {
-                      "DateTime": "${receipt_creation_datetime}",
-                      "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-              },
-              "Payload": {
-                  "CreationDateTime": {
-                    "DateTime": "${receipt_creation_datetime}",
-                    "AuthorTimeZone": "${time_zone_rfx}"
-                    },
-                  "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#-- Header Metadata inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-                "ShipFrom":
-                {
-                  "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-                },
-                  "ShipTo"  :
-                {
-                  "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-                },
-                "ShipToAcked": true,
-                <#if receipt.carrier_informations.carrier_code != "">
-                  "Carrier":
-                  {
-                    "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-                  },
-                </#if>
-                <#if receipt.line_list??>
-                "Lines" : [
-                    <#list receipt.line_list as line>
-                  {
-                    "LineID": "${line.receipt_line_number}",
-                    <#-- Line Metadata inclusion -->
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-                    "RequestedContent":
-                    {
-                      "Goods":
-                      {
-                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                            "PriorityDate": "${line_without_detail_priority_date}",
-                        <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                              "PriorityDate": "${line_detail_priority_date}",
-                          <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
-                          </#if>
-                        </#if>
-                        <#-- Segmentation Keys inclusion -->
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-                      },
-                      "Quantity" :
-                      {
-                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                        "Value":  "${line.order_quantity_in_lv!0}"
-                      }
-                    }
-                  }
-                <#sep>,</#sep>
-                    </#list>
-                  ],
-                </#if>
-                  "RequestedMilestones" :
-                  {
-                      "RequestedDeliveryDateTime" :
-                      {
-                          "DateTime": "${receipt_datetime}",
-                        "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-                  }
-              }
-            }
-            </#if>
-          <#else>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-                "RefDate": {
-                      "DateTime": "${receipt_creation_datetime}",
-                      "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-              },
-              "Payload": {
-                  "CreationDateTime": {
-                    "DateTime": "${receipt_creation_datetime}",
-                    "AuthorTimeZone": "${time_zone_rfx}"
-                    },
-                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-                <#-- Header Metadata inclusion -->
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-                "ShipFrom":
-                {
-                  "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-                },
-                  "ShipTo"  :
-                {
-                  "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-                },
-                "ShipToAcked": true,
-                <#if receipt.carrier_informations.carrier_code != "">
-                  "Carrier":
-                  {
-                    "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-                  },
-                </#if>
-                <#if receipt.line_list??>
-                "Lines" : [
-                    <#list receipt.line_list as line>
-                  {
-                    "LineID": "${line.receipt_line_number}",
-                    <#-- Line Metadata inclusion -->
-                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-                    "RequestedContent":
-                    {
-                      "Goods":
-                      {
-                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
-                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                            "PriorityDate": "${line_without_detail_priority_date}",
-                        <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                              "PriorityDate": "${line_detail_priority_date}",
-                          <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
-                          </#if>
-                        </#if>
-                        <#-- Segmentation Keys inclusion -->
-                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-                      },
-                      "Quantity" :
-                      {
-                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                        "Value":  "${line.order_quantity_in_lv!0}"
-                      }
-                    }
-                  }
-                <#sep>,</#sep>
-                    </#list>
-                  ],
-                </#if>
-                  "RequestedMilestones" :
-                  {
-                      "RequestedDeliveryDateTime" :
-                      {
-                          "DateTime": "${receipt_datetime}",
-                        "AuthorTimeZone": "${time_zone_rfx}"
-                      }
-                  }
-              }
-            }
-              <#break>
-            </#if>
-            </#list>
-          </#if>
-        </#if>
-  ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -1,67 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        </#if>
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-  }
-  <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                </#if>
-                "RefDate": {
-                "DateTime": "${receipt_status_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-                }
-            },
-              "Payload": {
-              }
-            }
-          </#if>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-          <#break>
-        </#if>
-      </#list>
-    </#if>
-  </#if>
-]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -1,67 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
-[
-  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        <#else>
-          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-        </#if>
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-  }
-  <#else>
-    <#if receipt.line_list??>
-      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-            <#if refIDHmap_local?size != 0 >
-            ,
-            </#if>
-            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
-            {
-              "Header": {"ProjectID": "${projectRP}"},
-              "ID": {
-                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                <#else>
-                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
-                </#if>
-                "RefDate": {
-                "DateTime": "${receipt_status_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-                }
-            },
-              "Payload": {
-              }
-            }
-          </#if>
-        <#else>
-          {
-            "Header": {"ProjectID": "${projectRP}"},
-            "ID": {
-              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-              "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-              }
-            },
-            "Payload": {
-            }
-          }
-          <#break>
-        </#if>
-      </#list>
-    </#if>
-  </#if>
-]
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -17,7 +17,6 @@

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

--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -17,7 +17,7 @@
 </#if>

 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -27,7 +27,6 @@
 	},
 	"payload" :
 	 {
-		<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
 		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
@@ -44,7 +43,6 @@
        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
-			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
@@ -84,17 +82,12 @@
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-				<#else>
-				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-				<#else>
-				<#assign SegmentationKeys_Map = {} />
 				</#if>
 				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 				{
-				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -105,6 +98,13 @@
 				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
+				<#--
+				"stock_reservation": "false",
+				"forced_priority_date_min_lead_time": "false",
+				"temp_substitution_possible": "false",
+				"substitution_possible": "false"
+				-->
+
 				}
 			<#sep>,</#sep>
 			</#list>
--- a/RPtoRFX_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_PrepOrder_LineMetadata.ftl
+++ b/RPtoRFX_PrepOrder_LineMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_PrepOrder_OptionalAttributes.ftl
+++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl
@@ -1,8 +0,0 @@
-<#-- Here are the fields that can be added
-"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
-"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
-"reason_code": "str",
-"planned_preparation_date": "0000-00-00",
-"despatch_grouping": "string",
-"reservation_end_datetime": "0000-00-00T00:00:00",
-->
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -3,7 +3,7 @@
 <#include "HfRpConfig.ftl">

 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -13,7 +13,6 @@
 	},
 	"payload" :
 	 {
-		<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
 		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}",
@@ -38,17 +37,12 @@
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-				<#else>
-				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-				<#else>
-				<#assign SegmentationKeys_Map = {} />
 				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
 			{
-				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -57,9 +51,15 @@
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-					<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
+			   		<#--"held_for_check": "false",
+			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
 		 		}
+		  		<#--"quality_control_attributes": {
+	        		"qcf_to_create_for_receipt_line": "false",
+	         		"exclude_item_from_inspection": "false"
+  				} -->
+
 			}<#sep>,</#sep>
 		</#list>
 		]
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@@ -1,17 +0,0 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
-
-<#--
-<#if Header_MetaData_Map["Color"]??>
-      <#assign COLOR = Header_MetaData_Map["Color"].String/>
-      <#if COLOR??>
-         ,
-         "additional_data_value_list":
-            [
-               {
-                  "code": "Color",
-                  "value": "${COLOR}"
-               }
-            ]
-      </#if>,
-->
--- a/RPtoRFX_Receipt_OptionalAttributes.ftl
+++ b/RPtoRFX_Receipt_OptionalAttributes.ftl
@@ -1,16 +0,0 @@
-<#-- Here are the fields that can be added
- "batch_2": "string",
-"batch_3": "string",
-"anticipated_receipt_line_activity_code": "str",
-"anticipated_receipt_line_physical_depot_code": "str",
-"anticipated_receipt_line_originator_code": "string",
-"anticipated_receipt_reference": "string",
-"anticipated_receipt_planned_date": "0000-00-00",
-"anticipated_receipt_reference_line_no": 999999,
-"reservation_consignee_code": "string",
-"reservation_consignee_group_code": "string",
-"pro_reservation_reference": "string",
-"held_for_check": "false",
-"held_for_repacking": "false",
-"hold_code": "str"
-->
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.8+2
+1.2.38+2
Author	SHA1	Message	Date
freat	29e4acfca4	Release 1.2.38+2	2025-04-15 18:32:12 +02:00
Francis Reat	aa68eb52e9	Merge branch 'to-v10-connector1.2' into 'release/1.2' update FTL See merge request r-d-technique/tiers/reflex-wms-connector!100	2025-04-15 16:24:24 +00:00
frea	320bd8988b	update FTL	2025-04-15 18:15:06 +02:00
freat	1905105118	Release 1.2.38+1	2025-04-11 10:38:27 +02:00
@@ -1 +1 @@
 .0.8+2
 .2.38+2