Release 2.0.5+1

Merge branch 'SCPN1-8991-8980-9059-2.0' into 'release/2.0'
SCPN1-8991-8980-9059-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!121
2025-07-10 11:32:33 +02:00 · 2025-07-10 09:31:47 +00:00 · 2025-07-10 09:54:08 +02:00 · 2025-07-09 18:17:05 +02:00 · 2025-07-02 14:37:45 +02:00 · 2025-07-01 15:43:18 +02:00
49 changed files with 473 additions and 196 deletions
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
 # Reflex Platform Core FTLs

- 
+

 These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.

- 

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

- 
+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/
--- a/RFXtoRP_HsaCarrier.ftl
+++ b/RFXtoRP_HsaCarrier.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

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

    <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,

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

 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -15,14 +18,15 @@
       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-       [
+      [
         {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
          <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
         }
       ]
+
      <#break>

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

    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,

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

--- a/RFXtoRP_HsaCons_ActorDeleted.ftl
+++ b/RFXtoRP_HsaCons_ActorDeleted.ftl
@@ -1,6 +1,3 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -17,20 +17,27 @@
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
          <#if dispute.dispute_closed == true >
+            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsaDispute_Created.ftl">
-            },
+            }
+              <#if TableReasonCode[dispute.dispute_reason_code]??>
+              ,
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
            }
+              <#else>
+                <#stop>
+              </#if>
            <#else>
-              <#stop>
+              <#stop "Reference is empty">
+            </#if>
          </#if>
       ]
  <#break>
--- 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
@@ -8,7 +8,7 @@
        },
        "ID": {
            <#if dispute.dispute_preparation??>
-                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+               <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
                  "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
                <#else>
                  <#stop "preparation order list is empty" >
@@ -21,7 +21,7 @@
        },
        "Payload": {
            <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?trim?json_string}",
+                "Title":"${dispute.dispute_reference?json_string}",
             <#else>
                "Title":"",
            </#if>
@@ -39,29 +39,38 @@
                </#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_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
            <#else>
-                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
-                    "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
-                <#else>
-                    <#stop "Type not supported" >
+                <#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}",
+                        <#else>
+                            <#stop "WMS type code not supported">
+                        </#if>
+                    </#if>
                </#if>
            </#if>
-             <#-- To configure -->
-            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}"
            <#else>
                <#stop "Claim reason code not supported" >
            </#if>
-
-
        }
    }
 ]
+
+
+
+
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -21,7 +21,7 @@
       "Goods": {
           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
              "PriorityDate": "${priority_date}",
           <#else>
              "PriorityDate": "1970-01-01T00:00:00Z",
@@ -32,9 +32,11 @@
         },

        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          "OrderID": "${reflexMvtStockInterface.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>
        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
--- 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_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,7 +18,7 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? >
+           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
--- 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.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- 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.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+         "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaSup.ftl
+++ b/RFXtoRP_HsaSup.ftl
@@ -2,6 +2,9 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">

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

    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,

@@ -22,7 +16,6 @@
         {
        <#-- if Reflex WMS address is structured    -->
        <#if actor.supplier_structured_address?? >
-
          "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
@@ -36,7 +29,6 @@
          </#if>
 			    "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}",
 			    "State": "${actor.supplier_structured_address.country_designation?json_string}"
-
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if actor.optional_attributes?? >
@@ -47,7 +39,6 @@
            "CountryCode" : ""
          </#if>
        </#if>
-
         },
      <#if actor.optional_attributes?? >
        "Phones": ["${actor.optional_attributes.telephone?json_string}",
--- a/RFXtoRP_HsaSup_ActorDeleted.ftl
+++ b/RFXtoRP_HsaSup_ActorDeleted.ftl
@@ -1,6 +1,3 @@
-<#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.ActorCreated>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -11,20 +11,12 @@
    },
    "Payload": {
      "Name": "${depot.physical_depot_designation?json_string}",
-        "ManagedStock": true,
        "IsCarrier": false,
-    <#-- ***Partner ID could be added here *** -->
-      <#-- "PartnerID": "${}",  -->
-
-
    <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">,
-
-
      "Address":
         {
        <#-- if Reflex WMS address is structured    -->
        <#if depot.physical_depot_structured_address?? >
-
          "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}",
          "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}",
          "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
@@ -38,7 +30,6 @@
          </#if>
 			    "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}",
 			    "State": "${depot.physical_depot_structured_address.country_designation?json_string}"
-
        <#-- if Reflex WMS address is not structured    -->
        <#else>
          <#if depot.physical_depot_address??>
@@ -55,7 +46,7 @@
                  "${depot.physical_depot_address.other_number?json_string}"
                  ],
        </#if>
-       "Typology": "TYPOLOGY_UNKNOWN"
+       "Typology": "TYPOLOGY_WAREHOUSE"
       }
  }
 ]
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -6,6 +6,7 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">

 <#assign aDateTime = .now>

