Release 1.2.38+1

2025-04-11 10:38:27 +02:00
49 changed files with 196 additions and 473 deletions
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
 # Reflex Platform Core FTLs

-
+ 

 These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.

+ 

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

-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
+ 
--- a/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>
@@ -18,15 +15,14 @@
       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#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,27 +17,20 @@
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
          <#if dispute.dispute_closed == true >
-            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsaDispute_Created.ftl">
-            }
-              <#if TableReasonCode[dispute.dispute_reason_code]??>
-              ,
+            },
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
            }
-              <#else>
-                <#stop>
-              </#if>
            <#else>
-              <#stop "Reference is empty">
-            </#if>
+              <#stop>
          </#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
@@ -8,7 +8,7 @@
        },
        "ID": {
            <#if dispute.dispute_preparation??>
-               <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
                <#else>
                  <#stop "preparation order list is empty" >
@@ -21,7 +21,7 @@
        },
        "Payload": {
            <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?json_string}",
+                "Title":"${dispute.dispute_reference?trim?json_string}",
             <#else>
                "Title":"",
            </#if>
@@ -39,38 +39,29 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
-            <#-- Claim metadata inclusion  -->
-            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
-            <#-- To configure -->
-            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
            <#else>
-                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
-                    <#if dispute.dispute_reception.reception_type_code=="030">
-                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                    <#else>
-                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
-                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                        <#else>
-                            <#stop "WMS type code not supported">
-                        </#if>
-                    </#if>
+                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
+                    "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                <#else>
+                    <#stop "Type not supported" >
                </#if>
            </#if>
+             <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}"
            <#else>
                <#stop "Claim reason code not supported" >
            </#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",
@@ -32,11 +32,9 @@
         },

        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-          "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
        <#else>
          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
        </#if>
        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -54,7 +54,7 @@
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
        <#if reflexMvtStockInterface.ipg_move_type == "520" >
-          "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+          "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
        <#else>
          "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
        </#if>
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,7 +18,7 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+           <#if item.logistical_variant_list?? >
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      "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,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "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,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "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,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "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,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "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??>
@@ -46,7 +55,7 @@
                  "${depot.physical_depot_address.other_number?json_string}"
                  ],
        </#if>
-       "Typology": "TYPOLOGY_WAREHOUSE"
+       "Typology": "TYPOLOGY_UNKNOWN"
       }
  }
 ]
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -6,7 +6,6 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
-<#include "RFX_PartnerAPP_Settings.ftl">

 <#assign aDateTime = .now>

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

