Release 2.0.4+1

SCPN1-8800 into release 2.0

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

README.md

@@ -1,20 +1,9 @@
 # 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/)

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>

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

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

RFXtoRP_HsaCarrier.ftl

@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,7 +20,7 @@
       <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
               <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -11,11 +8,7 @@
     },
     "Payload": {
       "Name": "${carrier.carrier_designation?json_string}",
-        "ManagedStock": false,
         "IsCarrier": true,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
 
     <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
 
@@ -37,7 +30,6 @@
           </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
-
         <#-- if Reflex WMS address is not structured    -->
         <#else>
           <#if  carrier.address??>

RFXtoRP_HsaCarrier_ActorDeleted.ftl

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

RFXtoRP_HsaCons.ftl

@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,12 +20,13 @@
       <#assign actor = JsonUtil.jsonToMap(dataRfx)>
       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
           <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
          }
        ]
+
       <#break>
 
       <#case "D">

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -11,18 +8,12 @@
     },
     "Payload": {
       "Name": "${actor.designation?json_string}",
-        "ManagedStock": false,
         "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
 
     <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
 
-
     "Address":
         {
-
         <#-- if Reflex WMS is structured    -->
         <#if actor.consignee_structured_address??>
 

RFXtoRP_HsaCons_ActorDeleted.ftl

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

RFXtoRP_HsaDispute.ftl

@@ -36,8 +36,7 @@
                 <#stop>
               </#if>
             <#else>
-              <#--  "Reference is empty"-->
+              <#stop "Reference is empty">
-              <#stop>
             </#if>
           </#if>
        ]

RFXtoRP_HsaDispute_ClaimMetadata.ftl

@@ -1,4 +0,0 @@
-<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
-
-
-"MetaData": [        ]

RFXtoRP_HsaDispute_Created.ftl

@@ -21,7 +21,7 @@
         },
         "Payload": {
             <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?trim?json_string}",
+                "Title":"${dispute.dispute_reference?json_string}",
              <#else>
                 "Title":"",
             </#if>
@@ -39,26 +39,31 @@
                 </#if>
                 "Value": "${dispute.dispute_amount}"
              },
-            <#-- Claim metadata inclusion  -->
-            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
             <#-- To configure -->
             <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
             <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
                 "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
             <#else>
-                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
+                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
-                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                    <#if dispute.dispute_reception.reception_type_code=="030">
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                    <#else>
+                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
+                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
                         <#else>
                             <#stop "WMS type code not supported">
                         </#if>
                     </#if>
+                </#if>
+            </#if>
 
             <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
             <#else>
-                <#stop "Reason code not supported">
+                <#stop "Claim reason code not supported" >
             </#if>
         }
     }
@@ -66,3 +71,4 @@
 
 
 
+

RFXtoRP_HsaIpgMove.ftl

@@ -57,8 +57,8 @@
                         }
                         ]
                       <#else>
-                        <#-- Case of IPG move type volontarilly ignored, Reference receipt is empty-->
+                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop >
+                        <#stop " Reference receipt is empty">
                      </#if>
                <#else>
                   <#stop>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -21,38 +21,24 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
               "PriorityDate": "${priority_date}",
            <#else>
               "PriorityDate": "1970-01-01T00:00:00Z",
             </#if>
+
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
-        <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
+
-          <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
+        <#if reflexMvtStockInterface.receipt_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
-          <#else>
-            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-              "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-            </#if>
-          </#if>
-        <#else>
-          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
           "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
         <#else>
           "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
           "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
         </#if>
-        </#if>
-        <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
-          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
-        <#else>
         "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        </#if>
         "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
         "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",

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

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

RFXtoRP_HsaProStatus.ftl

@@ -65,8 +65,7 @@
                </#if>
             </#if>
          <#else>
-         <#--PRO reference is empty-->
+            <#stop "PRO reference is empty">
-         <#stop >
          </#if>
       ]
       <#break>

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

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

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

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

RFXtoRP_HsaProStatus_PreparationExpected.ftl

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

RFXtoRP_HsaProStatus_PreparationStarted.ftl

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

RFXtoRP_HsaProStatus_TransportStarted.ftl

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

RFXtoRP_HsaSup.ftl