@@ -39,12 +40,6 @@
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-               },
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
               }
            </#if>

@@ -54,7 +49,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]?? >
+            <#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}>
               ,
               {
@@ -78,7 +73,7 @@
               "datas" :
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??>
+               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
               {
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -15,7 +15,7 @@
      "ProjectID": "${projectRP}"
      },
      "ID":{
-      "RefID": "${OrderOriginReference}"
+      "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"
      },
    "Payload":{
      "Carrier": {
--- 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_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) />
    {
@@ -77,19 +77,19 @@
           "ItemID": "${preparation_line.item_code?trim?json_string}",
           "LVBranchID": "${preparation_line.item_lv_code?json_string}",

-             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-				"PriorityDate": "${priority_date}",
-             <#else>
-				<#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-					<#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+          <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+				    <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+				    "PriorityDate": "${priority_date}",
+          <#else>
+            <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                "PriorityDate": "${priority_date}",
+              <#else>
+                <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                    "PriorityDate": "${priority_date}",
-                <#else>
-					<#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-						<#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
-                        "PriorityDate": "${priority_date}",
-					<#else>
-						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+                  <#else>
+                    <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
 							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
 							"PriorityDate": "${priority_date}",
 						<#else>
@@ -112,7 +112,8 @@
       <#-- 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.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
        <#else>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,29 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-[
-  <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  <#if !refIDHmap_local[OrderOriginReference]?? >
-      <#if refIDHmap_local?size != 0 >
-    ,
-    </#if>
-    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    {
-      "Header": {
-      "ProjectID": "${projectRP}"
-      },
-      "ID":{
-      "RefID": "${OrderOriginReference}"
-      },
-    "Payload":{
-      "Carrier": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-      }
-    }
-    }
-  </#if>
-  </#list>
-  <#assign refIDHmap_local ={}>
-]
--- 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,6 +9,31 @@
    "ProjectID": "${projectRP}"
    },
    "ID": {
+      <#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>
@@ -17,6 +43,7 @@
          "RefID":"${despatched_ipg.hd_number}",
        </#if>
      </#if>
+        </#switch>

      "RefDate": {
              "DateTime": "${dispatched_datetime4}",
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- 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.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
    "RefDate": {
            "DateTime": "${pro_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
@@ -31,54 +31,43 @@
        },
       "ShipFromAcked": true,
         "ShipTo": {
-          <#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 == "" &&
-          preparation_order.address.post_code_area_name == "" &&
-          preparation_order.address.territorial_division_code == "" &&
-          preparation_order.address.postal_code == "" &&
-          preparation_order.address.iso_country_code == "">
-            "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+          <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="">
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}"
          <#else>
-            "Actor":
-             {
-              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-              "Address" :
-                {
-                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                 <#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}"
-                 }
-                  },
-              "Contact" :
-                {
-                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
-                }
+            <#if preparation_order.address.address_type_code == "" &&
+            preparation_order.address.name_or_company_name == "" &&
+            preparation_order.address.additional_address_data_1 == "" &&
+            preparation_order.address.additional_address_data_2 == "" &&
+            preparation_order.address.post_code_area_name == "" &&
+            preparation_order.address.territorial_division_code == "" &&
+            preparation_order.address.postal_code == "" &&
+            preparation_order.address.iso_country_code == "">
+              "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+            <#else>
+              "Actor":
+              {
+                "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
+                "Address" :
+                  {
+                  "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
+                  "PostalCode" : "${preparation_order.address.postal_code!""}",
+                  "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                  "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                  "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
+                  }
+                    },
+                "Contact" :
+                  {
+                    "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
+                    "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
+                    "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
+                    "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                  }
+            </#if>
          </#if>
         },
-
+        "OrderID":"${preparation_order.originator_reference?trim?json_string}",
       <#if preparation_order.line_list??>
       "Lines" : [
           <#list preparation_order.line_list as preparation_order_line >
@@ -117,8 +106,14 @@
          {
             "RequestedDeliveryDateTime" :
             {
+              <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00">
+                <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) />
+                "DateTime": "${intermediate_delivery_start_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+              <#else>
                "DateTime": "${planned_final_delivery_start_datetime}",
-               "AuthorTimeZone": "${time_zone_rfx}"
+                "AuthorTimeZone": "${time_zone_rfx}"
+              </#if>
             }
         }
    }
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -17,7 +17,22 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
        <#if receipt.receipt_type = "030">
-        <#stop "ignored message because receipt type = transfert">
+        [
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+          }
+          ]
        <#else>
          [
          {
@@ -46,16 +61,37 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_confirmed == "true" >
+          <#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>
+                  "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>
              {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -71,6 +107,8 @@
            }
            </#if>
          </#if>
+              </#if>
+            </#if>
        <#else>
          <#stop "Receipt reference is empty">
        </#if>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,13 +26,18 @@

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

 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -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,12 +84,17 @@
 				<#-- ******* 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_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -105,6 +112,7 @@
 				"substitution_possible": "false"
 				-->

+
 				}
 			<#sep>,</#sep>
 			</#list>
--- a/RPtoRFX_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can 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 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can 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
@@ -3,7 +3,7 @@
 <#include "HfRpConfig.ftl">

 {
-	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -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,12 +38,17 @@
 			<#-- ******* 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_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -52,7 +58,6 @@
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
 			   		<#--"held_for_check": "false",
-			   		"held _for_repacking": "false",
 			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
 		 		}
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can 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 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can 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/2
+++ b/2
@@ -1 +1 @@
-1.2.38+1
+2.0.5+1
Author	SHA1	Message	Date
frea	6f361e1ffe	Release 2.0.5+1	2025-07-10 11:32:33 +02:00
Francis Reat	43e0a5ad0d	Merge branch 'SCPN1-8991-8980-9059-2.0' into 'release/2.0' SCPN1-8991-8980-9059-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!121	2025-07-10 09:31:47 +00:00
GROUP\frea	2a036decc0	SCPN1-9059	2025-07-10 09:54:08 +02:00
Laurie Montant	70b437619a	SCPN1-9059	2025-07-09 18:17:05 +02:00
Laurie Montant	578afb23ef	SCPN1-8980 (cherry picked from commit `f5971a6b06`)	2025-07-02 14:37:45 +02:00
GROUP\frea	fb329894cc	SCPN1-8991 (cherry picked from commit `9d7293d92e`)	2025-07-01 15:43:18 +02:00
frea	706d1d057a	Release 2.0.4+1	2025-06-20 17:57:11 +02:00
frea	20404a16df	Release 2.0.3+1	2025-05-27 09:57:49 +02:00
Francis Reat	7d4a28d5bb	Merge branch 'SCPN1-8800-2.0' into 'release/2.0' SCPN1-8800 into release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!111	2025-05-27 07:10:46 +00:00
Laurie Montant	78642ec0d6	SCPN1-8800 (cherry picked from commit `9a7f669192`)	2025-05-26 16:59:21 +02:00
freat	425bf5cb16	Release 2.0.2+2	2025-05-13 14:44:01 +02:00
Francis Reat	e7a39a2c5d	Merge branch 'SCPN1-8728-8696' into 'release/2.0' SCPN1-8728-8696 See merge request r-d-technique/tiers/reflex-wms-connector!106	2025-05-13 12:42:30 +00:00
frea	d87942900b	SCPN1-8728-8696	2025-05-13 11:19:35 +02:00
Cedric Rodier	362f34f2be	Merge branch 'main' into 'release/2.0' # Conflicts: # VERSION	2025-04-24 15:03:58 +00:00
freat	cd1fcf8876	Release 2.0.2+1	2025-04-24 14:29:13 +02:00
Cedric Rodier	06ebe4b5e0	Merge branch 'release-2.0' into 'main' MR->Main See merge request r-d-technique/tiers/reflex-wms-connector!103	2025-04-19 21:41:53 +00:00
frea	a33210827a	update version	2025-04-17 14:13:41 +02:00
frea	7b054e1f57	Merge branch 'release/2.0' # Conflicts: # RFXtoRP_HsaCons.ftl # RFXtoRP_HsaDispute_Created.ftl # RFXtoRP_HsrPrepa.ftl # VERSION	2025-04-17 13:53:11 +02:00
freat	2752e5b26e	Release 2.0.1+2	2025-04-15 18:28:42 +02:00
Francis Reat	6b0a3f0b24	Merge branch 'to-v10-connector2.0' into 'release/2.0' Modif typologie See merge request r-d-technique/tiers/reflex-wms-connector!101	2025-04-15 16:24:13 +00:00
Laurie Montant	c4f2161edb	Modif typologie (cherry picked from commit `a1c4b8a4ac`)	2025-04-15 18:23:06 +02:00
freat	80736c4a30	Release 2.0.1+1	2025-04-11 15:46:56 +02:00
Cedric Rodier	269c22e434	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!97	2025-04-09 13:51:31 +00:00
Vincent Le Maitre	e2a8404311	Release 2.0.0+1	2025-04-08 10:00:03 +02:00
Vincent LEMAITRE	11ab7068cd	New Major version 2.y.z	2025-04-08 07:57:49 +00:00
frea	3aee512fa1	adjsut version	2025-04-07 13:46:35 +02:00
frea	40d767406a	change executuionflow.Order.ID to eventRP.refid	2025-03-27 15:21:59 +01:00
Laurie Montant	d5efde68a9	modifs recipt	2025-03-24 15:59:20 +01:00
Laurie Montant	f31be2092e	modifs	2025-03-21 17:19:13 +01:00
Laurie Montant	24564d199e	claim	2025-03-21 17:09:37 +01:00
Laurie Montant	5397b211b4	depot actor	2025-03-21 11:31:45 +01:00
Laurie Montant	c3e584c43b	claim reference empty	2025-03-21 11:22:43 +01:00
Laurie Montant	cdc4ab6c3c	claim	2025-03-20 17:52:49 +01:00
Laurie Montant	9b4506912c	modifs actor	2025-03-20 17:44:33 +01:00
frea	e7fa9ec7b7	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-03-20 17:29:25 +01:00
frea	53c400be49	SCPN1-8474	2025-03-20 17:28:57 +01:00
Laurie Montant	bb6e68a697	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-03-20 17:21:27 +01:00
Laurie Montant	969560a0d1	modifs claim	2025-03-20 17:21:20 +01:00
frea	3f693dc4cb	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-03-20 17:10:26 +01:00
frea	02e8dc2566	SCPN1-8474	2025-03-20 17:09:41 +01:00
Laurie Montant	546891463b	modifs claim	2025-03-20 17:09:16 +01:00
frea	c5afde166a	SCPN1-8401 la correction a été perdue...	2025-03-19 17:50:55 +01:00
Laurie Montant	9e16ebae85	claim	2025-03-19 16:54:47 +01:00
Laurie Montant	546d46fc42	modifs	2025-03-19 15:11:14 +01:00
Laurie Montant	f14616784a	modifs	2025-03-19 15:06:59 +01:00
Cedric Rodier	2cae8c7a7c	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!94	2025-03-19 13:50:49 +00:00
frea	4115d9ec5f	SCPN1-8483 (cherry picked from commit `8ee7527ba4`)	2025-03-19 11:47:41 +01:00
Laurie Montant	9d99c0c65e	displayID	2025-03-19 10:44:16 +01:00
Laurie Montant	ff25781b84	claim	2025-03-13 15:07:49 +01:00
Laurie Montant	a045b37b7b	claim	2025-03-13 11:51:44 +01:00
Laurie Montant	337b011d4e	claim	2025-03-13 11:47:09 +01:00
Laurie Montant	7b4dfe0288	claim	2025-03-13 11:39:29 +01:00
Laurie Montant	da75ead70f	claim	2025-03-13 11:32:04 +01:00
Laurie Montant	b168b16931	claim	2025-03-13 11:28:34 +01:00
Cedric Rodier	04ce7e61f8	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!92	2025-03-13 09:54:24 +00:00
Laurie Montant	f76d632303	claim	2025-03-13 10:20:22 +01:00
frea	5963948635	update URL in readme.md	2025-03-12 15:05:01 +01:00
Laurie Montant	80965f3927	UTC	2025-03-12 10:14:55 +01:00
Laurie Montant	7ae70dae92	Ajout OrderID	2025-03-11 16:19:35 +01:00
frea	dbffc01a70	SCPN1-8401 (cherry picked from commit 0cec20a8aa91ce5d958a9d6087d4778f86f2c5fd)	2025-03-07 14:17:28 +01:00
frea	2681a4dc24	SCPN1-8401 (syntaxe error in RXftoRP-HsrReceiptList_ExecutionflowDetected.ftl et RXftoRP-HsrReceiptList_ExecutionflowReceiptComplet.ftl)	2025-03-06 16:13:36 +01:00
frea	9380d39bb6	SCPN1-8401 (syntaxe error in RXftoRP-HsrPro_ExecutionflowDetected.ftl)	2025-03-04 14:28:12 +01:00
Cedric Rodier	ba13f7cf59	add version 2.0 support	2025-03-03 11:01:03 +00:00
Cedric Rodier	707078c27c	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!89	2025-02-26 08:55:27 +00:00
Cedric Rodier	8257084a45	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!86	2025-02-18 09:56:58 +00:00
Cedric Rodier	23149a2bfe	Merge branch 'release/1.2' into 'main' MR -> Main See merge request r-d-technique/tiers/reflex-wms-connector!85	2025-02-12 11:54:04 +00:00
Cedric Rodier	6857ee0697	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!80	2024-12-15 11:20:14 +00:00
Cedric Rodier	a8ede37b09	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!79	2024-11-20 08:14:28 +00:00
Cedric Rodier	41195c4b84	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!77	2024-11-18 16:23:15 +00:00
Cedric Rodier	640c0f119a	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!75	2024-11-12 16:25:02 +00:00
Cedric Rodier	b745622d48	Merge branch 'release/1.2' into 'main' Release 1.2.29+1 See merge request r-d-technique/tiers/reflex-wms-connector!73	2024-11-06 14:02:45 +00:00
Cedric Rodier	c017ca670c	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!72	2024-11-05 13:10:16 +00:00
Cedric Rodier	7b22eea31d	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!70	2024-10-29 14:35:45 +00:00
Cedric Rodier	3d29596c22	Merge branch 'release/1.2' into 'main' SCPN1-7421 See merge request r-d-technique/tiers/reflex-wms-connector!69	2024-10-24 13:36:28 +00:00
Cedric Rodier	6c52bee18a	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!68	2024-10-17 15:46:39 +00:00
Cedric Rodier	a44ebe1430	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!66	2024-10-15 12:11:03 +00:00
Cedric Rodier	2beeac8a8a	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!64	2024-10-03 14:41:49 +00:00
Cedric Rodier	5b7f1808af	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!61	2024-09-30 12:13:58 +00:00
Cedric Rodier	16b439d07c	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!60	2024-09-16 15:10:59 +00:00
Cedric Rodier	03cbf4c93f	Merge branch 'release/1.2' into 'main' SCPN1-7065 See merge request r-d-technique/tiers/reflex-wms-connector!58	2024-09-02 09:04:17 +00:00
Cedric Rodier	156b06dc3b	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!56	2024-08-08 15:11:09 +00:00
Cedric Rodier	4a6998f885	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!55	2024-08-07 12:27:55 +00:00
Cedric Rodier	4cc36121ec	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!53	2024-08-06 14:17:58 +00:00
Cedric Rodier	8c8d20a6d5	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!51	2024-07-30 07:49:31 +00:00
Cedric Rodier	cb262cfe37	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!50	2024-07-24 12:21:46 +00:00
Cedric Rodier	1f4903ea3c	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!49	2024-07-22 09:14:39 +00:00
Cedric Rodier	562928a7cc	Merge branch 'release/1.2' into 'main' MR->main Release 1.2.18+1 See merge request r-d-technique/tiers/reflex-wms-connector!47	2024-07-12 09:49:36 +00:00
Cedric Rodier	da5513612b	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!46	2024-07-08 20:36:39 +00:00
Cedric Rodier	24ae26673f	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!44	2024-06-06 08:06:19 +00:00
Cedric Rodier	b290285e74	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!41	2024-05-31 08:17:26 +00:00
Cedric Rodier	3f3253c58b	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!39	2024-05-17 07:21:36 +00:00
Cedric Rodier	fdb7cf7d2c	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!37	2024-05-13 15:43:22 +00:00
Christian Senet	5b18bb79d9	Merge branch 'release/1.2' into 'main' Release 1.2.16+1 See merge request r-d-technique/tiers/reflex-wms-connector!35	2024-05-02 09:48:53 +00:00
Cedric Rodier	2e95864d6f	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!34	2024-04-26 08:29:56 +00:00
Cedric Rodier	01439a2f5f	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!32	2024-04-11 12:22:33 +00:00
Cedric Rodier	1145f22401	Merge branch 'release/1.2' into 'main' MR->main See merge request r-d-technique/tiers/reflex-wms-connector!30	2024-04-10 15:21:08 +00:00
Cedric Rodier	3cad254046	Merge branch 'release/1.2' into 'main' MR-main See merge request r-d-technique/tiers/reflex-wms-connector!27	2024-04-10 07:48:50 +00:00
Cedric Rodier	0b36faa2ae	Merge branch 'release/1.2' into 'main' Release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!22	2024-04-06 07:27:04 +00:00
Cedric Rodier	295731a1c1	Merge branch 'release/1.2' into 'main' Release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!19	2024-02-29 15:00:34 +00:00
Cedric Rodier	cc5a3521d3	Merge branch 'release/1.2' into 'main' Modifs RPtoRFX 2301241050 See merge request r-d-technique/tiers/reflex-wms-connector!14	2024-01-26 13:01:15 +00:00
Cedric Rodier	4f102c94be	Merge branch 'release/1.2' into 'main' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!11	2024-01-17 16:34:09 +00:00
Cedric Rodier	9fc489a1ac	Merge branch 'release/1.2' into 'main' Release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!8	2024-01-10 15:18:26 +00:00
Cedric Rodier	ac18cc3db9	Merge branch 'release/1.2' into 'main' Release 1.2.8+2 See merge request r-d-technique/tiers/reflex-wms-connector!6	2024-01-03 14:22:52 +00:00
Cedric Rodier	b0b4a1a953	Merge branch 'release/1.2' into 'main' Release 1.2.8+1 See merge request r-d-technique/tiers/reflex-wms-connector!5	2023-12-07 10:23:47 +00:00
Cedric Rodier	9e398a0ea6	Merge branch 'release/1.2' into 'main' Release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!4	2023-12-01 16:59:41 +00:00
Cedric Rodier	d66baafc55	Merge branch 'release/1.2' into 'main' Release 1.2.6+1 See merge request r-d-technique/tiers/reflex-wms-connector!3	2023-11-23 09:26:37 +00:00
Francis Reat	0da464c8b9	Merge branch 'release/1.2' into 'main' Release 1.2.6 See merge request r-d-technique/tiers/reflex-wms-connector!2	2023-11-06 16:19:34 +00:00
Cedric Rodier	8ea7fcca53	Merge branch 'release/1.2' into 'main' Release/1.2 See merge request r-d-technique/tiers/reflex-wms-connector!1	2023-10-26 12:53:12 +00:00
@@ -1 +1 @@
 .2.38+1
 .0.5+1