Merge branch 'release/2.0' into 'main-2.0'

Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!190
Release 2.0.13+1
2025-12-03 09:18:55 +00:00 · 2025-12-03 10:17:44 +01:00 · 2025-11-26 08:44:03 +00:00 · 2025-11-26 09:39:50 +01:00 · 2025-11-06 10:11:10 +00:00 · 2025-11-06 11:09:15 +01:00
79 changed files with 1996 additions and 873 deletions
--- a/README.md
+++ b/README.md
@ -1,9 +1,20 @@
-# Reflex Platform Core FTLs
+# HARDIS SC NETWORK Core FTLs

+## Overview

+The **HARDIS WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from HARDIS WMS** into **flows compatible with HARDIS SC NETWORK**.

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

+## Role of the FTL Files

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

-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
+## Useful Resources
+
+- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html)
+- [HARDIS SC NETWORK](https://auth.reflex-platform.com/)
--- a/RFXtoRP_HfDtlStockLs.ftl
+++ b/RFXtoRP_HfDtlStockLs.ftl
@ -1,60 +1,60 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-<#-- sum_elt      : nb element in snapshot (optional parameter)  -->
-
-<#include "HfRpConfig.ftl">
-
-<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)>
-<#assign projectRP      = project>
-<#assign organisationRP = organisation>
-
-<#switch cloudEventMsg.action>
-    <#case "C">
-    <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)>
-
-      <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image -->
-      <#if cloudEventMsg.messageSet??>
-         <#assign idSnapshot = cloudEventMsg.messageSet />
-      <#else>
-         <#assign idSnapshot = cloudEventMsg.id />
-      </#if>
-
-        <#list reflexStockPicturesInterface.detailled_stock_list as stock>
-         <#if stock.stock_type_code != "200">
-            <#stop>
-            <#break>
-        </#if>
-      </#list>
-         [
-           {
-            <#if sum_elt??>
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted>
-             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :
-              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">
-                  <#else>
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted>
-             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :
-              <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl">
-                </#if>
-           }
-         ]
-
-      <#break>
-
-      <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop >
-      <#break>
-
-
-    <#default>
-          <#stop >
-</#switch>
-
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#-- sum_elt      : nb element in snapshot (optional parameter)  -->
+
+<#include "HfRpConfig.ftl">
+
+<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)>
+<#assign projectRP      = project>
+<#assign organisationRP = organisation>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+    <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)>
+
+      <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image -->
+      <#if cloudEventMsg.messageSet??>
+         <#assign idSnapshot = cloudEventMsg.messageSet />
+      <#else>
+         <#assign idSnapshot = cloudEventMsg.id />
+      </#if>
+
+        <#list reflexStockPicturesInterface.detailled_stock_list as stock>
+         <#if stock.stock_type_code != "200">
+            <#stop>
+            <#break>
+        </#if>
+      </#list>
+         [
+           {
+            <#if sum_elt??>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted>
+             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+             "datas" :
+              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">
+                  <#else>
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted>
+             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+             "datas" :
+              <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl">
+                </#if>
+           }
+         ]
+
+      <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop >
+      <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HfDtlStockLs to find Reflex WMS fields names  -->
+<#-- use protobuf of class HfDtlStockLs to find HARDIS WMS fields names  -->

 <#--

--- a/RFXtoRP_HfRpConfig.ftl
+++ b/RFXtoRP_HfRpConfig.ftl
@ -1,5 +1,5 @@
 <#-- ****
-Reflex WMS provides some of their environment parameters through the class HfRpConfig
+HARDIS WMS provides some of their environment parameters through the class HfRpConfig
 those parameters are stored in FTL file HfRpConfig.ftl for later use in some of the data ftl files
 *** -->

--- a/RFXtoRP_HliPrepaL.ftl
+++ b/RFXtoRP_HliPrepaL.ftl
@ -0,0 +1,103 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+<#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 preparationOrder = JsonUtil.jsonToMap(dataRfx)>
+
+   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
+         <#if preparationOrder.preparation_line_lst??>
+            [
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+               }
+               <#assign refIDHmap ={}>
+               <#assign hd_numberHmap ={}>
+               <#assign hd_numberHmapHUadded ={}>
+               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+               <#list preparation_line.despatched_ipg_list as despatched_ipg>
+               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? &&  !hd_numberHmap[despatched_ipg.carton_number]??)&& (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+                  }
+                  <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+                     <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+                     ,
+                     {
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                     "datas" :
+                     <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+                     }
+                  </#if>
+
+               </#if>
+               </#list>
+               </#list>
+               <#assign refIDHmap ={}>
+            ]
+         <#else>
+         <#--   No line-->
+         <#stop>
+      </#if>
+      <#else>
+         <#--   Preparation Type not supported-->
+         <#stop>
+      </#if>
+   <#else>
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop>
+   </#if>
+
+
+<#break>
+<#case "D">
+<#-- *********************************************** Action = DELETE ******************** -->
+<#stop>
+<#break>
+
+<#default>
+<#stop>
+</#switch>
--- a/RFXtoRP_HliReceiptLr.ftl
+++ b/RFXtoRP_HliReceiptLr.ftl
@ -0,0 +1,163 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+        <#-- *********************************************** Action = CREATE ******************** -->
+
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+            }
+          ]
+        <#else>
+          <#if receipt.line_list ??>
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl">
+
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+            }
+          ]
+          <#else>
+            <#stop>
+          </#if>
+        </#if>
+      <#break>
+    <#case "U">
+       <#-- *********************************************** Action = UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+       [
+          <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+            }
+            <#else>
+              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                }
+              <#else>
+                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                  }
+                <#else>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
+                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                    [
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
+
+                      },
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                         <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+                      }
+                    ]
+                    <#else>
+                      <#stop> <#-- Receipt reference for transfer is empty-->
+                    </#if>
+                  <#else>
+                    <#if receipt.line_list ??>
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl">
+                      },
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                      }
+                    <#else>
+                      <#stop>
+                    </#if>
+                  </#if>
+                </#if>
+              </#if>
+            </#if>
+          </#if>
+       ]
+      <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#if receipt.line_list ??>
+       [
+          {
+
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
+       ]
+       <#else>
+        <#stop> <#-- No line-->
+      </#if>
+         <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
+++ b/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
@ -0,0 +1,60 @@
+<#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": {
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefDate": {
+            "DateTime": "${receipt_creation_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+             }
+    },
+    "Payload": {
+      <#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>
+    }
+  }
+]
--- a/RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl
+++ b/RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl
@ -0,0 +1,193 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+<#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+<#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          </#if>
+        "RefDate": {
+              "DateTime": "${receipt_creation_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+      },
+      "Payload": {
+        <#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>
+      }
+    }
+    <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+              <#else>
+                "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+              </#if>
+                "RefDate": {
+                      "DateTime": "${receipt_creation_datetime}",
+                      "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+              },
+              "Payload": {
+                  "CreationDateTime": {
+                    "DateTime": "${receipt_creation_datetime}",
+                    "AuthorTimeZone": "${time_zone_rfx}"
+                    },
+                  "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}",
+                 <#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>
+              }
+            }
+            </#if>
+          <#else>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                "RefDate": {
+                      "DateTime": "${receipt_creation_datetime}",
+                      "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+              },
+              "Payload": {
+                  "CreationDateTime": {
+                    "DateTime": "${receipt_creation_datetime}",
+                    "AuthorTimeZone": "${time_zone_rfx}"
+                    },
+                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                <#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>
+              }
+            }
+              <#break>
+            </#if>
+            </#list>
+          </#if>
+        </#if>
+  ]
--- a/RFXtoRP_HlrProL.ftl
+++ b/RFXtoRP_HlrProL.ftl
@ -0,0 +1,65 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#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 preparation_order = JsonUtil.jsonToMap(dataRfx)>
+       [
+          <#-- check preparation type code (internal order and reservation are ignored)  -->
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+            <#if preparation_order.line_list??>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowLinesAdded>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl">
+            }
+            <#else>
+              <#-- No line -->
+              <#stop>
+            </#if>
+          <#else>
+          <#-- Preparation order type not supported -->
+            <#stop>
+          </#if>
+       ]
+  <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+       [
+        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
+          <#if preparation_order.line_list??>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#-- No line -->
+            <#stop>
+          </#if>
+        <#else>
+          <#-- Preparation order type not supported -->
+          <#stop>
+        </#if>
+       ]
+         <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl
+++ b/RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl
@ -0,0 +1,59 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  {
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
+    "RefDate": {
+            "DateTime": "${pro_creation_datetime}",
+           "AuthorTimeZone": "${time_zone_rfx}"
+             }
+    },
+    "Payload": {
+        <#if preparation_order.line_list??>
+       "Lines" : [
+           <#list preparation_order.line_list as preparation_order_line >
+           {
+             <#if (preparation_order_line.originator_reference_line_number!0) != 0>
+               "LineID": "${preparation_order_line.originator_reference_line_number}",
+               <#else>
+               "LineID": "${preparation_order_line.preparation_order_line_number!0}",
+                </#if>
+          <#-- Line Metadata inclusion -->
+          <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
+             "RequestedContent":
+             {
+                   "Goods":
+               {
+                  "ItemID":   "${preparation_order_line.item_code?trim?json_string!"0"}",
+                  "LVBranchID":   "${preparation_order_line.item_lv_code?json_string!"0"}",
+                  <#if (preparation_order_line.optional_attributes.forced_priority_date?length  != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)>
+                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />
+                           "PriorityDate": "${forced_priority_date}",
+                      </#if>
+              <#--  Segmentation Keys inclusion -->
+            <#include "RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl">
+               },
+               "Quantity" :
+               {
+                  "LVID":   "${quantity_in_base_lv_RP_Cst}",
+                  "Value":  "${preparation_order_line.base_lv_quantity_to_prepare!0}"
+               }
+             }
+           }<#sep>,</#sep>
+           </#list>
+         ]
+         </#if>
+    }
+  }
+]
--- a/RFXtoRP_HsaCarrier.ftl
+++ b/RFXtoRP_HsaCarrier.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@ -14,7 +14,7 @@

     "Address":
         {
-        <#-- if Reflex WMS address is structured    -->
+        <#-- if HARDIS WMS address is structured    -->
        <#if carrier.carrier_structured_address?? >

          "Name": "${carrier.carrier_structured_address.name_or_company?json_string}",
@ -30,7 +30,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    -->
+        <#-- if HARDIS WMS address is not structured    -->
        <#else>
          <#if  carrier.address??>
            "Name": "${carrier.address.company_name?json_string}",
--- a/RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaCarrier to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsaCarrier to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsaCons.ftl
+++ b/RFXtoRP_HsaCons.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@ -14,7 +14,7 @@

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

        "Name": "${actor.consignee_structured_address.name_or_company?json_string}",
@ -31,7 +31,7 @@
 			  "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}",
 			  "State": "${actor.consignee_structured_address.country_designation?json_string}"

-        <#-- if Reflex WMS is not structured    -->
+        <#-- if HARDIS WMS is not structured    -->
        <#else>
          <#if actor.address?? >

--- a/RFXtoRP_HsaCons_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated_Metadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaCons to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsaCons to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@ -17,7 +17,6 @@
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
          <#if dispute.dispute_closed == true >
-            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@ -35,9 +34,6 @@
              <#else>
                <#stop>
              </#if>
-            <#else>
-              <#stop "Reference is empty">
-            </#if>
          </#if>
       ]
  <#break>
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@ -43,17 +43,32 @@
            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
            <#-- To configure -->
            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
