Release 1.2.45+3

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 09:22:26 +02:00 · 2025-09-26 07:12:32 +00:00 · 2025-09-25 16:31:53 +02:00 · 2025-09-09 15:48:03 +02:00 · 2025-09-09 13:46:36 +00:00 · 2025-09-09 15:44:56 +02:00
58 changed files with 726 additions and 535 deletions
--- a/README.md
+++ b/README.md
@@ -1,9 +1,20 @@
 # Reflex Platform Core FTLs

+## Overview

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

-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

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

-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
+## Useful Resources
+
+- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html)
+- [Reflex Platform](https://auth.reflex-platform.com/)
--- a/RFXtoRP_HliPrepaL.ftl
+++ b/RFXtoRP_HliPrepaL.ftl
@@ -0,0 +1,31 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+<#case "C">
+<#--<#case "U">
+    <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+    <#stop "no generic FTL file available yet for preparationOrderLines">
+    <#break>
+<#case "D">
+    <#-- *********************************************** Action = DELETE ******************** -->
+    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+    <#stop "no generic FTL file available yet for preparationOrderLines">
+    <#break>
+<#break>
+
+<#default>
+<#stop>
+</#switch>
--- a/RFXtoRP_HliReceiptLr.ftl
+++ b/RFXtoRP_HliReceiptLr.ftl
@@ -0,0 +1,34 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+    <#case "U">
+        <#-- *********************************************** Action = CREATE ******************** -->
+
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
+
+        <#stop "no generic FTL file available yet for receiptLines">
+        <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
+
+        <#stop "no generic FTL file available yet for receiptLines">
+        <#break>
+
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HlrProL.ftl
+++ b/RFXtoRP_HlrProL.ftl
@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for preparationOrderLines">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for preparationOrderLines">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HsaCarrier.ftl
+++ b/RFXtoRP_HsaCarrier.ftl
@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,7 +17,7 @@
      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
@@ -8,7 +11,11 @@
    },
    "Payload": {
      "Name": "${carrier.carrier_designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": true,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+

    <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,

@@ -30,6 +37,7 @@
          </#if>
 			    "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
 			    "State": "${carrier.carrier_structured_address.country_designation?json_string}"
+
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if  carrier.address??>
--- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaCons.ftl
+++ b/RFXtoRP_HsaCons.ftl
@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,13 +17,12 @@
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
         }
       ]
-
      <#break>

      <#case "D">
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
@@ -8,12 +11,18 @@
    },
    "Payload": {
      "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+

    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,

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

--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -36,7 +36,8 @@
                <#stop>
              </#if>
            <#else>
-              <#stop "Reference is empty">
+              <#--  "Reference is empty"-->
+              <#stop>
            </#if>
          </#if>
       ]
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -0,0 +1,4 @@
+<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
+
+
+"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -21,7 +21,7 @@
        },
        "Payload": {
            <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?json_string}",
+                "Title":"${dispute.dispute_reference?trim?json_string}",
             <#else>
                "Title":"",
            </#if>
@@ -39,31 +39,26 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
+            <#-- Claim metadata inclusion  -->
+            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
            <#-- To configure -->
            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "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=="030" || dispute.dispute_type_code=="070"  >
-                    <#if dispute.dispute_reception.reception_type_code=="030">
-                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
-                    <#else>
-                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
-                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
-                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
+                        "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
                <#else>
                    <#stop "WMS type code not supported">
                </#if>
            </#if>
-                </#if>
-            </#if>

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${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>
        }
    }
@@ -71,4 +66,3 @@



-
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -57,8 +57,8 @@
                        }
                        ]
                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
