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

Release/1.2 to main1.2 See merge request r-d-technique/tiers/reflex-wms-connector!191
Release 1.2.50+1
2025-12-03 09:20:38 +00:00 · 2025-12-03 10:17:01 +01:00 · 2025-11-26 08:43:12 +00:00 · 2025-11-26 09:37:05 +01:00 · 2025-11-06 10:10:42 +00:00 · 2025-11-06 11:09:50 +01:00
81 changed files with 1175 additions and 419 deletions
--- a/README.md
+++ b/README.md
@ -1,11 +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 **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.

- 
+## Role of the FTL Files

-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/
+- 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.
+
+## 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,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  -->
 <#-- sum_elt      : nb element in snapshot (optional parameter)  -->

 <#include "HfRpConfig.ftl">
--- 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,101 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.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 !=0>
+      <#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?? && 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]?? || !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>
+      <#--   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,125 @@
+<#-- **** 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 == "030">
+          <#stop "ignored message because receipt type = transfert">
+        <#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>
+            <#--  No line-->
+            <#stop>
+          </#if>
+      </#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_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  }
+          <#else>
+            <#if receipt.receipt_confirmed == "true" >
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
+            <#else>
+              <#if receipt.receipt_type == "030">
+                <#stop "ignored message because receipt type = transfert">
+              <#else>
+                <#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>
+                  <#--  No line-->
+                  <#stop>
+                </#if>
+              </#if>
+            </#if>
+          </#if>
+        <#else>
+          <#-- Receipt reference is empty-->
+          <#stop >
+        </#if>
+       ]
+      <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+       [
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.line_list ??>
+            {
+
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+            }
+            <#else>
+              <#--  No line-->
+              <#stop>
+            </#if>
+        <#else>
+           <#-- Receipt reference is empty-->
+          <#stop >
+        </#if>
+       ]
+         <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
+++ b/RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl
@ -0,0 +1,64 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  {
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+     "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "RefID": "${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_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>
+    }
+  }
+]
--- a/RFXtoRP_HlrProL.ftl
+++ b/RFXtoRP_HlrProL.ftl
@ -0,0 +1,72 @@
+<#-- **** 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)>
+       [
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          <#-- check preparation type code (internal order and reservation are ignored)  -->
+          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
+            <#if preparation_order.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>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
+        </#if>
+       ]
+  <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+       [
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          <#if preparation_order.line_list??>
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#-- No line -->
+            <#stop>
+          </#if>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
+        </#if>
+       ]
+         <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl
+++ b/RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl
@ -0,0 +1,55 @@
+<#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": {
+    "RefID": "${preparation_order.originator_reference?trim?json_string}",
+    "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_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@ -21,7 +21,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}",
@ -38,7 +38,7 @@
 			    "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  -->

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@ -23,7 +23,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}",
@ -40,7 +40,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>
@ -16,13 +16,16 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
-          <#if dispute.dispute_closed == true >
+           <#if dispute.dispute_closed == true >
+            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsaDispute_Created.ftl">
-            },
+            }
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+              ,
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@ -30,7 +33,12 @@
              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
            }
            <#else>
+                <#stop>
+              </#if>
+            <#else>
+              <#--  "Reference is empty"-->
              <#stop>
+            </#if>
          </#if>
       ]
  <#break>
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@ -0,0 +1,4 @@
+<#-- use protobuf of class HsaDispute to find HARDIS WMS fields names  -->
+
+
+"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@ -39,29 +39,30 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
+            <#-- Claim metadata inclusion  -->
+            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
+            <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
            <#if dispute.dispute_type_code=="050" >
-                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
-                  "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                <#else>
-                  <#stop "preparation order list is empty" >
-                </#if>
+                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
            <#else>
                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
-                    "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
                <#else>
-                    <#stop "Type not supported" >
+                    <#stop "WMS type code not supported">
                </#if>
            </#if>
-             <#-- To configure -->
-            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
            <#else>
-                <#stop "Claim reason code not supported" >
+                <#stop "Reason code not supported">
            </#if>
-
-
        }
    }
 ]
+
+
+
--- 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,17 +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.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.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.receipt_reference?trim?json_string}",
+              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            <#else>
+              "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "${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}",
+          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          <#else>
+            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "${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}",
@ -47,4 +66,4 @@
    }
  }

-]
+]
--- a/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived_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  -->

 <#--

--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@ -54,7 +54,7 @@
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
        <#if reflexMvtStockInterface.ipg_move_type == "520" >
-          "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+          "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
        <#else>
          "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
        </#if>