-            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+            <#if dispute.dispute_type_code=="050" > <#-- Preparation -->
+                <#if dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="">
+                    "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                    "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#else>
+                    "EntityID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
+                    "DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
+                </#if>
            <#else>
                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
-                    <#if dispute.dispute_reception.reception_type_code=="030">
-                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                    <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type -->
+                        <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" >
+                            "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                        <#else>
+                            <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
+                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                                "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                            <#else>
+                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                                "DisplayID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                            </#if>
+                        </#if>
                    <#else>
                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
-                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
                        <#else>
                            <#stop "WMS type code not supported">
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@ -47,7 +47,6 @@
               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                     reflexMvtStockInterface.ipg_move_type == "110" ||
                     reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                        [
                        {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@ -56,10 +55,6 @@
                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
                        }
                        ]
-                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
-                     </#if>
               <#else>
                  <#stop>
               </#if>
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@ -26,19 +26,36 @@
           <#else>
              "PriorityDate": "1970-01-01T00:00:00Z",
            </#if>
-
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-
-        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-          "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+        <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
+          <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+          <#else>
+            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+              "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            <#else>
+              "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            </#if>
+          </#if>
        <#else>
-          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          <#else>
+            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+          </#if>
+        </#if>
+        <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
+          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
+        <#else>
+          "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        </#if>
-        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
--- a/RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaIpgMove to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsaIpgMove to find HARDIS WMS fields names  -->
 <#--
 "SegmentationKeys": [
            {
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@ -18,14 +18,10 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
-        <#else>
-          <#stop "no LV for the item">
-        </#if>
         }
       ]
      <#break>
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@ -12,7 +12,7 @@
           {
          "LVID": "${lv.logistical_variant_code?json_string}",
          "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??>
+          <#if lv.id_list??  && (lv.id_list?size == lv.id_list?filter(l ->l??)?size)>
          "Codes": [
                   <#list lv.id_list as id>
                   {
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaItmLv to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsaItmLv to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@ -21,15 +21,17 @@
      },

      <#-- Item metadata inclusion -->
-      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
+      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">

      <#-- Item Photo URI could be added here -->
      <#if item.url?? && item.url!="">
-        "PhotoURI": "${item.url?json_string}",
+      ,
+        "PhotoURI": "${item.url?json_string}"
      </#if>

    <#-- Loop for the Logistical Variants - LV -->
-        <#if item.logistical_variant_list??>
+        <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+        ,
          "LogisticVariants": [

           <#list item.logistical_variant_list as logistical_variant>
@ -37,7 +39,7 @@
            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
            "Name" : "${logistical_variant.lv_type_code?json_string}",

-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
            "Codes": [
                       <#list logistical_variant.id_list as id>
                       {
--- a/RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaItm to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsaItm to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsaLstCarSta.ftl
+++ b/RFXtoRP_HsaLstCarSta.ftl
@ -1,40 +1,40 @@
-<#-- **** 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>
-
-<#stop>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE *************************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
-
-    <#default>
-          <#stop >
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
 </#switch>
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@ -17,7 +17,6 @@
      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
      [
         <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
               {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@ -64,9 +63,6 @@
                  </#if>
               </#if>
            </#if>
-         <#else>
-            <#stop "PRO reference is empty">
-         </#if>
      ]
      <#break>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@ -8,7 +8,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@ -14,7 +14,7 @@

      "Address":
         {
-        <#-- if Reflex WMS address is structured    -->
+        <#-- if HARDIS 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}",
@ -29,7 +29,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    -->
+        <#-- if HARDIS WMS address is not structured    -->
        <#else>
          <#if actor.optional_attributes?? >
            "Name": "${actor.optional_attributes.company_name?json_string}",
--- a/RFXtoRP_HsaSup_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated_Metadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsaSup to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsaSup to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@ -1,40 +1,40 @@
-<#-- **** 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>
-
-<#stop>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE *************************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
-
-    <#default>
-          <#stop >
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
 </#switch>
--- a/RFXtoRP_HsrDepot.ftl
+++ b/RFXtoRP_HsrDepot.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@ -15,7 +15,7 @@
    <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
      "Address":
         {
-        <#-- if Reflex WMS address is structured    -->
+        <#-- if HARDIS 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}",
@ -30,7 +30,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    -->
+        <#-- if HARDIS WMS address is not structured    -->
        <#else>
          <#if depot.physical_depot_address??>
          "Name": "${depot.physical_depot_address.company_name?json_string}",
--- a/RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrDepot to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsrDepot to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsrLoadInfo.ftl
+++ b/RFXtoRP_HsrLoadInfo.ftl
@ -1,40 +1,40 @@
-<#-- **** 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>
-
-<#stop>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE *************************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
-
-    <#default>
-          <#stop >
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
 </#switch>
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Branch">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for  Pack Branch">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HsrPackOrder.ftl
+++ b/RFXtoRP_HsrPackOrder.ftl
@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@ -17,80 +17,90 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

-   <#if	preparationOrder.total_lv_validated !=0>
-         [
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-            },
-            {
-
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-            }
-
-            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
-               ,
+   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
+         <#if preparationOrder.preparation_line_lst??>
+            [
               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               }
-            </#if>
-
-            <#assign refIDHmap ={}>
-            <#assign hd_numberHmap ={}>
-            <#assign hd_numberHmapHUadded ={}>
-            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
-            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-               }
-            </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
               },
               {
+
               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
               }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
-               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
-               }
-            </#if>

-            </#if>
+               <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+                  }
+               </#if>
+
+               <#assign refIDHmap ={}>
+               <#assign hd_numberHmap ={}>
+               <#assign hd_numberHmapHUadded ={}>
+               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+               <#list preparation_line.despatched_ipg_list as despatched_ipg>
+               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+                  }
+                  <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+                  <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+
+               </#if>
+                  </#list>
               </#list>
-            </#list>
-            <#assign refIDHmap ={}>
-         ]
+               <#assign refIDHmap ={}>
+            ]
+         <#else>
+         <#--   No line-->
+         <#stop>
+      </#if>
+      <#else>
+         <#--   Preparation Type not supported-->
+         <#stop>
+      </#if>
   <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop>
   </#if>


--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@ -3,8 +3,12 @@
 <#include "ActorPrefix.ftl">
 [
  <#assign refIDHmap_local ={}>
-   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+  <#list preparationOrder.preparation_line_lst as preparation_line>
+  <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+    <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}">
+  <#else>
+    <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
+  </#if>
    <#if !refIDHmap_local[OrderOriginReference]?? >
        <#if refIDHmap_local?size != 0 >
        ,
@ -15,7 +19,7 @@
      "ProjectID": "${projectRP}"
      },
      "ID":{
-      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
+        "RefID": "${OrderOriginReference}"
      },
    "Payload":{
      "Carrier": {
--- a/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsrPrepa to find HARDIS WMS fields names  -->

 <#--
 "MetaData" :[
--- a/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class Hsrprepa to find Reflex WMS fields names  -->
+<#-- use protobuf of class Hsrprepa to find HARDIS WMS fields names  -->
 <#--
 "SegmentationKeys": [
            {
--- a/RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsrPrepa to find HARDIS WMS fields names  -->

 <#--
 "MetaData" :[
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@ -3,7 +3,7 @@
 [
 <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
          <#if refIDHmap_local?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@ -2,7 +2,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
@ -112,8 +112,14 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-       "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
+      <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "OrderID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}",
+        "ExecutionflowID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}",
+      </#if>
+
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@ -53,8 +53,10 @@
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000">
      "HandlingunitID": "${despatched_ipg.carton_number}"
+      <#assign hd_numberHmap += {despatched_ipg.carton_number,despatched_ipg.carton_number}>
      <#else>
      "HandlingunitID": "${despatched_ipg.hd_number}"
+      <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
      </#if>
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
    ,
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@ -16,30 +16,23 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
          <#-- check preparation type code (internal order and reservation are ignored)  -->
          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-            <#-- Only if preparation order not confirmed  -->
-            <#if preparation_order.preparation_order_confirmed == "false" >
+            <#if preparation_order.line_list??>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
            }
-           <#else>
-           <#-- preparation order already confirmed -->
-            <#stop>
-           </#if>
-
+            <#else>
+              <#-- No line -->
+              <#stop>
+            </#if>
          <#else>
-          <#-- preparation order type not supported -->
-          <#stop>
+          <#-- Preparation order type not supported -->
+            <#stop>
          </#if>
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
       ]
  <#break>

@ -48,20 +41,24 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-        }
+        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
+          <#if preparation_order.line_list??>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#-- No line -->
+            <#stop>
+          </#if>
        <#else>
-          <#stop "PRO reference is empty">
+          <#-- Preparation order type not supported -->
+          <#stop>
        </#if>
       ]
         <#break>
-
-
    <#default>
          <#stop >
 </#switch>
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@ -9,7 +9,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@ -31,43 +35,51 @@
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
-            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
+          <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true">
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
          <#else>
-            <#if preparation_order.address.address_type_code == "" &&
-            preparation_order.address.name_or_company_name == "" &&
-            preparation_order.address.additional_address_data_1 == "" &&
-            preparation_order.address.additional_address_data_2 == "" &&
-            preparation_order.address.post_code_area_name == "" &&
-            preparation_order.address.territorial_division_code == "" &&
-            preparation_order.address.postal_code == "" &&
-            preparation_order.address.iso_country_code == "">
-              "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+            <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!="">
+              "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_code?json_string)}"
            <#else>
-              "Actor":
-              {
-                "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-                "Address" :
-                  {
-                  "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                  "PostalCode" : "${preparation_order.address.postal_code!""}",
-                  "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                  "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                  "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
-                  }
-                    },
-                "Contact" :
-                  {
-                    "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                    "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                    "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                    "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
-                  }
+              <#if preparation_order.address.address_type_code == "" &&
+              preparation_order.address.name_or_company_name == "" &&
+              preparation_order.address.additional_address_data_1 == "" &&
+              preparation_order.address.additional_address_data_2 == "" &&
+              preparation_order.address.post_code_area_name == "" &&
+              preparation_order.address.territorial_division_code == "" &&
+              preparation_order.address.postal_code == "" &&
+              preparation_order.address.iso_country_code == "">
+                "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+              <#else>
+                "Actor":
+                {
+                  "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+                  "Address" :
+                    {
+                    "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                    "CountryCode" : "${preparation_order.address.iso_country_code!""}",
+                    "PostalCode" : "${preparation_order.address.postal_code!""}",
+                    "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                    "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                    "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
+                    }
+                      },
+                  "Contact" :
+                    {
+                      "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
+                      "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
+                      "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
+                      "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                    }
+              </#if>
            </#if>
          </#if>
-         },
-        "OrderID":"${preparation_order.originator_reference?trim?json_string}",
+          },
+        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          "OrderID": "${preparation_order.originator_reference?trim?json_string}",
+        <#else>
+          "OrderID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        </#if>
       <#if preparation_order.line_list??>
       "Lines" : [
           <#list preparation_order.line_list as preparation_order_line >
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrPro to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->

 <#-- 

--- a/RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrPro to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrPro to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsrPro to find HARDIS WMS fields names  -->
 <#--

 "SegmentationKeys": [
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@ -15,103 +15,126 @@

      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type = "030">
-        [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">

-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">

-          }
+            }
          ]
        <#else>
+          <#if receipt.line_list ??>
          [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">

-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">

-          }
+            }
          ]