+                        <#-- Case of IPG move type volontarilly ignored, Reference receipt is empty-->
+                        <#stop >
                     </#if>
               <#else>
                  <#stop>
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -21,24 +21,38 @@
       "Goods": {
           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
+           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
              "PriorityDate": "${priority_date}",
           <#else>
              "PriorityDate": "1970-01-01T00:00:00Z",
            </#if>
-
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-
-        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+        <#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}",
+            </#if>
+          </#if>
+        <#else>
+          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
          <#else>
            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
          </#if>
+        </#if>
+        <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
+          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
+        <#else>
          "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+        </#if>
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
--- 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_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -37,7 +37,7 @@
            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
            "Name" : "${logistical_variant.lv_type_code?json_string}",

-              <#if logistical_variant.id_list??>
+              <#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_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -65,7 +65,8 @@
            </#if>
         </#if>
      <#else>
-            <#stop "PRO reference is empty">
+         <#--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.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+    "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
        "RefDate": {
          "DateTime": "${preparation_status_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
        "RefDate": {
          "DateTime": "${preparation_status_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
          "DateTime": "${preparation_status_datetime}",
          "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaSup.ftl
+++ b/RFXtoRP_HsaSup.ftl
@@ -2,9 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -20,7 +17,7 @@
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
@@ -8,7 +11,10 @@
    },
    "Payload": {
      "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->

    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,

@@ -16,6 +22,7 @@
         {
        <#-- if Reflex WMS address is structured    -->
        <#if actor.supplier_structured_address?? >
+
          "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
@@ -29,6 +36,7 @@
          </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
+
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if actor.optional_attributes?? >
@@ -39,6 +47,7 @@
            "CountryCode" : ""
          </#if>
        </#if>
+
         },
      <#if actor.optional_attributes?? >
        "Phones": ["${actor.optional_attributes.telephone?json_string}",
--- a/RFXtoRP_HsaSup_ActorDeleted.ftl
+++ b/RFXtoRP_HsaSup_ActorDeleted.ftl
@@ -1,3 +1,6 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsrDepot.ftl
+++ b/RFXtoRP_HsrDepot.ftl
@@ -17,7 +17,7 @@
      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -11,12 +11,20 @@
    },
    "Payload": {
      "Name": "${depot.physical_depot_designation?json_string}",
+        "ManagedStock": true,
        "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->
+
+
    <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
+
+
      "Address":
         {
        <#-- if Reflex WMS address is structured    -->
        <#if depot.physical_depot_structured_address?? >
+
          "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
@@ -30,6 +38,7 @@
          </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
+
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if depot.physical_depot_address??>
--- a/RFXtoRP_HsrPackBranch.ftl
+++ b/RFXtoRP_HsrPackBranch.ftl
@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Branch">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for  Pack Branch">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HsrPackOrder.ftl
+++ b/RFXtoRP_HsrPackOrder.ftl
@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -18,6 +18,7 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

   <#if	preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_line_lst??>
         [
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -40,6 +41,12 @@
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
               }
            </#if>

@@ -49,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]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               <#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>
@@ -90,7 +96,12 @@
            <#assign refIDHmap ={}>
         ]
      <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
+         <#--   No line-->
+         <#stop >
+      </#if>
+   <#else>
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop >
   </#if>


--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -15,7 +15,7 @@
      "ProjectID": "${projectRP}"
      },
      "ID":{
-      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
+      "RefID": "${OrderOriginReference}"
      },
      "Payload":{
        "Carrier": {
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -113,7 +113,7 @@
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
        },
        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -0,0 +1,29 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  <#assign refIDHmap_local ={}>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+      ,
+      </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+      {
+        "Header": {
+        "ProjectID": "${projectRP}"
+        },
+        "ID":{
+        "RefID": "${OrderOriginReference}"
+        },
+      "Payload":{
+        "Carrier": {
+          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+        }
+      }
+      }
+    </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
+]
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -53,8 +53,10 @@
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000">
      "HandlingunitID": "${despatched_ipg.carton_number}"
+      <#assign hd_numberHmap += {despatched_ipg.carton_number,despatched_ipg.carton_number}>
      <#else>
      "HandlingunitID": "${despatched_ipg.hd_number}"
+      <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
      </#if>
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
    ,
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,12 +16,10 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
          <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-            <#-- Only if preparation order not confirmed  -->
-            <#if preparation_order.preparation_order_confirmed == "false" >
+          <#if preparation_order.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}",
@@ -29,16 +27,16 @@
                <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
              }
            <#else>
-           <#-- preparation order already confirmed -->
+              <#-- No line -->
              <#stop>
            </#if>
-
          <#else>
          <#-- preparation order type not supported -->
            <#stop>
          </#if>
        <#else>
-          <#stop "PRO reference is empty">
+          <#-- PRO reference is empty -->
+          <#stop>
        </#if>
       ]
  <#break>
@@ -49,6 +47,7 @@
      <#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}",
@@ -56,7 +55,12 @@
              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
            }
          <#else>