--- a/RFXtoRP_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": [
            {
@ -15,22 +15,22 @@
                  "Value": { "String" : "no batch"}
                <#else>
                   "Value": { "String" : "${reflexMvtStockInterface.batch_1}"}
-            </#if>  
+            </#if>
            },
            {
            "Key": "HeldForSpecificCode",
            "Value": { "Bool" : "${reflexMvtStockInterface.ipg_specific_code_held}"}
            },
-           
+
            {
-            <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc /> 
+            <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc />
            "Key": "ManufacturingDate",
            "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_date}"
 						  }
-            } 
-          ]        
+            }
+          ]

 -->
 "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?? >
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
-        <#else>
-          <#stop "no LV for the item">
-        </#if>
         }
       ]
      <#break>
--- a/RFXtoRP_HsaItmLv.ftl
+++ b/RFXtoRP_HsaItmLv.ftl
@ -1,45 +1,45 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-
-<#assign aDateTime = .now>
-
-<#switch cloudEventMsg.action>
-    <#case "C">
-    <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign lv = JsonUtil.jsonToMap(dataRfx)>
-       [
-         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantUpdated>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl">
-         }
-       ]
-      <#break>
-
-      <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign lv = JsonUtil.jsonToMap(dataRfx)>
-       [
-         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantRemoved>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl">
-         }
-       ]
-      <#break>
-    <#default>
-          <#stop >
-</#switch>
-
+<#-- **** 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 lv = JsonUtil.jsonToMap(dataRfx)>
+       [
+         {
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantUpdated>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl">
+         }
+       ]
+      <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign lv = JsonUtil.jsonToMap(dataRfx)>
+       [
+         {
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantRemoved>
+         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+         "datas" :
+          <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl">
+         }
+       ]
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- 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_HsaItm_ItemCreated_LogisticVariantMetadata.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.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,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_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,56 +17,57 @@
      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
      [
         <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
+      <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
+            }
+         <#else>
+            <#-- ** Collection started (300) and Preparation in progress (400)** -->
+            <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
+                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
               }
            <#else>
-               <#-- ** Collection started (300) and Preparation in progress (400)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
-                  }
-               <#else>
-                     <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                  <#-- ****Preparation dispatched (600)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+                     {
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
+                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                     "datas" :
+                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                     },
+                     {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                        },
+                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
+                     }
+               <#else>
+                     <#-- ****Preparation cancelled (650)**** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
                        {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                           "datas" :
-                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
                        }
                  <#else>
-                        <#-- ****Preparation cancelled (650)**** -->
-                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
-                           {
-                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                           "datas" :
-                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
-                           }
-                     <#else>
-                           <#stop>
-                     </#if>
+                        <#stop>
                  </#if>
               </#if>
            </#if>
-         <#else>
-            <#stop "PRO reference is empty">
         </#if>
+      <#else>
+         <#--PRO reference is empty-->
+         <#stop >
+      </#if>
      ]
      <#break>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+    "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@ -7,10 +7,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefDate": {
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@ -7,10 +7,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefDate": {
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@ -7,10 +7,10 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaSup.ftl
+++ b/RFXtoRP_HsaSup.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_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@ -20,7 +20,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}",
@ -37,7 +37,7 @@
 			    "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,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.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
@ -22,7 +22,7 @@

      "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}",
@ -39,7 +39,7 @@
 			    "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}",
@ -55,7 +55,7 @@
                  "${depot.physical_depot_address.other_number?json_string}"
                  ],
        </#if>
-       "Typology": "TYPOLOGY_UNKNOWN"
+       "Typology": "TYPOLOGY_WAREHOUSE"
       }
  }
 ]
--- 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,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_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,11 +1,12 @@
 <#-- **** 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>
 <#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">

 <#assign aDateTime = .now>

@ -17,6 +18,7 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

   <#if	preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_line_lst??>
         [
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@ -54,8 +56,7 @@
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
-               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+            <#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>
@ -78,24 +79,29 @@
               "datas" :
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??>
-               <#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 !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>
-      <#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
@ -4,30 +4,30 @@
 [
  <#assign refIDHmap_local ={}>
   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-    <#if !refIDHmap_local[OrderOriginReference]?? >
-        <#if refIDHmap_local?size != 0 >
-        ,
-        </#if>
+    <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+   <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+      ,
+      </#if>
      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
+      {
      "Header": {
      "ProjectID": "${projectRP}"
      },
      "ID":{
      "RefID": "${OrderOriginReference}"
      },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
+        <#-- Add transport grade code
+        <#if preparationOrder.transport_grade_code!="">
+        ,
+        "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+        </#if> -->
      }
-      <#-- Add transport grade code
-      <#if preparationOrder.transport_grade_code!="">
-      ,
-      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-      </#if> -->
-    }
-    }
+     }
    </#if>
  </#list>
  <#assign refIDHmap_local ={}>