@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -17,7 +20,7 @@
       <#assign actor = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
           <#include "RFXtoRP_HsaSup_ActorCreated.ftl">

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
@@ -11,10 +8,7 @@
     },
     "Payload": {
       "Name": "${actor.designation?json_string}",
-        "ManagedStock": false,
         "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
 
     <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
 
@@ -22,7 +16,6 @@
          {
         <#-- if Reflex WMS address is structured    -->
         <#if actor.supplier_structured_address?? >
-
           "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
           "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
           "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
@@ -36,7 +29,6 @@
           </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
-
         <#-- if Reflex WMS address is not structured    -->
         <#else>
           <#if actor.optional_attributes?? >
@@ -47,7 +39,6 @@
             "CountryCode" : ""
           </#if>
         </#if>
-
          },
       <#if actor.optional_attributes?? >
         "Phones": ["${actor.optional_attributes.telephone?json_string}",

RFXtoRP_HsaSup_ActorDeleted.ftl

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

RFXtoRP_HsrDepot.ftl

@@ -17,7 +17,7 @@
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
               <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -11,20 +11,12 @@
     },
     "Payload": {
       "Name": "${depot.physical_depot_designation?json_string}",
-        "ManagedStock": true,
         "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
-
     <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
-
-
       "Address":
          {
         <#-- if Reflex WMS address is structured    -->
         <#if depot.physical_depot_structured_address?? >
-
           "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}",
           "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}",
           "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
@@ -38,7 +30,6 @@
           </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
-
         <#-- if Reflex WMS address is not structured    -->
         <#else>
           <#if depot.physical_depot_address??>

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

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

RFXtoRP_HsrPrepa.ftl

@@ -18,7 +18,6 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
    <#if	preparationOrder.total_lv_validated !=0>
-      <#if preparationOrder.preparation_line_lst??>
          [
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -41,12 +40,6 @@
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
                <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
                }
             </#if>
 
@@ -97,12 +90,7 @@
             <#assign refIDHmap ={}>
          ]
    <#else>
-         <#--   No line-->
+      <#stop "no confirmed quantity for the preparation - preparation closed">
-         <#stop >
-      </#if>
-   <#else>
-      <#--   no confirmed quantity for the preparation - preparation closed-->
-      <#stop >
    </#if>
 
 

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -15,7 +15,7 @@
       "ProjectID": "${projectRP}"
       },
       "ID":{
-      "RefID": "${OrderOriginReference}"
+      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
       },
     "Payload":{
       "Carrier": {

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -113,7 +113,7 @@
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
          },
        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
         <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
           "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,29 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-[
-  <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-    <#if !refIDHmap_local[OrderOriginReference]?? >
-      <#if refIDHmap_local?size != 0 >
-      ,
-      </#if>
-      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-      {
-        "Header": {
-        "ProjectID": "${projectRP}"
-        },
-        "ID":{
-        "RefID": "${OrderOriginReference}"
-        },
-      "Payload":{
-        "Carrier": {
-          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-        }
-      }
-      }
-    </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]

RFXtoRP_HsrPro.ftl

@@ -16,10 +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?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-            <#if preparation_order.line_list??>
+            <#-- Only if preparation order not confirmed  -->
+            <#if preparation_order.preparation_order_confirmed == "false" >
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -27,16 +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>
-          <#-- PRO reference is empty -->
+          <#stop "PRO reference is empty">
-          <#stop>
         </#if>
        ]
   <#break>
@@ -47,7 +49,6 @@
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          <#if preparation_order.line_list??>
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -55,12 +56,7 @@
           <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
         }
         <#else>
-            <#-- No line -->
+          <#stop "PRO reference is empty">
-            <#stop>
-          </#if>
-        <#else>
-          <#-- PRO reference is empty -->
-          <#stop>
         </#if>
        ]
          <#break>

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -9,7 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-    "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -31,17 +31,10 @@
         },
        "ShipFromAcked": true,
          "ShipTo": {
-          <#if
+          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
-          <#-- preparation_order.address.type_code == "" &&
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
-          preparation_order.address.title_code == "" &&
+          <#else>
-          preparation_order.address.first_name == "" &&
+            <#if preparation_order.address.address_type_code == "" &&
-          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,13 +50,8 @@
                 "Address" :
                   {
                   "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
+                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                 <#if isCountryCode>
+                  "PostalCode" : "${preparation_order.address.postal_code!""}",
-                 "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}"
@@ -77,8 +65,9 @@
                     "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
                   }
             </#if>
+          </#if>
          },
-        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
+        "OrderID":"${preparation_order.originator_reference?trim?json_string}",
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
@@ -117,8 +106,14 @@
           {
              "RequestedDeliveryDateTime" :
              {
+              <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
+                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
+                "DateTime": "${intermediate_delivery_start_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+              <#else>
                 "DateTime": "${planned_final_delivery_start_datetime}",
                 "AuthorTimeZone": "${time_zone_rfx}"
+              </#if>
              }
          }
     }

RFXtoRP_HsrReceiptList.ftl

@@ -16,10 +16,24 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type == "030">
+        <#if receipt.receipt_type = "030">
-          <#stop "ignored message because receipt type = transfert">
+        [
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+          }
+          ]
         <#else>
