Release 1.3.0+1

2024-03-11 17:12:46 +01:00
15 changed files with 218 additions and 206 deletions
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -12,52 +12,49 @@
      <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)>

      <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->
-
      <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>

      <#-- IPG moves translated into Stock moves -->
-         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
-            reflexMvtStockInterface.ipg_move_type == "200" ||
-            reflexMvtStockInterface.ipg_move_type == "210" ||
-            reflexMvtStockInterface.ipg_move_type == "220" ||
-            reflexMvtStockInterface.ipg_move_type == "230" ||
-            reflexMvtStockInterface.ipg_move_type == "240" ||
-            reflexMvtStockInterface.ipg_move_type == "260" ||
-            reflexMvtStockInterface.ipg_move_type == "290" ||
-            reflexMvtStockInterface.ipg_move_type == "300" ||
-            reflexMvtStockInterface.ipg_move_type == "400" ||
-            reflexMvtStockInterface.ipg_move_type == "410" ||
-            reflexMvtStockInterface.ipg_move_type == "420"
+      <#if reflexMvtStockInterface.ipg_move_type == "130" ||
+           reflexMvtStockInterface.ipg_move_type == "200" ||
+           reflexMvtStockInterface.ipg_move_type == "210" ||
+           reflexMvtStockInterface.ipg_move_type == "220" ||
+           reflexMvtStockInterface.ipg_move_type == "230" ||
+           reflexMvtStockInterface.ipg_move_type == "240" ||
+           reflexMvtStockInterface.ipg_move_type == "260" ||
+           reflexMvtStockInterface.ipg_move_type == "290" ||
+           reflexMvtStockInterface.ipg_move_type == "300" ||
+           reflexMvtStockInterface.ipg_move_type == "400" ||
+           reflexMvtStockInterface.ipg_move_type == "410" ||
+           reflexMvtStockInterface.ipg_move_type == "420"
+           >
+         [
+         {
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+           "datas" :
+              <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+
+         }
+         ]
+         <#else>
+            <#-- IPG moves translated into goods received (all type of  receipt)  -->
+            <#if reflexMvtStockInterface.ipg_move_type == "100" ||
+            reflexMvtStockInterface.ipg_move_type == "110" ||
+            reflexMvtStockInterface.ipg_move_type == "120"
            >
            [
            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
-               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
            }
            ]
-         <#else>
-            <#-- IPG moves translated into goods received (all type of  receipt)  -->
-               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
-                     reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                  [
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-                  }
-                  ]
-               <#else>
-                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                     <#-- Case of IPG move type volontarilly ignored-->
-                     <#stop " Reference receipt is empty">
-                  <#else>
-                     <#stop>
-                  </#if>
-               </#if>
+            <#else>
+               <#-- Case of IPG move type volontarilly ignored-->
+               <#stop>
+            </#if>
         </#if>
      <#else>
         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,55 +17,51 @@
      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
      [
         <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
+         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
+            }
+         <#else>
+            <#-- ** Collection started (300) and Preparation in progress (400)** -->
+            <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
+                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
               }
            <#else>
-               <#-- ** Collection started (300) and Preparation in progress (400)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
-                  }
-               <#else>
-                     <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                  <#-- ****Preparation dispatched (600)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+                       {
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                     "datas" :
+                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                     },
+                     {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                        },
+                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
+                     }
+               <#else>
+                     <#-- ****Preparation cancelled (650)**** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
                        {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                           "datas" :
-                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
                        }
                  <#else>
-                        <#-- ****Preparation cancelled (650)**** -->
-                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
-                           {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                           "datas" :
-                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
-                           }
-                     <#else>
-                           <#stop>
-                     </#if>
+                        <#stop>
                  </#if>
               </#if>
            </#if>
-         <#else>
-            <#stop "PRO reference is empty">
         </#if>
      ]
      <#break>
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -16,72 +16,75 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

-   <#if	preparationOrder.total_lv_validated !=0>
-         [
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-            },
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-            }
+<#if	preparationOrder.total_lv_validated !=0>
+	   [
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+         },
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+         }