--- 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_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@ -3,7 +3,7 @@
 [
 <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />

-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3>
    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
        <#if refIDHmap?size != 0 >
--- a/RFXtoRP_HsrPrepa_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.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
          <#if refIDHmap_local?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@ -2,7 +2,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
@ -111,8 +111,9 @@

       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-         },
-       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        },
+        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@ -5,25 +5,25 @@
  <#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  <#if !refIDHmap_local[OrderOriginReference]?? >
+    <#if !refIDHmap_local[OrderOriginReference]?? >
      <#if refIDHmap_local?size != 0 >
-    ,
-    </#if>
-    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
-      "Header": {
-      "ProjectID": "${projectRP}"
-      },
-      "ID":{
-      "RefID": "${OrderOriginReference}"
-      },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      ,
+      </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+      {
+        "Header": {
+        "ProjectID": "${projectRP}"
+        },
+        "ID":{
+        "RefID": "${OrderOriginReference}"
+        },
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
      }
-    }
-    }
-  </#if>
+      }
+    </#if>
  </#list>
  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@ -1,6 +1,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
+<#include "RFX_PartnerAPP_Settings.ftl">
 [
 <#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
  {
@ -8,15 +9,41 @@
    "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#if despatched_ipg.consignment_unit_id!="">
-			  "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-      <#else>
-        <#if despatched_ipg.carton_number != "000000000000000000">
-          "RefID":"${despatched_ipg.carton_number}",
-        <#else>
-          "RefID":"${despatched_ipg.hd_number}",
-        </#if>
-      </#if>
+      <#switch trackingNumberSource>
+        <#case 1>
+          <#if despatched_ipg.consignment_unit_id!="">
+			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+          </#if>
+        <#break>
+        <#case 2>
+          <#if despatched_ipg.carton_number != "000000000000000000">
+              "RefID":"${despatched_ipg.carton_number}",
+            <#else>
+              "RefID":"${despatched_ipg.hd_number}",
+          </#if>
+        <#break>
+        <#case 3>
+          <#if despatched_ipg.consignment_unit_id!="">
+            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+          <#else>
+            <#if despatched_ipg.carton_number != "000000000000000000">
+              "RefID":"${despatched_ipg.carton_number}",
+            <#else>
+              "RefID":"${despatched_ipg.hd_number}",
+            </#if>
+          </#if>
+        <#break>
+        <#default>
+          <#if despatched_ipg.consignment_unit_id!="">
+            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
+          <#else>
+            <#if despatched_ipg.carton_number != "000000000000000000">
+              "RefID":"${despatched_ipg.carton_number}",
+            <#else>
+              "RefID":"${despatched_ipg.hd_number}",
+            </#if>
+          </#if>
+        </#switch>

      "RefDate": {
              "DateTime": "${dispatched_datetime4}",
@ -26,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,29 +16,27 @@
      <#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" >
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
-            }
-           <#else>
-           <#-- preparation order already confirmed -->
-            <#stop>
-           </#if>
-
+          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
+            <#if preparation_order.line_list??>
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+              }
+            <#else>
+              <#-- No line -->
+              <#stop>
+            </#if>
          <#else>
          <#-- preparation order type not supported -->
-          <#stop>
+            <#stop>
          </#if>
        <#else>
-          <#stop "PRO reference is empty">
+          <#-- PRO reference is empty -->
+          <#stop>
        </#if>
       ]
  <#break>
@ -49,14 +47,20 @@
      <#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.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">
+          <#-- PRO reference is empty -->
+          <#stop>
        </#if>
       ]
         <#break>
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+    "RefID": "${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@ -78,7 +78,7 @@
                }
          </#if>
         },
-
+        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
       <#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,6 +1,6 @@
-<#-- 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_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": [
@ -16,7 +16,7 @@
                  "Value": { "String" : "no batch"}
                <#else>
                   "Value": { "String" : "${preparation_order_line.batch_1}"}
-            </#if>  
+            </#if>
            }
          ]
 -->
--- 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,10 +15,10 @@

      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type = "030">
-        <#stop "ignored message because receipt type = transfert">
+        <#if receipt.receipt_type == "030">
+          <#stop "ignored message because receipt type = transfert">
        <#else>