-          <#stop "PRO reference is empty">
+            <#-- No line -->
+            <#stop>
+          </#if>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
        </#if>
       ]
         <#break>
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+    "RefID": "${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -31,10 +31,17 @@
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
-            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
-          <#else>
-            <#if preparation_order.address.address_type_code == "" &&
+          <#if
+          <#-- preparation_order.address.type_code == "" &&
+          preparation_order.address.title_code == "" &&
+          preparation_order.address.first_name == "" &&
+          preparation_order.address.last_name == "" &&
+          preparation_order.address.mail_address == "" &&
+          preparation_order.address.contact_type_code == "" &&
+          preparation_order.address.mobile_phone_number == "" &&
+          preparation_order.address.land_line_phone_number == "" &&
+          preparation_order.address.fax_number == "" && -->
+          preparation_order.address.address_type_code == "" &&
          preparation_order.address.name_or_company_name == "" &&
          preparation_order.address.additional_address_data_1 == "" &&
          preparation_order.address.additional_address_data_2 == "" &&
@@ -50,8 +57,13 @@
              "Address" :
                {
                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                  "PostalCode" : "${preparation_order.address.postal_code!""}",
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
+                 <#if isCountryCode>
+                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
+                 <#else>
+                  "CountryCode" : "",
+                 </#if>
+                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
@@ -65,7 +77,6 @@
                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
                }
          </#if>
-          </#if>
         },
        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
       <#if preparation_order.line_list??>
@@ -106,14 +117,8 @@
          {
             "RequestedDeliveryDateTime" :
             {
-              <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
-                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
-                "DateTime": "${intermediate_delivery_start_datetime}",
-                "AuthorTimeZone": "${time_zone_rfx}"
-              <#else>
                "DateTime": "${planned_final_delivery_start_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
-              </#if>
             }
         }
    }
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -16,24 +16,10 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type = "030">
-        [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
-
-          }
-          ]
+        <#if receipt.receipt_type == "030">
+          <#stop "ignored message because receipt type = transfert">
        <#else>
+          <#if receipt.line_list ??>
          [
          {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -50,9 +36,14 @@

          }
          ]
+          <#else>
+            <#--  No line-->
+            <#stop>
+          </#if>
      </#if>
    <#else>
-        <#stop "Receipt reference is empty">
+      <#--  "Receipt reference is empty"-->
+      <#stop>
    </#if>
      <#break>
    <#case "U">
@@ -61,22 +52,6 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
-            }
-            <#else>
-              <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-            }
-          <#else>
         <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
                  {
                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -93,6 +68,10 @@
                <#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}",
@@ -105,12 +84,16 @@
                  "datas" :
                  <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
                  }
+                <#else>
+                  <#--  No line-->
+                  <#stop>
                </#if>
              </#if>
            </#if>
          </#if>
        <#else>
-          <#stop "Receipt reference is empty">
+          <#-- Receipt reference is empty-->
+          <#stop >
        </#if>
       ]
      <#break>
@@ -121,6 +104,7 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.line_list ??>
            {

              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -129,7 +113,12 @@
              <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
            }
            <#else>
-          <#stop "Receipt reference is empty">
+              <#--  No line-->
+              <#stop>
+            </#if>
+        <#else>
+           <#-- Receipt reference is empty-->
+          <#stop >
        </#if>
       ]
         <#break>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -1,14 +1,20 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
          {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
+            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
@@ -17,4 +23,24 @@
            "Payload": {
            }
          }
+        </#if>
+      <#else>
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+        </#if>
+      </#if>
+    </#list>
+  </#if>
 ]
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,14 +26,17 @@

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

      <#if receipt.carrier_informations.carrier_code != "">
        "Carrier":
@@ -41,7 +44,7 @@
          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
        },
      </#if>