@@ -49,7 +54,7 @@
            <#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))>
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
               {
@@ -73,7 +78,7 @@
               "datas" :
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??>
               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
               {
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -15,7 +15,7 @@
      "ProjectID": "${projectRP}"
      },
      "ID":{
-      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
+      "RefID": "${OrderOriginReference}"
      },
    "Payload":{
      "Carrier": {
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -3,7 +3,7 @@
 [
 <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />

-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
        <#if refIDHmap?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -3,7 +3,7 @@
 [
 <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.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 && l.preparation_order_originator_reference!="") 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 packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
@@ -77,19 +77,19 @@
           "ItemID": "${preparation_line.item_code?trim?json_string}",
           "LVBranchID": "${preparation_line.item_lv_code?json_string}",

-          <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-				    <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-				    "PriorityDate": "${priority_date}",
-          <#else>
-            <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
-                "PriorityDate": "${priority_date}",
-              <#else>
-                <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+				"PriorityDate": "${priority_date}",
+             <#else>
+				<#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+					<#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
                    "PriorityDate": "${priority_date}",
-                  <#else>
-                    <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+                <#else>
+					<#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+						<#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+                        "PriorityDate": "${priority_date}",
+					<#else>
+						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
 							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
 							"PriorityDate": "${priority_date}",
 						<#else>
@@ -112,8 +112,7 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-       "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
+       "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_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -1,7 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
-<#include "RFX_PartnerAPP_Settings.ftl">
 [
 <#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
  {
@@ -9,31 +8,6 @@
    "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#switch trackingNumberSource>
-        <#case 1>
-          <#if despatched_ipg.consignment_unit_id!="">
-			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          </#if>
-        <#break>
-        <#case 2>
-          <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-          </#if>
-        <#break>
-        <#case 3>
-          <#if despatched_ipg.consignment_unit_id!="">
-            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          <#else>
-            <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-            </#if>
-          </#if>
-        <#break>
-        <#default>
      <#if despatched_ipg.consignment_unit_id!="">
 			  "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
      <#else>
@@ -43,7 +17,6 @@
          "RefID":"${despatched_ipg.hd_number}",
        </#if>
      </#if>
-        </#switch>

      "RefDate": {
              "DateTime": "${dispatched_datetime4}",
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      "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,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -31,43 +31,54 @@
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
-            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
+          <#if
+          <#-- preparation_order.address.type_code == "" &&
+          preparation_order.address.title_code == "" &&
+          preparation_order.address.first_name == "" &&
+          preparation_order.address.last_name == "" &&
+          preparation_order.address.mail_address == "" &&
+          preparation_order.address.contact_type_code == "" &&
+          preparation_order.address.mobile_phone_number == "" &&
+          preparation_order.address.land_line_phone_number == "" &&
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" &&
+          preparation_order.address.name_or_company_name == "" &&
+          preparation_order.address.additional_address_data_1 == "" &&
+          preparation_order.address.additional_address_data_2 == "" &&
+          preparation_order.address.post_code_area_name == "" &&
+          preparation_order.address.territorial_division_code == "" &&
+          preparation_order.address.postal_code == "" &&
+          preparation_order.address.iso_country_code == "">
+            "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
          <#else>
-            <#if preparation_order.address.address_type_code == "" &&
-            preparation_order.address.name_or_company_name == "" &&
-            preparation_order.address.additional_address_data_1 == "" &&
-            preparation_order.address.additional_address_data_2 == "" &&
-            preparation_order.address.post_code_area_name == "" &&
-            preparation_order.address.territorial_division_code == "" &&
-            preparation_order.address.postal_code == "" &&
-            preparation_order.address.iso_country_code == "">
-              "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
-            <#else>
-              "Actor":
-              {
-                "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-                "Address" :
-                  {
-                  "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                  "PostalCode" : "${preparation_order.address.postal_code!""}",
-                  "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                  "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                  "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
-                  }
-                    },
-                "Contact" :
-                  {
-                    "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                    "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                    "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                    "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
-                  }
-            </#if>
+            "Actor":
+             {
+              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+              "Address" :
+                {
+                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
+                 <#if isCountryCode>
+                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
+                 <#else>
+                  "CountryCode" : "",
+                 </#if>
+                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
+                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
+                 }
+                  },
+              "Contact" :
+                {
+                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
+                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
+                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
+                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                }
          </#if>
         },
-        "OrderID":"${preparation_order.originator_reference?trim?json_string}",
+
       <#if preparation_order.line_list??>
       "Lines" : [
           <#list preparation_order.line_list as preparation_order_line >
@@ -106,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>
+               "AuthorTimeZone": "${time_zone_rfx}"
             }
         }
    }
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -17,22 +17,7 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
        <#if receipt.receipt_type = "030">
-        [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
-          }
-          ]
+        <#stop "ignored message because receipt type = transfert">
        <#else>
          [
          {
@@ -61,37 +46,16 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+          <#if receipt.receipt_confirmed == "true" >
            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
-            }
-            <#else>
-              <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-            }
-          <#else>
-                <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                  }
-                <#else>
-                  <#if receipt.receipt_confirmed == "true" >
-              {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
            }
+          <#else>
+            <#if receipt.receipt_type = "030">
+              <#stop "ignored message because receipt type = transfert">
            <#else>
              {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -107,8 +71,6 @@
            }
            </#if>
          </#if>
-              </#if>
-            </#if>
        <#else>
          <#stop "Receipt reference is empty">
        </#if>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${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": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,18 +26,13 @@

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

      <#if receipt.carrier_informations.carrier_code != "">
        "Carrier":
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${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": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+         "RefID": "${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,24 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -1,98 +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) />
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-            "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-             }
-    },
-    "Payload": {
-         "CreationDateTime": {
-           "DateTime": "${receipt_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"
-             },
-        "OrderID":"${receipt.receipt_reference?trim?json_string}",
-       <#-- Header Metadata inclusion -->
-       <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-
-      "ShipFrom":
-      {
-        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-      },
-        "ShipTo"  :
-      {
-         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-      },
-      "ShipToAcked": true,
-
-      <#if receipt.carrier_informations.carrier_code != "">
-        "Carrier":
-        {
-          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-        },
-      </#if>
-
-      <#if receipt.line_list??>
-       "Lines" : [
-          <#list receipt.line_list as line>
-        {
-          "LineID": "${line.receipt_line_number}",
-          <#-- Line Metadata inclusion -->
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-          "RequestedContent":
-          {
-            "Goods":
-            {
-              "ItemID":   "${line.item_code?trim?json_string!"0"}",
-              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                   "PriorityDate": "${line_without_detail_priority_date}",
-              <#else>
-                <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_detail_priority_date}",
-                <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
-                </#if>
-              </#if>
-              <#-- Segmentation Keys inclusion -->
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-            },
-            "Quantity" :
-            {
-              "LVID":   "${quantity_in_base_lv_RP_Cst}",
-              "Value":  "${line.order_quantity_in_lv!0}"
-            }
-          }
-
-        }
-      <#sep>,</#sep>
-          </#list>
-         ],
-      </#if>
-
-         "RequestedMilestones" :
-         {
-             "RequestedDeliveryDateTime" :
-             {
-                "DateTime": "${receipt_datetime}",
-               "AuthorTimeZone": "${time_zone_rfx}"
-             }
-         }
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
-[
-  {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -1,25 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-         "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-       "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
-]
--- a/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!""}",
@@ -112,7 +105,6 @@
 				"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!""}",
@@ -58,6 +52,7 @@
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
 			   		<#--"held_for_check": "false",
+			   		"held _for_repacking": "false",
 			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
 		 		}
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -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/2
+++ b/2
@@ -1 +1 @@
-2.0.5+1
+1.2.38+1
@@ -1 +1 @@
 .0.5+1
 .2.38+1