+          <#if receipt.line_list ??>
          [
          {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@ -35,45 +35,56 @@

          }
          ]
+          <#else>
+            <#--  No line-->
+            <#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_confirmed == "true" >
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-            }
+         <#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_type = "030">
-              <#stop "ignored message because receipt type = transfert">
-            <#else>
+            <#if receipt.receipt_confirmed == "true" >
              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
+            <#else>
+              <#if receipt.receipt_type == "030">
+                <#stop "ignored message because receipt type = transfert">
+              <#else>
+                <#if receipt.line_list ??>
+                  {
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                    "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                    "datas" :
+                    <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                  }
+                <#else>
+                  <#--  No line-->
+                  <#stop>
+                </#if>
+              </#if>
            </#if>
          </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
       ]
      <#break>

@ -82,17 +93,18 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          {
+          <#if receipt.line_list ??>
+            {

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

--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@ -1,20 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
+  <#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": {
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          },
+            "Payload": {
+            }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${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_year}${receipt.receipt_number}",
+            </#if>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@ -9,7 +9,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "RefID": "${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_year}${receipt.receipt_number}",
+      </#if>
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@ -26,7 +30,11 @@

      "ShipFrom":
      {
+        <#if receipt.receipt_type == '020'>
+          "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
+        <#else>
        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+        </#if>
      },
        "ShipTo"  :
      {
@ -40,7 +48,11 @@
          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
        },
      </#if>
-
+       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID": "${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.line_list??>
       "Lines" : [
          <#list receipt.line_list as line>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl
@ -1,6 +1,6 @@
-<#-- 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_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": [
@ -16,7 +16,7 @@
                  "Value": { "String" : "no batch"}
                <#else>
                   "Value": { "String" : "${line_without_detail.batch_1}"}
-            </#if>  
+            </#if>
            },
            {
            "Key": "HeldForSpecificCode",
@ -25,15 +25,15 @@
            <#else>
            "Value": { "Bool" : "False"}
            },
-           
+
            {
-            <#assign manufacturing_date = line_without_detail.ipg_date_of_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> 
+            <#assign manufacturing_date = line_without_detail.ipg_date_of_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
            "Key": "ManufacturingDate",
            "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_date}"
 						  }
-            } 
+            }

          ]

--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@ -1,19 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
+  <#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": {
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          },
+            "Payload": {
+            }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${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_year}${receipt.receipt_number}",
+            </#if>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@ -1,21 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
+  <#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": {
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+          },
+            "Payload": {
+            }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${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_year}${receipt.receipt_number}",
+            </#if>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : Response message from Reflex  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- 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!"{}")>
--- a/RP_connector.ftl
+++ b/RP_connector.ftl
@ -14,7 +14,7 @@ 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>

--- 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)}" >
@ -27,6 +27,7 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
 		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
@ -43,6 +44,7 @@
        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
+			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
@ -82,14 +84,19 @@
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 				{
+				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_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}",
@ -98,13 +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_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_PrepOrder_LineMetadata.ftl
+++ b/RPtoRFX_PrepOrder_LineMetadata.ftl
@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_PrepOrder_OptionalAttributes.ftl
+++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl
@ -0,0 +1,8 @@
+<#-- Here are the fields that can be added
+"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
+"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
+"reason_code": "str",
+"planned_preparation_date": "0000-00-00",
+"despatch_grouping": "string",
+"reservation_end_datetime": "0000-00-00T00:00:00",
+-->
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@ -13,6 +13,7 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
 		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}",