-
+      "OrderID": "${receipt.receipt_reference?trim?json_string}",
      <#if receipt.line_list??>
       "Lines" : [
          <#list receipt.line_list as line>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -1,13 +1,20 @@
 <#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 ={}>
 [
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
          {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
+            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
@@ -16,4 +23,24 @@
            "Payload": {
            }
          }
+        </#if>
+      <#else>
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+        </#if>
+      </#if>
+    </#list>
+  </#if>
 ]
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -1,21 +1,46 @@
 <#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 ={}>
 [
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
          {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
+            "Header": {"ProjectID": "${projectRP}"},
            "ID": {
-         "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
              "RefDate": {
              "DateTime": "${receipt_status_datetime}",
              "AuthorTimeZone": "${time_zone_rfx}"
              }
          },
-
-    "Payload": {}
-
+            "Payload": {
            }
+          }
+        </#if>
+      <#else>
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+        </#if>
+      </#if>
+    </#list>
+  </#if>
 ]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -1,24 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -1,98 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-[
-  {
-  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-            "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"
-             }
-    },
-    "Payload": {
-         "CreationDateTime": {
-           "DateTime": "${receipt_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"
-             },
-        "OrderID":"${receipt.receipt_reference?trim?json_string}",
-       <#-- Header Metadata inclusion -->
-       <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-
-      "ShipFrom":
-      {
-        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
-      },
-        "ShipTo"  :
-      {
-         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
-      },
-      "ShipToAcked": true,
-
-      <#if receipt.carrier_informations.carrier_code != "">
-        "Carrier":
-        {
-          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-        },
-      </#if>
-
-      <#if receipt.line_list??>
-       "Lines" : [
-          <#list receipt.line_list as line>
-        {
-          "LineID": "${line.receipt_line_number}",
-          <#-- Line Metadata inclusion -->
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">,
-          "RequestedContent":
-          {
-            "Goods":
-            {
-              "ItemID":   "${line.item_code?trim?json_string!"0"}",
-              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
-                   "PriorityDate": "${line_without_detail_priority_date}",
-              <#else>
-                <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${line_detail_priority_date}",
-                <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
-                </#if>
-              </#if>
-              <#-- Segmentation Keys inclusion -->
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
-            },
-            "Quantity" :
-            {
-              "LVID":   "${quantity_in_base_lv_RP_Cst}",
-              "Value":  "${line.order_quantity_in_lv!0}"
-            }
-          }
-
-        }
-      <#sep>,</#sep>
-          </#list>
-         ],
-      </#if>
-
-         "RequestedMilestones" :
-         {
-             "RequestedDeliveryDateTime" :
-             {
-                "DateTime": "${receipt_datetime}",
-               "AuthorTimeZone": "${time_zone_rfx}"
-             }
-         }
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
-[
-  {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-      "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -1,25 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
-         "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      <#else>
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
-      </#if>
-       "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
-]
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.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
@@ -17,7 +17,7 @@
 </#if>

 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -44,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}"
@@ -83,9 +84,13 @@
 				<#-- ******* 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">
 				{
@@ -100,14 +105,6 @@
 				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
-				<#--
-				"stock_reservation": "false",
-				"forced_priority_date_min_lead_time": "false",
-				"temp_substitution_possible": "false",
-				"substitution_possible": "false"
-				-->
-
-
 				}
 			<#sep>,</#sep>
 			</#list>
--- a/RPtoRFX_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@@ -1,5 +1,5 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
+<#-- 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"]??>
--- a/RPtoRFX_PrepOrder_LineMetadata.ftl
+++ b/RPtoRFX_PrepOrder_LineMetadata.ftl
@@ -1,5 +1,5 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
+<#-- 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"]??>
--- 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
@@ -3,7 +3,7 @@
 <#include "HfRpConfig.ftl">

 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -38,9 +38,13 @@
 			<#-- ******* 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">
 			{
@@ -53,15 +57,9 @@
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
-			   		"hold_code": "false", -->
+				<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
 				"hold_for_specific_code": "false"
 		 		}
-		  		<#--"quality_control_attributes": {
-	        		"qcf_to_create_for_receipt_line": "false",
-	         		"exclude_item_from_inspection": "false"
-  				} -->
-
 			}<#sep>,</#sep>
 		</#list>
 		]
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -1,5 +1,5 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
+<#-- 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"]??>
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@@ -1,5 +1,5 @@
-<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
-<#-- You can map metadata with additional information,comments... -->
+<#-- 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"]??>
--- 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 @@
-2.0.2+2
+1.2.45+3
Author	SHA1	Message	Date
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 `cb2f8fe59e`)	2025-09-25 16:31:53 +02: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
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 `7d874d7a68`)	2025-09-09 09:00:24 +02:00
Laurie Montant	f4286949f7	Renotified (cherry picked from commit `68668789b6`)	2025-09-08 18:02:43 +02: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 `0ad605af1d`)	2025-09-08 10:13:17 +02:00
Laurie Montant	efe3ac2134	Corrections 250908 (cherry picked from commit `17830c1c6e`)	2025-09-08 10:12:23 +02:00
Laurie Montant	0d162d5de2	Correction 080925 (cherry picked from commit `0ad605af1d`)	2025-09-08 10:12:03 +02: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 `8cd98b8638`.	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 `3d2670b9a2`)	2025-07-15 16:23:35 +02: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 `bcd2d995c2`)	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 `899cdd2508`)	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 `9d7293d92e`)	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
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
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 `5581b8cd29`)	2025-05-26 16:58:18 +02:00
Laurie Montant	5581b8cd29	SCPN1-8800	2025-05-26 10:03:49 +02: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
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 @@
 .0.2+2
 .2.45+3