-          <#if receipt.line_list ??>
           [
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -36,14 +50,9 @@
 
           }
           ]
-          <#else>
-            <#--  No line-->
-            <#stop>
-          </#if>
         </#if>
       <#else>
-      <#--  "Receipt reference is empty"-->
+        <#stop "Receipt reference is empty">
-      <#stop>
       </#if>
       <#break>
     <#case "U">
@@ -52,6 +61,22 @@
       <#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>
+            {
+              <#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>
@@ -68,10 +93,6 @@
               <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
             }
             <#else>
-              <#if receipt.receipt_type == "030">
-                <#stop "ignored message because receipt type = transfert">
-              <#else>
-                <#if receipt.line_list ??>
               {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -84,16 +105,12 @@
               "datas" :
               <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
             }
-                <#else>
-                  <#--  No line-->
-                  <#stop>
             </#if>
           </#if>
               </#if>
             </#if>
         <#else>
-          <#-- Receipt reference is empty-->
+          <#stop "Receipt reference is empty">
-          <#stop >
         </#if>
        ]
       <#break>
@@ -104,7 +121,6 @@
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
         <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.line_list ??>
           {
 
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -113,12 +129,7 @@
             <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
           }
         <#else>
-              <#--  No line-->
+          <#stop "Receipt reference is empty">
-              <#stop>
-            </#if>
-        <#else>
-           <#-- Receipt reference is empty-->
-          <#stop >
         </#if>
        ]
          <#break>

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

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

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -9,7 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -37,6 +37,7 @@
          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
       "ShipToAcked": true,
+      "OrderID":"${receipt.receipt_reference?trim?json_string}",
 
       <#if receipt.carrier_informations.carrier_code != "">
         "Carrier":
@@ -44,7 +45,7 @@
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
-      "OrderID": "${receipt.receipt_reference?trim?json_string}",
+
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,20 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
-<#assign refIDHmap_local ={}>
 [
-  <#if receipt.line_list??>
-    <#list receipt.line_list as receipt_line >
-      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
-        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
-          <#if refIDHmap_local?size != 0 >
-          ,
-          </#if>
-          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
   {
-            "Header": {"ProjectID": "${projectRP}"},
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
     "ID": {
-                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
@@ -23,24 +16,4 @@
     "Payload": {
     }
   }
-        </#if>
-      <#else>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-        {
-          "Header": {"ProjectID": "${projectRP}"},
-          "ID": {
-              "RefID": "${receipt.receipt_reference?trim?json_string}",
-            "RefDate": {
-              "DateTime": "${receipt_status_datetime}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-            }
-          },
-          "Payload": {
-          }
-        }
-        <#break>
-        </#if>
-      </#if>
-    </#list>
-  </#if>
 ]

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

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

RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl

@@ -0,0 +1,24 @@
+<#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": {
+    }
+  }
+]

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -0,0 +1,98 @@
+<#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}"
+             }
+         }
+    }
+  }
+]

RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl

@@ -0,0 +1,23 @@
+<#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": {
+    }
+  }
+]

RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl

@@ -0,0 +1,25 @@
+<#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": {}
+
+  }
+]

RPtoRFX_ExecutionflowEvent.ftl

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

RPtoRFX_PrepOrder.ftl

@@ -17,7 +17,7 @@
 </#if>
 
 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -44,7 +44,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,13 +83,9 @@
 				<#-- ******* 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">
 				{
@@ -105,6 +100,14 @@
 				"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>

RPtoRFX_PrepOrder_HeaderMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- You can map metadata with additional information,comments... -->
 
 <#--
 <#if Header_MetaData_Map["Color"]??>

RPtoRFX_PrepOrder_LineMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- You can map metadata with additional information,comments... -->
 
 <#--
 <#if Header_MetaData_Map["Color"]??>

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

RPtoRFX_Receipt.ftl

@@ -3,7 +3,7 @@
 <#include "HfRpConfig.ftl">
 
 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -38,13 +38,9 @@
 			<#-- ******* 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">
 			{
@@ -57,9 +53,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>
 		]

RPtoRFX_Receipt_HeaderMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- You can map metadata with additional information,comments... -->
 
 <#--
 <#if Header_MetaData_Map["Color"]??>

RPtoRFX_Receipt_LineMetadata.ftl

@@ -1,5 +1,5 @@
-<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- It is possible to map metadata with additional information,comments... -->
+<#-- You can map metadata with additional information,comments... -->
 
 <#--
 <#if Header_MetaData_Map["Color"]??>

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

VERSION

@@ -1 +1 @@
-1.2.45+2
+2.0.4+1