@ -37,30 +38,28 @@
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
 			{
+				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
-				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_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",
-			   		"held _for_repacking": "false",
-			   		"hold_code": "false", -->
-					"hold_for_specific_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_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_Receipt_OptionalAttributes.ftl
+++ b/RPtoRFX_Receipt_OptionalAttributes.ftl
@ -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/2
+++ b/2
@ -1 +1 @@
-1.2.37+2
+1.2.50+1
Author	SHA1	Message	Date
Francis Reat	ae07548499	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main1.2 See merge request r-d-technique/tiers/reflex-wms-connector!191	2025-12-03 09:20:38 +00:00
Francis Reat	0ee0108a9d	Release 1.2.50+1	2025-12-03 10:17:01 +01:00
Francis Reat	42fbefc365	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main1.2 See merge request r-d-technique/tiers/reflex-wms-connector!185	2025-11-26 08:43:12 +00:00
Francis Reat	4fe7471545	Release 1.2.49+1	2025-11-26 09:37:05 +01:00
Francis Reat	dfdf51657b	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main1.2 See merge request r-d-technique/tiers/reflex-wms-connector!160	2025-11-06 10:10:42 +00:00
Francis Reat	3d4c41b6d3	Release 1.2.48+1	2025-11-06 11:09:50 +01:00
Francis Reat	2b779cf8aa	Merge branch 'release1.2-SCPN1-9615' into 'release/1.2' SCPN1-9615 See merge request r-d-technique/tiers/reflex-wms-connector!158	2025-11-06 09:41:23 +00:00
Laurie Montant	b812177bf5	SCPN1-9615 (cherry picked from commit d0e4342b34198d124db3398c527f321a20f57945)	2025-11-05 15:54:44 +01:00
Francis Reat	3ec2f8f9bf	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main 1.2 See merge request r-d-technique/tiers/reflex-wms-connector!154	2025-10-29 09:50:21 +00:00
Francis Reat	175f0169ea	Release 1.2.47+1	2025-10-29 10:48:59 +01:00
Francis Reat	639bbdbff5	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main 1.2 See merge request r-d-technique/tiers/reflex-wms-connector!153	2025-10-24 08:42:10 +00:00
Francis Reat	22d9f48b09	Release 1.2.46+1	2025-10-24 10:39:14 +02:00
Francis Reat	f0933a5c6a	Merge branch 'release1.2-SCPN1-9399' into 'release/1.2' SCPN1-9399 to release1.2 See merge request r-d-technique/tiers/reflex-wms-connector!146	2025-10-24 08:35:12 +00:00
Francis Reat	4b090088db	SCPN1-9399 (cherry picked from commit 160d1ca3bd6d13ef073f43252158bfd674601083)	2025-10-22 17:18:39 +02:00
Laurie Montant	d3fa6876e7	json_string order (cherry picked from commit 39b1359e8d9a5cb18f312333cca06eb8db548816)	2025-10-22 17:02:34 +02:00
Francis Reat	05c3d17a03	Merge branch 'release/1.2' into release1.2-SCPN1-9399	2025-10-21 18:17:32 +02:00
Francis Reat	bdd17502d7	brand	2025-10-21 17:03:35 +02:00
Laurie Montant	1ed84f6c19	brand	2025-10-21 16:41:13 +02:00
Laurie Montant	5bc723540c	SCPN1-9399	2025-10-21 16:38:03 +02:00
Laurie Montant	374aef32fd	changement marque (cherry picked from commit af6054122192f36596a3d496854b670ea5625807)	2025-10-21 16:21:01 +02:00
Francis Reat	3304d944e5	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main 1.2 See merge request r-d-technique/tiers/reflex-wms-connector!150	2025-10-16 13:49:13 +00:00
Francis Reat	f23a11933d	Release 1.2.45+4	2025-10-16 15:47:44 +02:00
Francis Reat	d77f51fa52	Merge branch 'release-1.2-SCPN1-9437' into 'release/1.2' SCPN1-9437 to release1.2 See merge request r-d-technique/tiers/reflex-wms-connector!149	2025-10-16 13:39:18 +00:00
Laurie Montant	c8806baf5c	SCPN1-9437 (cherry picked from commit 374ab5499448d8e8b78f2401d1c9fbb7c42cb8a3)	2025-10-16 15:10:27 +02:00
Laurie Montant	8ca2f62591	SCPN1-9437 (cherry picked from commit 8cafa21aa749f3b2ce43f7a675ad8ff09ff45938)	2025-10-16 15:10:20 +02:00
Laurie Montant	97dbd248f8	SCPN1-9437 (cherry picked from commit d787148aae3dad6c263a632412642ee0f2ba1dd0)	2025-10-16 15:10:12 +02:00
Laurie Montant	6bf2ea2329	SCPN1-9437 (cherry picked from commit 7786a93b25c235d7ed2202f63493451d857f38d6)	2025-10-16 15:10:01 +02:00
Laurie Montant	6bb1d45783	SCPN1-9437 (cherry picked from commit f05096636edcb4ba73d91a745a0d05f5a1e16f9b)	2025-10-16 15:09:41 +02:00
GROUP\frea	a880fff33b	SCPN1-9094 (cherry picked from commit b8c463ffc1bd73809f8e6f4cc5231957308d589d)	2025-10-08 09:30:56 +02:00
Francis Reat	d63a3d7a50	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 to main 1.2 See merge request r-d-technique/tiers/reflex-wms-connector!143	2025-09-26 07:23:49 +00:00
frea	f373cbe734	Release 1.2.45+3	2025-09-26 09:22:26 +02:00
Francis Reat	1256e3d68c	Merge branch 'SCPN1-9348-1.2' into 'release/1.2' SCPN1-9348-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!140	2025-09-26 07:12:32 +00:00
GROUP\frea	983a59b592	SCPN1-9348 (cherry picked from commit cb2f8fe59e2dca1e7666ba4a9e92a1aecae91e0a)	2025-09-25 16:31:53 +02:00
Francis Reat	c779d5305c	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!137	2025-09-09 13:54:26 +00:00
frea	eb6fc3f4a3	Release 1.2.45+2	2025-09-09 15:48:03 +02:00
Francis Reat	8cf596e251	Merge branch 'SCPN1-9296-1.2-2' into 'release/1.2' SCPN1-9296 See merge request r-d-technique/tiers/reflex-wms-connector!136	2025-09-09 13:46:36 +00:00
GROUP\frea	55070c8ce3	SCPN1-9296	2025-09-09 15:44:56 +02:00
Francis Reat	0f7990b20e	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!134	2025-09-09 07:30:44 +00:00
frea	928c05bff4	Release 1.2.45+1	2025-09-09 09:24:36 +02:00
Francis Reat	2d8bdeb8a5	Merge branch 'SCPN1-9296-1.2' into 'release/1.2' SCPN1-9296-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!132	2025-09-09 07:22:34 +00:00
Laurie Montant	bb2aaae375	Correction list (cherry picked from commit 7d874d7a687d4b4333117e4c0b169257c27484a5)	2025-09-09 09:00:24 +02:00
Laurie Montant	f4286949f7	Renotified (cherry picked from commit 68668789b6dfb4bdc16e6cade450077028b6b2a2)	2025-09-08 18:02:43 +02:00
Francis Reat	1df16adb0a	Merge branch 'release/1.2' into 'main-1.2' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!130	2025-09-08 08:55:21 +00:00
frea	6d6a56710b	Release 1.2.44+2	2025-09-08 10:42:36 +02:00
Francis Reat	9b93729ab4	Merge branch 'SCPN1-9288-1.2' into 'release/1.2' SCPN1-9288-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!128	2025-09-08 08:38:28 +00:00
Laurie Montant	18c4959a62	Correction 080925 (cherry picked from commit 0ad605af1d252d3b15ac8bb736adc9141fa8b84f)	2025-09-08 10:13:17 +02:00
Laurie Montant	efe3ac2134	Corrections 250908 (cherry picked from commit 17830c1c6e8a82f68b825882699e7ab1dc5d91e8)	2025-09-08 10:12:23 +02:00
Laurie Montant	0d162d5de2	Correction 080925 (cherry picked from commit 0ad605af1d252d3b15ac8bb736adc9141fa8b84f)	2025-09-08 10:12:03 +02:00
Francis Reat	a939e6067e	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!126	2025-08-26 14:42:01 +00:00
frea	77421779f3	Release 1.2.44+1	2025-08-26 16:22:14 +02:00
Francis Reat	ff59e45573	Merge branch 'v11-connector1.2' into 'release/1.2' v11-connector1.2 See merge request r-d-technique/tiers/reflex-wms-connector!125	2025-08-26 13:55:41 +00:00
GROUP\frea	ce32967617	Merge branch 'develop-1.2' into v11-connector-1.2 # Conflicts: # README.md # RFXtoRP_HsrReceiptList.ftl	2025-08-26 15:33:06 +02:00
Vincent Le Maitre	df15106ef5	Release 1.2.43+1	2025-08-26 11:01:08 +02:00
Laurie Montant	127e69db7b	Modifs line ref trf hsaipgmove receipt	2025-08-26 10:27:57 +02:00
Laurie Montant	ff01a944e4	Readme	2025-08-07 16:39:01 +02:00
Laurie Montant	18ac89f664	Modifs Optional_attributes	2025-08-07 10:58:08 +02:00
Laurie Montant	499a16796a	Modif RPtoRFX_Receipt	2025-08-07 09:46:44 +02:00
Laurie Montant	8863cd66a7	Controle line_list	2025-08-06 11:13:02 +02:00
Laurie Montant	27a762caa8	ODP confirmed	2025-08-05 17:06:20 +02:00
Laurie Montant	649452207d	modifs goods received	2025-07-23 15:45:50 +02:00
Laurie Montant	2d1fefd96f	suppression commentaires	2025-07-18 11:31:24 +02:00
Laurie Montant	06376dd2d7	suppression commentaires	2025-07-18 11:08:12 +02:00
Laurie Montant	9642b8b8ad	revert	2025-07-17 16:30:16 +02:00
Laurie Montant	7d998634d3	revert	2025-07-17 14:08:14 +02:00
Laurie Montant	7bf9d3c674	Revert "SCPN1-8865" This reverts commit 8cd98b86380e36efe8f4e6f216c70fcd657804d9.	2025-07-17 13:59:57 +02:00
Laurie Montant	632cc2b647	dispute	2025-07-17 10:24:02 +02:00
GROUP\frea	27f2d525dc	SCPN1-9084 (cherry picked from commit 3d2670b9a23d1106773d0881e62c0f5ae1409241)	2025-07-15 16:23:35 +02:00
Francis Reat	b66ec8c589	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!122	2025-07-10 09:35:24 +00:00
frea	3d95e5f3a2	Release 1.2.42+1	2025-07-10 11:32:59 +02:00
Francis Reat	c370b967e6	Merge branch 'SCPN1-8991-8980-9059-1.2' into 'release/1.2' SCPN1-8991-8980-9059-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!120	2025-07-10 09:31:57 +00:00
GROUP\frea	835b8062ee	SCPN1-9059	2025-07-10 09:57:26 +02:00
GROUP\frea	017cd65077	SCPN1-9059	2025-07-10 09:52:33 +02:00
Laurie Montant	64e863bdfc	SCPN1-9059	2025-07-09 18:14:43 +02:00
Laurie Montant	e50893e8c9	SCPN1-9059	2025-07-09 15:09:39 +02:00
Laurie Montant	592ccb8905	SCPN1-9059	2025-07-09 15:01:36 +02:00
Laurie Montant	ddab0673d4	modif date cancelled	2025-07-07 16:15:49 +02:00
Laurie Montant	42237b2029	modif réception date	2025-07-07 16:11:37 +02:00
Laurie Montant	8c228dd0eb	modif réception	2025-07-07 15:58:10 +02:00
Laurie Montant	cded3aa0e3	Modifs réception	2025-07-07 15:52:22 +02:00
Laurie Montant	5c4dc74bb8	modif receipt	2025-07-07 15:42:42 +02:00
Laurie Montant	9f34588a6a	Receipt	2025-07-07 15:41:19 +02:00
Laurie Montant	16f4e35c02	modif receipt expected	2025-07-04 17:02:52 +02:00
Laurie Montant	9b8a5ad5c6	modifs recipt canceled	2025-07-04 16:51:30 +02:00
Laurie Montant	676fab0fea	Modif receipt completed	2025-07-04 16:44:58 +02:00
Laurie Montant	297e3ea4c8	modif réception	2025-07-04 16:10:01 +02:00
Laurie Montant	58118c394b	Correction HsrPrepa_Carrier	2025-07-04 15:05:14 +02:00
Laurie Montant	83a1f59edf	SCPN1-8865	2025-07-03 16:40:53 +02:00
Laurie Montant	890768f89a	SCPN1-8865	2025-07-03 16:33:56 +02:00
Laurie Montant	0a5ec7329c	SCPN1-8863	2025-07-03 16:09:48 +02:00
Laurie Montant	9999313dfc	SCPN1-8865	2025-07-03 15:02:19 +02:00
Laurie Montant	dd4d31b443	SCPN1-8865	2025-07-03 15:01:26 +02:00
GROUP\frea	c1704af84d	SCPN1-8987 (cherry picked from commit bcd2d995c295ebd2a0d72b3b426936bcf42010c0)	2025-07-02 15:51:31 +02:00
Laurie Montant	a248dc16ed	ajout controle	2025-07-02 15:05:35 +02:00
Laurie Montant	aec4e6068e	SCPN1-8980 (cherry picked from commit 899cdd25086573ce2944685c6f5347dba3761f1d)	2025-07-02 14:37:13 +02:00
Laurie Montant	dfdfbdeb15	SCPN1-8865	2025-07-02 10:28:24 +02:00
GROUP\frea	d875085657	SCPN1-8991 (cherry picked from commit 9d7293d92eb9f4b07886ab11f7ed59a2a6f7aaa1)	2025-07-01 15:43:57 +02:00
GROUP\frea	9d7293d92e	SCPN1-8991	2025-07-01 15:42:26 +02:00
Laurie Montant	899cdd2508	SCPN1-8980	2025-06-30 13:47:50 +02:00
Laurie Montant	d1f251ba32	modif statut	2025-06-25 17:08:44 +02:00
Laurie Montant	30337cc003	SCPN1-8863	2025-06-24 17:35:46 +02:00
Laurie Montant	24f7b8b36a	SCPN1-8863	2025-06-24 17:24:32 +02:00
Laurie Montant	a1b063a9d4	SCPN1-8863	2025-06-24 17:05:41 +02:00
Laurie Montant	88fa6bd2af	SCPN1-8863	2025-06-24 16:50:59 +02:00
Laurie Montant	01b2706cb5	SCPN1-8865	2025-06-24 16:35:38 +02:00
Laurie Montant	8cd98b8638	SCPN1-8865	2025-06-24 16:20:04 +02:00
Laurie Montant	4c8ab232d0	SCPN1-8870	2025-06-24 15:39:30 +02:00
Laurie Montant	3d816434af	SCPN1-8870	2025-06-24 15:28:59 +02:00
Laurie Montant	9f0bedc583	Modifs	2025-06-24 10:54:23 +02:00
Francis Reat	42c5b2943d	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!114	2025-06-20 15:58:53 +00:00
frea	86d0974c2f	Release 1.2.41+1	2025-06-20 17:56:35 +02:00
Laurie Montant	8abf2771ba	SCPN1-8865	2025-06-20 16:39:19 +02:00
Laurie Montant	8229616050	SCPN1-8870	2025-06-16 10:52:41 +02:00
Francis Reat	ac5f5d1b88	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!112	2025-05-27 07:59:40 +00:00
frea	d6a7398af1	Release 1.2.40+1	2025-05-27 09:56:37 +02:00
Francis Reat	7a77f373cc	Merge branch 'SCPN1-8800-1.2' into 'release/1.2' SCPN1-8800 into release 1.2 See merge request r-d-technique/tiers/reflex-wms-connector!110	2025-05-27 07:11:07 +00:00
Laurie Montant	6af5f05491	SCPN1-8800 (cherry picked from commit 5581b8cd299a6c89612c9c26678e1cd72596e054)	2025-05-26 16:58:18 +02:00
Laurie Montant	5581b8cd29	SCPN1-8800	2025-05-26 10:03:49 +02:00
Francis Reat	cd1cc00f78	Merge branch 'release/1.2' into 'main-1.2' Release/1.2 -> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!108	2025-05-13 12:53:12 +00:00
freat	10def5ca60	Release 1.2.39+2	2025-05-13 14:43:31 +02:00
Francis Reat	6db75e83e0	Merge branch 'SCPN1-8728-8696-1.2' into 'release/1.2' SCPN1-8728-8696-1-2 See merge request r-d-technique/tiers/reflex-wms-connector!107	2025-05-13 12:40:03 +00:00
frea	af9ff73850	SCPN1-8728-8696	2025-05-13 14:26:35 +02:00
frea	cf5ef67c23	SCPN1-8728-8696	2025-05-13 11:36:23 +02:00
Laurie Montant	09df74f0e0	SCPN1-8729	2025-05-12 14:22:34 +02:00
Laurie Montant	0ea5a04d6b	SCPN1-8696	2025-04-28 14:03:08 +02:00
Cedric Rodier	777197b26b	clean README	2025-04-25 13:10:06 +00:00
Cedric Rodier	a23e6654f1	clean README	2025-04-25 09:54:47 +00:00
Cedric Rodier	b7eab6ccfd	clean README	2025-04-25 09:53:11 +00:00
Cedric Rodier	c58772f755	clean README	2025-04-25 09:39:58 +00:00
Cedric Rodier	fbaddfe891	clean README	2025-04-25 09:00:02 +00:00
Cedric Rodier	df4377f77d	clean README	2025-04-25 08:56:34 +00:00
Cedric Rodier	703ad28c19	Merge branch 'release/1.2' into 'main-1.2' MR-> Main-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!105	2025-04-24 15:03:22 +00:00
Laurie Montant	65795a6077	SCPN1-8583	2025-04-24 15:47:22 +02:00
freat	b3cbfeb1a8	Release 1.2.39+1	2025-04-24 14:28:38 +02:00
freat	29e4acfca4	Release 1.2.38+2	2025-04-15 18:32:12 +02:00
Francis Reat	aa68eb52e9	Merge branch 'to-v10-connector1.2' into 'release/1.2' update FTL See merge request r-d-technique/tiers/reflex-wms-connector!100	2025-04-15 16:24:24 +00:00
frea	320bd8988b	update FTL	2025-04-15 18:15:06 +02:00
frea	9a55811bfc	delete ftl not use	2025-04-15 17:52:33 +02:00
freat	1905105118	Release 1.2.38+1	2025-04-11 10:38:27 +02:00
 @ -1 +1 @@
 .2.37+2
 .2.50+1