+          <#else>
+            <#stop>
+          </#if>
        </#if>
-      <#else>
-        <#stop "Receipt reference is empty">
-      </#if>
      <#break>
    <#case "U">
       <#-- *********************************************** Action = UPDATE ******************** -->
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+          <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
            }
-            <#else>
-              <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
+          <#else>
+            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
            }
-          <#else>
-                <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                  }
-                <#else>
-                  <#if receipt.receipt_confirmed == "true" >
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-            }
            <#else>
-              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
-            </#if>
-          </#if>
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                }
+              <#else>
+                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                  }
+                <#else>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
+                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                    [
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+                      },
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+                      }
+                    ]
+                    <#else>
+                      <#stop> <#-- Receipt reference for transfer is empty-->
+                    </#if>
+                  <#else>
+                    <#if receipt.line_list ??>
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                      },
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                      }
+                    <#else>
+                      <#stop>
+                    </#if>
+                  </#if>
+                </#if>
              </#if>
            </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
+          </#if>
       ]
      <#break>

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

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


--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@ -37,8 +37,11 @@
         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
      },
      "ShipToAcked": true,
-      "OrderID":"${receipt.receipt_reference?trim?json_string}",
-
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID":"R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      </#if>
      <#if receipt.carrier_informations.carrier_code != "">
        "Carrier":
        {
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrReceiptList to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names  -->

 <#-- 

--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrReceiptList to find Reflex Wms fields names  -->
+<#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names  -->


 "MetaData": [        ]
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl
@ -1,4 +1,4 @@
-<#-- use protobuf of class HsrReceiptList to find Reflex WMS fields names  -->
+<#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names  -->

 <#--
 "SegmentationKeys": [
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@ -8,8 +8,8 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-       "RefDate": {
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
      }
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@ -1,24 +1,67 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${receipt_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+      "Payload": {
      }
-    },
-    "Payload": {
-    }
  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                 <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#else>
+                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+            "RefDate": {
+            "DateTime": "${receipt_status_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
 ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@ -1,98 +1,277 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
+<#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+<#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-            "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-             }
-    },
-    "Payload": {
-         "CreationDateTime": {
-           "DateTime": "${receipt_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"
-             },
-        "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)}"
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+          <#else>
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+          </#if>
+        "RefDate": {
+              "DateTime": "${receipt_creation_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
      },
-        "ShipTo"  :
-      {
-         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-      },
-      "ShipToAcked": true,
-
-      <#if receipt.carrier_informations.carrier_code != "">
-        "Carrier":
+      "Payload": {
+        "CreationDateTime": {
+          "DateTime": "${receipt_creation_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+          },
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "OrderID": "${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+        </#if>
+        <#-- Header Metadata inclusion -->
+        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
+        "ShipFrom":
        {
-          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+          "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
        },
-      </#if>
-
-      <#if receipt.line_list??>
-       "Lines" : [
-          <#list receipt.line_list as line>
+          "ShipTo"  :
        {
-          "LineID": "${line.receipt_line_number}",
-          <#-- Line Metadata inclusion -->
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-          "RequestedContent":
+          "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+        },
+        "ShipToAcked": true,
+        <#if receipt.carrier_informations.carrier_code != "">
+          "Carrier":
          {
-            "Goods":
+            "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+          },
+        </#if>
+        <#if receipt.line_list??>
+        "Lines" : [
+            <#list receipt.line_list as line>
+          {
+            "LineID": "${line.receipt_line_number}",
+            <#-- Line Metadata inclusion -->
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
+            "RequestedContent":
            {
-              "ItemID":   "${line.item_code?trim?json_string!"0"}",
-              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                   "PriorityDate": "${line_without_detail_priority_date}",
-              <#else>
-                <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_detail_priority_date}",
+              "Goods":
+              {
+                "ItemID":   "${line.item_code?trim?json_string!"0"}",
+                "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
+                <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${line_without_detail_priority_date}",
                <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
+                  <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                      <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                      "PriorityDate": "${line_detail_priority_date}",
+                  <#else>
+                      "PriorityDate": "1970-01-01T00:00:00Z",
+                  </#if>
                </#if>
-              </#if>
-              <#-- Segmentation Keys inclusion -->
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-            },
-            "Quantity" :
-            {
-              "LVID":   "${quantity_in_base_lv_RP_Cst}",
-              "Value":  "${line.order_quantity_in_lv!0}"
+                <#-- Segmentation Keys inclusion -->
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
+              },
+              "Quantity" :
+              {
+                "LVID":   "${quantity_in_base_lv_RP_Cst}",
+                "Value":  "${line.order_quantity_in_lv!0}"
+              }
            }
          }
-
-        }
-      <#sep>,</#sep>
-          </#list>
-         ],
-      </#if>
-
-         "RequestedMilestones" :
-         {
-             "RequestedDeliveryDateTime" :
-             {
-                "DateTime": "${receipt_datetime}",
-               "AuthorTimeZone": "${time_zone_rfx}"
-             }
-         }
+        <#sep>,</#sep>
+            </#list>
+          ],
+        </#if>
+          "RequestedMilestones" :
+          {
+              "RequestedDeliveryDateTime" :
+              {
+                  "DateTime": "${receipt_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          }
+      }
    }
-  }
-]
+    <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+              <#else>
+                "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+              </#if>
+                "RefDate": {
+                      "DateTime": "${receipt_creation_datetime}",
+                      "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+              },
+              "Payload": {
+                  "CreationDateTime": {
+                    "DateTime": "${receipt_creation_datetime}",
+                    "AuthorTimeZone": "${time_zone_rfx}"
+                    },
+                  "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#-- Header Metadata inclusion -->
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
+                "ShipFrom":
+                {
+                  "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+                },
+                  "ShipTo"  :
+                {
+                  "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+                },
+                "ShipToAcked": true,
+                <#if receipt.carrier_informations.carrier_code != "">
+                  "Carrier":
+                  {
+                    "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+                  },
+                </#if>
+                <#if receipt.line_list??>
+                "Lines" : [
+                    <#list receipt.line_list as line>
+                  {
+                    "LineID": "${line.receipt_line_number}",
+                    <#-- Line Metadata inclusion -->
+                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
+                    "RequestedContent":
+                    {
+                      "Goods":
+                      {
+                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
+                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
+                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                            "PriorityDate": "${line_without_detail_priority_date}",
+                        <#else>
+                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                              "PriorityDate": "${line_detail_priority_date}",
+                          <#else>
+                              "PriorityDate": "1970-01-01T00:00:00Z",
+                          </#if>
+                        </#if>
+                        <#-- Segmentation Keys inclusion -->
+                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
+                      },
+                      "Quantity" :
+                      {
+                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
+                        "Value":  "${line.order_quantity_in_lv!0}"
+                      }
+                    }
+                  }
+                <#sep>,</#sep>
+                    </#list>
+                  ],
+                </#if>
+                  "RequestedMilestones" :
+                  {
+                      "RequestedDeliveryDateTime" :
+                      {
+                          "DateTime": "${receipt_datetime}",
+                        "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+                  }
+              }
+            }
+            </#if>
+          <#else>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                  "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                "RefDate": {
+                      "DateTime": "${receipt_creation_datetime}",
+                      "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+              },
+              "Payload": {
+                  "CreationDateTime": {
+                    "DateTime": "${receipt_creation_datetime}",
+                    "AuthorTimeZone": "${time_zone_rfx}"
+                    },
+                  "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+                <#-- Header Metadata inclusion -->
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
+                "ShipFrom":
+                {
+                  "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+                },
+                  "ShipTo"  :
+                {
+                  "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+                },
+                "ShipToAcked": true,
+                <#if receipt.carrier_informations.carrier_code != "">
+                  "Carrier":
+                  {
+                    "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+                  },
+                </#if>
+                <#if receipt.line_list??>
+                "Lines" : [
+                    <#list receipt.line_list as line>
+                  {
+                    "LineID": "${line.receipt_line_number}",
+                    <#-- Line Metadata inclusion -->
+                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
+                    "RequestedContent":
+                    {
+                      "Goods":
+                      {
+                        "ItemID":   "${line.item_code?trim?json_string!"0"}",
+                        "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
+                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                            "PriorityDate": "${line_without_detail_priority_date}",
+                        <#else>
+                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                              "PriorityDate": "${line_detail_priority_date}",
+                          <#else>
+                              "PriorityDate": "1970-01-01T00:00:00Z",
+                          </#if>
+                        </#if>
+                        <#-- Segmentation Keys inclusion -->
+                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
+                      },
+                      "Quantity" :
+                      {
+                        "LVID":   "${quantity_in_base_lv_RP_Cst}",
+                        "Value":  "${line.order_quantity_in_lv!0}"
+                      }
+                    }
+                  }
+                <#sep>,</#sep>
+                    </#list>
+                  ],
+                </#if>
+                  "RequestedMilestones" :
+                  {
+                      "RequestedDeliveryDateTime" :
+                      {
+                          "DateTime": "${receipt_datetime}",
+                        "AuthorTimeZone": "${time_zone_rfx}"
+                      }
+                  }
+              }
+            }
+              <#break>
+            </#if>
+            </#list>
+          </#if>
+        </#if>
+  ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@ -1,23 +1,67 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${receipt_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+      "Payload": {
      }
-    },
-    "Payload": {
-    }
  }
-]
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#else>
+                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@ -1,25 +1,67 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-         "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-       "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${receipt_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+      "Payload": {
      }
-    },
-
-    "Payload": {}
-
  }
-]
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#else>
+                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]
--- a/RFXtoRP_Receipt_ExecutionflowDeleted.ftl
+++ b/RFXtoRP_Receipt_ExecutionflowDeleted.ftl
@ -0,0 +1,11 @@
+[
+	{
+	  "Header": {
+	    "ProjectID": "${projectRP}"
+	  },
+	  "ID": {
+	       "RefID": "${id.refid?json_string}"
+	  },
+	  "Payload": {}
+	}
+]
--- a/RFXtoRP_Receipt_ShipToAcked.ftl
+++ b/RFXtoRP_Receipt_ShipToAcked.ftl
@ -1,15 +0,0 @@
-[
-	{ 
-	  "Header": {
-	    "ProjectID": "${projectRP}"	   
-	  },
-	  "ID": {
-	       "RefID": "${id.refid?json_string}"
-	  },
-	   
-	  "Payload": {
-	     "ShipToAcked": true
-	  }
-	   
-	}
-]
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@ -1,206 +1,206 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : Response message from Reflex  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign restResponsetMsg = JsonUtil.jsonToMap(input)>
-<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id!"{}")>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-
-<#assign aDateTime = .now>
-<#assign no_apiRestReflexID = "no apiRestReflexID"> 
-<#assign no_status = -99999> 
-
-
-<#switch id.apiRestReflexID!no_apiRestReflexID>
-	 <#case no_apiRestReflexID>
-	   [
-		   {
-			 <#if restResponsetMsg.body?? >
-			   <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-			 <#else>
-			   <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-			 </#if>
-			 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-			 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-			 "datas" :
-				<#include "RFXtoRP_PlatformLogCreate.ftl">
-		   }
-	   ]
-	   <#break>
-				   
-	  <#case "preparation_orders_post">
-			 <#switch restResponsetMsg.status!no_status>
-			     <#case no_status>
-				   [
-					   {
-					     <#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   }
-				   ]
-				   <#break>
-				   
-	             <#case 200>
-	             <#case 201>
-					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
-					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
-					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
-						[
-						   {
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :
-								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-						   }
-					   ]
-					<#else>
-						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
-							[
-							{
-								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-								"datas" :
-									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-							}
-							]
-				  		 <#else>
-						[
-							{
-								<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-								<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-								"datas" :
-									<#include "RFXtoRP_PlatformLogCreate.ftl">
-							},
-							{
-								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-								"datas" :
-									<#include "RFXtoRP_RestResponseAllocationError.ftl">
-							}
-						]
-				   		</#if>
-				   </#if>
-				   <#break>
-	           <#default>
-				   [
-					   {
-					     <#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   }
-				   ]
-               </#switch>
-			   <#break>
-
-    	<#case "receipts_post">
-			 <#switch restResponsetMsg.status!no_status>
-			     <#case no_status>
-				   [
-					   {
-					     <#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   }
-				   ]
-				   <#break>
-				   
-	             <#case 200>
-	             <#case 201>
-					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
-					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
-					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
-					   [
-						   {
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
-							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :
-								<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
-						   }
-					   ]
-					<#else>
-					   [
-						   {
-						     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :
-								<#include "RFXtoRP_PlatformLogCreate.ftl">
-						   },
-						   {
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   		}
-					   ]
-
-			   		</#if>
-			   		<#break>
-	           <#default>
-				   [
-					   {
-						<#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   }
-				   ]
-               </#switch>
-		       <#break>
-	  <#default>
-	        <#stop>
-</#switch>
-
+<#-- **** input parameters  ***** -->
+<#-- input        : Response message from HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign restResponsetMsg = JsonUtil.jsonToMap(input)>
+<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id!"{}")>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+
+<#assign aDateTime = .now>
+<#assign no_apiRestReflexID = "no apiRestReflexID">
+<#assign no_status = -99999>
+
+
+<#switch id.apiRestReflexID!no_apiRestReflexID>
+	 <#case no_apiRestReflexID>
+	   [
+		   {
+			 <#if restResponsetMsg.body?? >
+			   <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+			 <#else>
+			   <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+			 </#if>
+			 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+			 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+			 "datas" :
+				<#include "RFXtoRP_PlatformLogCreate.ftl">
+		   }
+	   ]
+	   <#break>
+
+	  <#case "preparation_orders_post">
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+				   <#break>
+
+	             <#case 200>
+	             <#case 201>
+					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
+					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
+					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+						[
+						   {
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							 "datas" :
+								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+						   }
+					   ]
+					<#else>
+						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
+							[
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+							}
+							]
+				  		 <#else>
+						[
+							{
+								<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PlatformLogCreate.ftl">
+							},
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_RestResponseAllocationError.ftl">
+							}
+						]
+				   		</#if>
+				   </#if>
+				   <#break>
+	           <#default>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+               </#switch>
+			   <#break>
+
+    	<#case "receipts_post">
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+				   <#break>
+
+	             <#case 200>
+	             <#case 201>
+					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
+					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
+					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+					   [
+						   {
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							 "datas" :
+								<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
+						   }
+					   ]
+					<#else>
+					   [
+						   {
+						     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							 "datas" :
+								<#include "RFXtoRP_PlatformLogCreate.ftl">
+						   },
+						   {
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							"datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   		}
+					   ]
+
+			   		</#if>
+			   		<#break>
+	           <#default>
+				   [
+					   {
+						<#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+               </#switch>
+		       <#break>
+	  <#default>
+	        <#stop>
+</#switch>
+
--- a/RP_connector.ftl
+++ b/RP_connector.ftl
@ -14,9 +14,9 @@ those parameters are stored in FTL file Conf-connector.ftl for later use in some

 <#noparse><#-- Possible values for SupplyOfTheTrackingNumber parameter : --></#noparse>
 <#noparse><#-- 0 : Always empty --></#noparse>
-<#noparse><#-- 1 : Always use Reflex WMS tracking --></#noparse>
+<#noparse><#-- 1 : Always use HARDIS WMS tracking --></#noparse>
 <#noparse><#-- 2 : Always use the HU number --></#noparse>
-<#noparse><#-- 3 : Use Reflex tracking if it exists, the HU number otherwise --></#noparse>
+<#noparse><#-- 3 : Use HARDIS WMS tracking if it exists, the HU number otherwise --></#noparse>

 <#list file.parameters as parameter>
 <#switch parameter.type>
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">

@ -17,6 +17,7 @@

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

--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@ -7,8 +7,8 @@
 <#assign titlecode ="1">
 <#assign contacttypecode ="010">
 <#assign adresstypecode ="010">
-<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans Reflex WMS pour utiliser cette fonctionnalité -->
-<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
+<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans HARDIS WMS pour utiliser cette fonctionnalité -->
+<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in HARDIS WMS to use this feature -->
 <#assign defaultactor ="VIZ">
 <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
 	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
@ -96,7 +96,7 @@
 				{
 				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_code": "${line.RequestedContent.Goods.ItemID?json_string!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
 				"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code_to_prepare" :"${owner_code_to_prepare}",
@ -105,14 +105,6 @@
 				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
-				<#--
-				"stock_reservation": "false",
-				"forced_priority_date_min_lead_time": "false",
-				"temp_substitution_possible": "false",
-				"substitution_possible": "false"
-				-->
-
-
 				}
 			<#sep>,</#sep>
 			</#list>
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@ -50,22 +50,16 @@
 			{
 				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_code": "${line.RequestedContent.Goods.ItemID?json_string!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
-			   		"hold_code": "false", -->
+					<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
 					"hold_for_specific_code": "false"
-		 		}
-		  		<#--"quality_control_attributes": {
-	        		"qcf_to_create_for_receipt_line": "false",
-	         		"exclude_item_from_inspection": "false"
-  				} -->
-
+				}
 			}<#sep>,</#sep>
 		</#list>
 		]
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@ -14,4 +14,4 @@
               }
            ]
      </#if>,
-->
+-->
--- a/RPtoRFX_Receipt_OptionalAttributes.ftl
+++ b/RPtoRFX_Receipt_OptionalAttributes.ftl
@ -0,0 +1,16 @@
+<#-- Here are the fields that can be added
+ "batch_2": "string",
+"batch_3": "string",
+"anticipated_receipt_line_activity_code": "str",
+"anticipated_receipt_line_physical_depot_code": "str",
+"anticipated_receipt_line_originator_code": "string",
+"anticipated_receipt_reference": "string",
+"anticipated_receipt_planned_date": "0000-00-00",
+"anticipated_receipt_reference_line_no": 999999,
+"reservation_consignee_code": "string",
+"reservation_consignee_group_code": "string",
+"pro_reservation_reference": "string",
+"held_for_check": "false",
+"held_for_repacking": "false",
+"hold_code": "str"
+-->
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@ -1,5 +1,5 @@
 <#-- --------------------------------------------------------------------------------------- -->
-<#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
+<#-- Concat HARDIS WMS timestamp with HARDIS WMS time zone and format this date in ISO UTC format -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
@ -10,21 +10,21 @@
 </#function>

 <#-- --------------------------------------------------------------------------------------- -->
-<#-- Split email reflex into json array string                                               -->
+<#-- Split email HARDIS WMS into json array string                                           -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->
 <#--  return "["john.doe@hardis-group.com","name@hardis-group.com"]"                         -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
 <#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
-<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
-<#if str != "[">
-<#local str += ",">
-</#if>
-<#local str += "\"">
-<#local str += email>
-<#local str += "\"">
-</#if>
+  <#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
+    <#if str != "[">
+    <#local str += ",">
+    </#if>
+    <#local str += "\"">
+    <#local str += email>
+    <#local str += "\"">
+  </#if>
 </#list>
 <#local str += "]">
 <#return (str)>
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.5+1
+2.0.13+1
Author	SHA1	Message	Date
Francis Reat	7246a2a117	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!190	2025-12-03 09:18:55 +00:00
Francis Reat	ad040f82d0	Release 2.0.13+1	2025-12-03 10:17:44 +01:00
Francis Reat	a9aac3269e	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!186	2025-11-26 08:44:03 +00:00
Francis Reat	979b90fdb3	Release 2.0.12+1	2025-11-26 09:39:50 +01:00
Francis Reat	ec844cbe49	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!159	2025-11-06 10:11:10 +00:00
Francis Reat	ab9e892640	Release 2.0.11+1	2025-11-06 11:09:15 +01:00
Francis Reat	39c8280fa4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!157	2025-11-04 09:35:47 +00:00
Francis Reat	00f34c1bc2	Release 2.0.10+2	2025-11-04 10:31:20 +01:00
Francis Reat	0406c9b8cc	Merge branch 'release2.0-SCPN1-9601' into 'release/2.0' release 2.0 SCPN1-9601 See merge request r-d-technique/tiers/reflex-wms-connector!156	2025-11-04 09:28:21 +00:00
Laurie Montant	ceb33abfca	SCPN1-9601 (cherry picked from commit 9214df8b96ef9f8864bae3d7ab49ca4fdc6f6c43)	2025-11-04 10:22:37 +01:00
Francis Reat	7cbc5111e9	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!155	2025-10-29 09:49:58 +00:00
Francis Reat	9521679a8d	Release 2.0.10+1	2025-10-29 10:48:35 +01:00
Francis Reat	0d3b459386	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!152	2025-10-24 08:41:23 +00:00
Francis Reat	3dfb366ac7	Release 2.0.9+1	2025-10-24 10:38:43 +02:00
Francis Reat	5b6d3749bc	Merge branch 'release2.0-SCPN1-9399' into 'release/2.0' SCPN1-9399 to release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!147	2025-10-24 08:34:57 +00:00
Laurie Montant	cc7da39c20	json_string order (cherry picked from commit d116ab3856fd765f1f1f5588a6b2b2ecf5cde0a1)	2025-10-22 17:02:03 +02:00
Francis Reat	18473a26a1	SCPN1-9399	2025-10-22 16:14:56 +02:00
Francis Reat	ebd45f67bc	SCPN1-9399	2025-10-22 14:56:11 +02:00
Francis Reat	d4bca7fabc	Merge branch 'release/2.0' into release2.0-SCPN1-9399	2025-10-21 18:16:12 +02:00
Francis Reat	c93657a95f	SCPN1-9399	2025-10-21 16:19:01 +02:00
Francis Reat	01b70e6bb2	SCPN1-9399 (cherry picked from commit f8c4e5d79dd5276f04ee743298c14e5b9c23654c)	2025-10-21 16:14:38 +02:00
Laurie Montant	498e9ab448	Coorection HliPrepaL (cherry picked from commit 4f8317f007e3538622b4a2f78c59cd26fb0e0b28)	2025-10-21 16:14:27 +02:00
Laurie Montant	9d7b3ec2f1	readme (cherry picked from commit 039e984ec05f6b57a4d3b4fd51180b1a3fd5c0b3)	2025-10-21 16:14:14 +02:00
Francis Reat	4f7255d9e8	nouvelle marque (cherry picked from commit eafbf7a6e32423b13609e55e72592fbaabf092f3)	2025-10-21 16:13:46 +02:00
Francis Reat	71fdf435bd	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!151	2025-10-16 13:50:08 +00:00
Francis Reat	0336a69c3a	Release 2.0.8+4	2025-10-16 15:47:04 +02:00
Francis Reat	42cf113e71	Merge branch 'release-2.0-SCPN1-9437' into 'release/2.0' SCPN1-9437 to release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!148	2025-10-16 13:39:30 +00:00
Laurie Montant	30c48670c3	SCPN1-9437 (cherry picked from commit 791a958b4d2a0d1a0fc5ebeb9535207d1d2177af)	2025-10-16 15:05:23 +02:00
Laurie Montant	794d9a3b69	SCPN1-9437 (cherry picked from commit 5bdd9fbfe16fdbf65dd018a643e69adece90546a)	2025-10-16 15:05:10 +02:00
Laurie Montant	549767f035	SCPN1-9437 (cherry picked from commit 93a0fbd79c9f5a0db9b5f2513819d209fee99f3a)	2025-10-16 15:04:55 +02:00
Laurie Montant	91916d9100	SCPN1-9437 (cherry picked from commit ae27efacf30349388d5d913cd11bceeed2b951e1)	2025-10-16 15:04:43 +02:00
GROUP\frea	dd3fb8c1a9	SCPN1-9094 (cherry picked from commit 8ca640ca383f3e43385e70ed28ee7d6bd004d347)	2025-10-08 09:29:28 +02:00
GROUP\frea	3525d80390	SCPN1-9094 (cherry picked from commit 4129dfdd5817f3513c68427a679a0a2968604b86)	2025-10-08 09:29:17 +02:00
Francis Reat	7f55b4f86a	Merge branch 'release/2.0' into 'main-2.0' Release 2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!142	2025-09-26 07:24:15 +00:00
frea	b29f28997a	Release 2.0.8+3	2025-09-26 09:23:02 +02:00
Francis Reat	fc18c04521	Merge branch 'SCPN1-9348-2.0' into 'release/2.0' SCPN1-9348-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!141	2025-09-26 07:12:06 +00:00
GROUP\frea	f4b0561643	SCPN1-9348 (cherry picked from commit a6628be34ea6a0a3bd9e0063fe13df8c29c99f58)	2025-09-25 16:31:24 +02:00
Francis Reat	ca5ba7c103	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!139	2025-09-24 08:25:40 +00:00
frea	12e157078c	Release 2.0.8+2	2025-09-24 10:22:52 +02:00
Francis Reat	ac7936a675	Merge branch 'SCPN1-9338' into 'release/2.0' SCPN1-9338 See merge request r-d-technique/tiers/reflex-wms-connector!138	2025-09-24 08:20:38 +00:00
Laurie Montant	36804fef81	Correction transfert (cherry picked from commit 4fd4007794f1ef0e98bad7d3a8d38dd33cdbd238)	2025-09-24 10:13:06 +02:00
Francis Reat	7e054d70d2	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!135	2025-09-09 07:31:32 +00:00
frea	c1023741bb	Release 2.0.8+1	2025-09-09 09:25:04 +02:00
Francis Reat	db40be98f4	Merge branch 'SCPN1-9296-2.0' into 'release/2.0' SCPN1-9296-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!133	2025-09-09 07:22:15 +00:00
Laurie Montant	6b7592559b	Correction list (cherry picked from commit 9b07206cf465356b47fa437c997672ce4f8f8789)	2025-09-09 08:59:50 +02:00
Laurie Montant	9db774f2b1	Renotified (cherry picked from commit 8d4721576fda47a1023ba24a67a56c212a1c082d)	2025-09-08 18:02:24 +02:00
Francis Reat	75ab1602d4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!131	2025-09-08 08:57:49 +00:00
frea	8cb5f4d0b5	Release 2.0.7+2	2025-09-08 10:43:06 +02:00
Francis Reat	75f791bf62	Merge branch 'SCPN1-9288-2.0' into 'release/2.0' SCPN1-9288 See merge request r-d-technique/tiers/reflex-wms-connector!129	2025-09-08 08:38:13 +00:00
Laurie Montant	aab63ed3ee	Corrections 250908 (cherry picked from commit 6b0d53926f50d20d832a574f9065fab25430f022)	2025-09-08 10:31:29 +02:00
Francis Reat	831e6f098b	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!127	2025-08-26 14:41:50 +00:00
frea	3c579500ef	Release 2.0.7+1	2025-08-26 16:23:14 +02:00
Francis Reat	c04c8c581f	Merge branch 'v11-connector-2.0' into 'release/2.0' v11-connector-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!124	2025-08-26 13:56:52 +00:00
GROUP\frea	7cdacb981b	Merge branch 'develop' into v11-connector-2.0 # Conflicts: # README.md # RFXtoRP_HsrReceiptList.ftl # RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl # RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl # RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl # RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl # RPtoRFX_PrepOrder.ftl # RPtoRFX_Receipt_LineMetadata.ftl # VERSION	2025-08-26 15:41:00 +02:00
Vincent Le Maitre	18adbf609d	Release 2.0.6+1	2025-08-26 11:03:29 +02:00
Laurie Montant	9a456ac412	modif hsaipgmove receipt number line	2025-08-25 16:47:37 +02:00
Laurie Montant	cb8f9d84b2	readme	2025-08-07 16:38:25 +02:00
Laurie Montant	f6fb052e8c	Modif OptionalAttributes	2025-08-07 11:03:45 +02:00
Laurie Montant	828fe74f5b	controle line-list	2025-08-06 11:03:31 +02:00
Laurie Montant	fa59170f4d	Controle line_list	2025-08-06 10:12:28 +02:00
Laurie Montant	db7d673b07	ajout controle	2025-08-05 17:19:51 +02:00
Laurie Montant	92b4f80170	Modif	2025-08-05 17:10:28 +02:00
Laurie Montant	5063703e56	Enlever un controle sur le D transfert	2025-08-05 16:43:20 +02:00
Laurie Montant	544cecb4f2	Modif RPtoRFX	2025-08-05 13:54:38 +02:00
Laurie Montant	06bd2c2520	SCPN1-9104	2025-07-22 11:39:19 +02:00
Laurie Montant	c4d328235f	SCPN1-9104	2025-07-22 11:36:46 +02:00
Laurie Montant	6adc190531	SCPN1-9104	2025-07-22 11:33:16 +02:00
Laurie Montant	4419794595	SCPN1-9104	2025-07-22 11:30:28 +02:00
Laurie Montant	2544ee3983	SCPN1-9104	2025-07-22 11:26:53 +02:00
Laurie Montant	3e978f8d75	SCPN1-9104	2025-07-22 11:20:18 +02:00
Laurie Montant	bef91763b1	SCPN1-9104	2025-07-22 11:11:07 +02:00
Laurie Montant	f7ff9071af	SCPN1-9104	2025-07-22 11:03:32 +02:00
Laurie Montant	0f5052308b	SCPN1-9104	2025-07-22 10:38:18 +02:00
Laurie Montant	842bdac857	SCPN1-9104	2025-07-22 10:23:40 +02:00
Laurie Montant	974cb0a3d4	supression commentaire	2025-07-18 17:02:50 +02:00
GROUP\frea	3d2670b9a2	SCPN1-9084	2025-07-15 14:57:59 +02:00
Laurie Montant	43855289ed	hsadispute	2025-07-11 16:56:56 +02:00
Laurie Montant	25044dca56	hsadispute	2025-07-11 16:52:38 +02:00
Laurie Montant	7f6442450b	hsadispute	2025-07-11 15:58:42 +02:00
Laurie Montant	9d6fabef0b	hsadispute	2025-07-11 15:26:33 +02:00
Laurie Montant	577d5272e9	hsadispute	2025-07-11 15:19:18 +02:00
Laurie Montant	42fd531289	Hsadispute	2025-07-11 14:49:09 +02:00
Laurie Montant	bc7b677ada	modif hsaipgmove	2025-07-10 12:00:51 +02:00
Laurie Montant	f829fa6310	modif réception	2025-07-10 11:57:52 +02:00
Laurie Montant	d9445d9ad5	modif	2025-07-10 11:39:46 +02:00
Francis Reat	19de302683	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!123	2025-07-10 09:36:18 +00:00
Laurie Montant	a605e98ccd	modif hsadispute created	2025-07-10 11:04:16 +02:00
Laurie Montant	804ceb25f3	Modif Réception	2025-07-10 10:33:34 +02:00
GROUP\frea	17184ed314	SCPN1-9059	2025-07-10 09:55:20 +02:00
Laurie Montant	a60c20d707	SCPN1-8871	2025-07-09 16:42:20 +02:00
Laurie Montant	da69788478	SCPN1-9059	2025-07-09 15:10:20 +02:00
Laurie Montant	5d7427b0a0	SCPN1-9059	2025-07-09 15:00:03 +02:00
Laurie Montant	94e988ac56	Modif hsaIpgMove	2025-07-08 17:22:01 +02:00
Laurie Montant	a5e4cad965	Modif HsrPro Detected	2025-07-08 17:06:42 +02:00
Laurie Montant	c33c54ed92	Modif HsrPrepa Carrier Updated	2025-07-08 16:55:20 +02:00
Laurie Montant	03ca7d0ef7	modif Hsrprepa Carrier Updated	2025-07-08 16:53:43 +02:00
Laurie Montant	4ffaf0ec73	SCPN1-8871	2025-07-03 15:09:53 +02:00
GROUP\frea	bcd2d995c2	SCPN1-8987	2025-07-02 15:51:11 +02:00
GROUP\frea	a85eb86c99	SCPN1-8991 (cherry picked from commit 9d7293d92eb9f4b07886ab11f7ed59a2a6f7aaa1) (cherry picked from commit fb329894ccf8e618135eea2c9ca9f13c87316ec0)	2025-07-01 15:44:15 +02:00
Laurie Montant	f5971a6b06	SCPN1-8980	2025-06-30 16:03:38 +02:00
Laurie Montant	4256228eb1	Modif	2025-06-25 11:00:55 +02:00
Laurie Montant	a610e0b077	modif	2025-06-24 18:10:49 +02:00
Laurie Montant	6fb9fd6685	SCPN1-8863	2025-06-24 18:04:55 +02:00
Laurie Montant	b40bde6d19	SCPN1-8863	2025-06-24 17:44:55 +02:00
Laurie Montant	cfc2c35e4f	SCPN1-8863	2025-06-24 17:22:11 +02:00
Laurie Montant	bdc59a2c20	modifs transfert	2025-06-24 10:59:07 +02:00
Francis Reat	6d4e2d5949	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!115	2025-06-20 15:59:43 +00:00
Laurie Montant	af99f0d11f	Ajout controle	2025-06-16 11:38:53 +02:00
Laurie Montant	645a1cda86	ajout controle	2025-06-16 11:21:49 +02:00
Laurie Montant	18cecd64aa	Ajout controle	2025-06-16 11:12:20 +02:00
Laurie Montant	93db70c433	Correction syntaxe	2025-06-16 11:06:43 +02:00
Laurie Montant	0e9d31ea17	Ajout controle	2025-06-16 11:03:02 +02:00
Laurie Montant	9c27dbf768	Ajout controle	2025-06-16 10:54:19 +02:00
Laurie Montant	877e31529a	SCPN1-8871	2025-06-13 15:19:49 +02:00
Laurie Montant	6ebda9ab09	SCPN1-8871	2025-06-13 15:04:29 +02:00
Laurie Montant	54d0fc4575	SCPN1-8871	2025-06-13 11:58:42 +02:00
Laurie Montant	8d74d8f085	SCPN1-8871	2025-06-13 11:49:45 +02:00
Laurie Montant	53640ab313	SCPN1-8863	2025-06-12 13:40:35 +02:00
Laurie Montant	8d9072da4a	SCPN1-8863	2025-06-12 13:06:35 +02:00
Laurie Montant	fa17314de3	SCPN1-8863	2025-06-12 11:52:26 +02:00
Laurie Montant	b01ba5205b	SCPN1-8871	2025-06-11 15:09:44 +02:00
Laurie Montant	2abe538825	SCPN1-8871	2025-06-11 15:07:19 +02:00
Laurie Montant	f1ef756198	SCPN1-8871	2025-06-11 14:32:31 +02:00
Laurie Montant	ab6aef0026	SCPN1-8871	2025-06-11 14:15:45 +02:00
Laurie Montant	122122db8c	SCPN1-8864	2025-06-11 12:09:43 +02:00
Laurie Montant	14b8a9a534	SCPN1-8864	2025-06-11 12:00:09 +02:00
Laurie Montant	372f5d2239	SCPN1-8864	2025-06-11 09:25:28 +02:00
Laurie Montant	4c3d6fbea6	SCPN1-8871	2025-06-10 17:07:09 +02:00
Laurie Montant	5e4bcbccbe	SCPN1-8871	2025-06-10 15:49:55 +02:00
Laurie Montant	72ec763cc5	SCPN1-8871	2025-06-10 14:51:50 +02:00
Laurie Montant	a17bfd876c	SCPN1-8871	2025-06-10 14:48:31 +02:00
Laurie Montant	bbe97fba7f	SCPN1-8871	2025-06-10 14:47:59 +02:00
Laurie Montant	44830bcd10	SCPN1-8871	2025-06-10 14:34:34 +02:00
Laurie Montant	a6a42f79a6	SCPN1-8871	2025-06-10 13:29:55 +02:00
Laurie Montant	1be3af7cf1	SCPN1-8871	2025-06-10 11:50:03 +02:00
Laurie Montant	44e8afd18c	SCPN1-8871	2025-06-09 17:36:12 +02:00
Laurie Montant	236dc49de2	SCPN1-8871	2025-06-09 17:23:29 +02:00
Laurie Montant	3f916b564d	SCPN1-8871	2025-06-09 17:06:34 +02:00
Laurie Montant	5b74e7f1d3	SCPN1-8871	2025-06-09 16:56:53 +02:00
Laurie Montant	c3163e39d3	SCPN1-8871	2025-06-09 16:25:27 +02:00
Laurie Montant	34beb5fddf	SCPN1-8871	2025-06-09 16:18:40 +02:00
Laurie Montant	1d6222e6cc	SCPN1-8871	2025-06-09 15:56:49 +02:00
Laurie Montant	40f4396dfa	SCPN1-8871	2025-06-09 15:37:47 +02:00
Laurie Montant	8d453bd599	SCPN1-8871	2025-06-09 15:28:26 +02:00
Laurie Montant	6e855c31dd	SCPN1-8863	2025-06-06 17:23:27 +02:00
Laurie Montant	2e68e1e839	SCPN1-8863	2025-06-06 17:11:50 +02:00
Laurie Montant	8ea0c3a1c2	SCPN1-8863	2025-06-06 17:05:51 +02:00
Laurie Montant	6823a0aeb1	SCPN1-8863	2025-06-06 16:55:24 +02:00
Laurie Montant	fcc7d30336	SCPN1-8863	2025-06-06 16:44:41 +02:00
Laurie Montant	ca36d6688e	SCPN1-8863	2025-06-06 16:25:00 +02:00
Francis Reat	4d0382970f	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!113	2025-05-27 08:00:16 +00:00
Laurie Montant	9a7f669192	SCPN1-8800	2025-05-26 10:08:22 +02:00
Francis Reat	218cf62dae	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!109	2025-05-13 12:53:01 +00:00
frea	b0e7dc18d7	SCPN1-8696	2025-05-13 10:59:34 +02:00
Laurie Montant	6b1d598a75	SCPN1-8729	2025-05-12 13:41:38 +02:00
Laurie Montant	871648ca6d	SCPN1-8728	2025-05-12 10:00:32 +02:00
Laurie Montant	003a4e1e59	SCPN1-8728	2025-05-12 09:51:54 +02:00
Laurie Montant	b7743f00fb	SCPN1-8695	2025-04-28 13:44:29 +02:00
Laurie Montant	ffad895309	SCPN1-8696	2025-04-28 13:31:39 +02:00
Cedric Rodier	c7bce6018b	clean README	2025-04-25 08:56:02 +00:00
Cedric Rodier	6ed0f8e9da	Merge branch 'release/2.0' into 'main' MR->Main See merge request r-d-technique/tiers/reflex-wms-connector!104	2025-04-24 15:04:25 +00:00
Laurie Montant	1ced677ec6	SCPN1-8583	2025-04-24 15:48:02 +02:00
Laurie Montant	a1c4b8a4ac	Modif typologie	2025-04-15 14:29:22 +02:00
Vincent Le Maitre	b72199c8b2	Snapshot reflex-wms-connector 2.1.0-SNAPSHOT	2025-04-08 10:00:02 +02:00
 @ -1 +1 @@
 .0.5+1
 .0.13+1