-            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
-               }
-            </#if>
+         <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
+         ,
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+         },
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
+         }
+         </#if>
+
+          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+          <#list preparation_line.despatched_ipg_list as despatched_ipg>
+          <#if despatched_ipg.consignment_unit_id!="">
+          ,
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+          }
+         </#if>
+          <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+          ,
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+         },
+         {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+         }
+         </#if>

-            <#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 despatched_ipg.consignment_unit_id!="">
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-               }
-            </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
-               }
-            </#if>
-               </#list>
-            <#--  <#sep>,</#sep> -->
            </#list>
-         ]
-   <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
-   </#if>
+         <#--  <#sep>,</#sep> -->
+          </#list>


+       ]
+
+<#else>
+    <#stop "no confirmed quantity for the preparation - preparation closed">
+</#if>
+
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,14 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-   <#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>
+
  {
    "Header": {
    "ProjectID": "${projectRP}"
    },
    "ID":{
-    "RefID": "${OrderOriginReference}"
+    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
    },
  "Payload":{
    "Carrier": {
@@ -21,6 +20,4 @@
    </#if> -->
  }
  }
-  <#sep>,</#sep>
-   </#list>
 ]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -2,22 +2,22 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    {
+    { 
    "Header": {
-      "ProjectID": "${projectRP}"
+      "ProjectID": "${projectRP}"     
    },
    "ID": {
      "RefID": "${despatched_ipg.hd_number}",
      "RefDate": {
        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        "AuthorTimeZone": "${time_zone_rfx}"            
      }
      },
      "Payload": { }
      }<#sep>,</#sep>
      </#list>
  <#sep>,</#sep>
-  </#list>
+  </#list> 
 ]
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">

 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
    {
    "Header": {
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -0,0 +1,37 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+[
+ 
+ { 
+    "Header": {
+    "ProjectID": "${projectRP}"     
+    },
+    "ID": {
+    "RefID": "${despatched_ipg.hd_number}"
+  },
+
+ "Payload": {
+
+"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
+  <#if preparation_line.despatched_hds_list?? >
+      ,
+    "Information": {
+      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
+      "Length": {
+        "Unit": "${length_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth}
+      },
+      "Weight": {
+        "Unit": "${weight_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight}
+      },
+      "Width": {
+        "Unit": "${length_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
+      }      
+    }
+    </#if>
+
+ }
+ }
+]
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,14 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-  <#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>
+
  {
    "Header": {
    "ProjectID": "${projectRP}"
    },
    "ID":{
-    "RefID": "${OrderOriginReference}"
+    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
    },
  "Payload":{
    "Carrier": {
@@ -16,6 +15,4 @@
    }
  }
  }
-    <#sep>,</#sep>
-   </#list>
 ]
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -46,18 +46,12 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-        {
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          {
+         {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-          }
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
-        }
+         }
       ]
         <#break>

--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -45,34 +45,31 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#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>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
-            </#if>
-          </#if>
+        <#if receipt.receipt_confirmed == "true" >
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+        }
        <#else>
-          <#stop "Receipt reference is empty">
+          <#if receipt.receipt_type = "030">
+          <#stop "ignored message because receipt type = transfert">
+          <#else>
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+          },
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+          }
+        </#if>
        </#if>
       ]
      <#break>
@@ -82,17 +79,14 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          {
+         {

-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+
+         }
       ]
         <#break>

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

 <#assign eventRP = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -1,5 +1,8 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">

+<#assign aDateTime = .now>
+
+
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
@@ -15,9 +18,9 @@
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -1,5 +1,5 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-
+<#assign aDateTime = .now>
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
@@ -19,9 +19,9 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",

 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+			"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -5,10 +5,6 @@
  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>

-<#function DateTimeUTCtoRfxLocale dateutc locale >
-  <#return dateutc?datetime.iso?iso_nz(locale)>
-</#function>
-
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- Split email reflex into json array string                                               -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.15+1
+1.3.0+1
@@ -1 +1 @@
 .2.15+1
 .3.0+1