Release 1.2.25+1

Release 1.2.24+1
Release 1.2.23+2
2024-08-08 16:55:33 +02:00 · 2024-08-07 12:23:46 +02:00 · 2024-08-07 08:44:43 +02:00 · 2024-08-07 06:43:11 +00:00 · 2024-08-07 08:38:34 +02:00 · 2024-08-06 16:08:37 +02:00
77 changed files with 482 additions and 1380 deletions
--- a/ActorPrefix.ftl
+++ b/ActorPrefix.ftl
@@ -1,162 +0,0 @@
-
-<#-- --------------------------------------------------------------------------------------- -->
-<#-- Actor Prefix 4 cars                                                                         -->
-<#-- --------------------------------------------------------------------------------------- -->
-
-<#-- For Depot -->
-<#function RFXtoRPprefixDepot depot>
-  <#if uniqueness >
-    <#local actor = depot>
-  <#else>
-    <#if text_language_rfx ="fr">
-        <#local actor = "DEP_"+depot>
-    <#else>
-        <#if text_language_rfx ="it">
-            <#local actor = "DEP_"+depot>
-        <#else>
-            <#if text_language_rfx ="es">
-                <#local actor = "DEP_"+depot>
-            <#else>
-                <#if text_language_rfx ="pl">
-                    <#local actor = "MAG_"+depot>
-                <#else>
-                    <#if text_language_rfx ="nl">
-                        <#local actor = "DEP_"+depot>
-                    <#else>
-                        <#local actor = "DEP_"+depot>
-                    </#if>
-                </#if>
-            </#if>
-        </#if>
-    </#if>
-</#if>
-<#return (actor)>
-</#function>
-
-<#function RPtoRFXprefixDepot actor>
-  <#if uniqueness>
-    <#local depot = actor>
-  <#else>
-    <#local depot = actor[4..]>
-  </#if>
-<#return (depot)>
-</#function>
-
-
-
-<#-- For Supplier -->
-<#function RFXtoRPprefixSupplier supplier>
-  <#if uniqueness>
-    <#local actor = supplier>
-  <#else>
-    <#if text_language_rfx ="fr">
-        <#local actor = "FOU_"+supplier>
-    <#else>
-        <#if text_language_rfx ="it">
-            <#local actor = "FOR_"+supplier>
-        <#else>
-            <#if text_language_rfx ="es">
-                <#local actor = "PRO_"+supplier>
-            <#else>
-                <#if text_language_rfx ="pl">
-                    <#local actor = "DOS_"+supplier>
-                <#else>
-                    <#if text_language_rfx ="nl">
-                        <#local actor = "LEV_"+supplier>
-                    <#else>
-                        <#local actor = "SUP_"+supplier>
-                    </#if>
-                </#if>
-            </#if>
-        </#if>
-    </#if>
-</#if>
-<#return (actor)>
-</#function>
-
-<#function RPtoRFXprefixSupplier actor>
-  <#if uniqueness>
-    <#local supplier = actor>
-  <#else>
-    <#local supplier = actor[4..]>
-  </#if>
-<#return (supplier)>
-</#function>
-
-<#-- For Carrier -->
-<#function RFXtoRPprefixCarrier carrier>
-  <#if uniqueness>
-    <#local actor = carrier>
-  <#else>
-    <#if text_language_rfx ="fr">
-        <#local actor = "TRA_"+carrier>
-    <#else>
-        <#if text_language_rfx ="it">
-            <#local actor = "VET_"+carrier>
-        <#else>
-            <#if text_language_rfx ="es">
-                <#local actor = "TRA_"+carrier>
-            <#else>
-                <#if text_language_rfx ="pl">
-                    <#local actor = "PRZ_"+carrier>
-                <#else>
-                    <#if text_language_rfx ="nl">
-                        <#local actor = "VER_"+carrier>
-                    <#else>
-                        <#local actor = "CAR_"+carrier>
-                    </#if>
-                </#if>
-            </#if>
-        </#if>
-    </#if>
-</#if>
-<#return (actor)>
-</#function>
-
-<#function RPtoRFXprefixCarrier actor>
-  <#if uniqueness>
-    <#local carrier = actor>
-  <#else>
-    <#local carrier = actor[4..]>
-  </#if>
-<#return (carrier)>
-</#function>
-
-<#-- For Consignee -->
-<#function RFXtoRPprefixConsignee consignee>
-  <#if uniqueness>
-    <#local actor = consignee>
-  <#else>
-    <#if text_language_rfx ="fr">
-        <#local actor = "DES_"+consignee>
-    <#else>
-        <#if text_language_rfx ="it">
-            <#local actor = "DES_"+consignee>
-        <#else>
-            <#if text_language_rfx ="es">
-                <#local actor = "DES_"+consignee>
-            <#else>
-                <#if text_language_rfx ="pl">
-                    <#local actor = "ODB_"+consignee>
-                <#else>
-                    <#if text_language_rfx ="nl">
-                        <#local actor = "ONT_"+consignee>
-                    <#else>
-                        <#local actor = "CON_"+consignee>
-                    </#if>
-                </#if>
-            </#if>
-        </#if>
-    </#if>
-</#if>
-<#return (actor)>
-</#function>
-
-<#function RPtoRFXprefixConsignee actor>
-  <#if uniqueness>
-    <#local consignee = actor>
-  <#else>
-    <#local consignee = actor[4..]>
-  </#if>
-<#return (consignee)>
-</#function>
--- a/README.md
+++ b/README.md
@@ -6,6 +6,6 @@ These FTL core files aim to translate data flow from Reflex WMS into Reflex plat

 

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

 
--- a/RFX_PartnerAPP_Settings.ftl
+++ b/RFX_PartnerAPP_Settings.ftl
@@ -1 +0,0 @@
-<#assign trackingNumberSource = 3>
--- a/RFXtoRP_HfDtlStockLs.ftl
+++ b/RFXtoRP_HfDtlStockLs.ftl
@@ -50,11 +50,11 @@

      <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop >
+      <#stop "event not supported">
      <#break>


    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
+++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
@@ -1,6 +1,4 @@
 <#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  <#list reflexStockPicturesInterface.detailled_stock_list as stock>
  {
@@ -8,10 +6,10 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
+        "RefID": "${stock.physical_depot_code}"
            },
    "Payload": {      
-       <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
+       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
      "Snapshot": {
        "EndDateTime": {
           "DateTime": "${generation_date}",  
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -1,6 +1,4 @@
 <#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  <#list reflexStockPicturesInterface.detailled_stock_list as stock>
  {
@@ -8,8 +6,8 @@
      "ProjectID": "${projectRP}"
    },
    "Payload": {
-      "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}",
-      <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
+      "ActorID": "${stock.physical_depot_code}",
+      <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
      "Snapshot": {
        "DateTime": {
           "DateTime": "${generation_date}",
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
@@ -25,7 +25,7 @@
            },
           
            {
-            <#assign manufacturing_datetime = RfxDateTimetoUTCWithTimezone(stock.Date_of_manufacture,time_zone_rfx) />
+            <#assign manufacturing_datetime = RfxDateTimetoUTC(stock.Date_of_manufacture,time_zone_offset_rfx) />  
            "Key": "ManufacturingDate",
            "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
--- a/RFXtoRP_HfGrade.ftl
+++ b/RFXtoRP_HfGrade.ftl
@@ -14,6 +14,6 @@
 	        
 	    
 	<#default>
-	    <#stop >
+	    <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HfLvTypeList.ftl
+++ b/RFXtoRP_HfLvTypeList.ftl
@@ -16,6 +16,6 @@


 	<#default>
-	    <#stop >
+	    <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HfOwner.ftl
+++ b/RFXtoRP_HfOwner.ftl
@@ -14,6 +14,6 @@
 	        
 	    
 	<#default>
-	    <#stop >
+	    <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HfRpConfig.ftl
+++ b/RFXtoRP_HfRpConfig.ftl
@@ -28,6 +28,6 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of
          
      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#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">                       
@@ -44,6 +41,6 @@
          
      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -4,13 +4,20 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-            "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}"
+      "RefID": "${carrier.carrier_code?trim?json_string}"
    },
+
    "Payload": {
      "Name": "${carrier.carrier_designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": true,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->

+    <#--
    <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
+    -->
+

     "Address":
         {
@@ -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
@@ -4,8 +4,9 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}"
+      "RefID": "${carrier.carrier_code?trim?json_string}"
    },
+
    "Payload": {}
  }
 ]
--- 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">
@@ -45,6 +41,6 @@
          
      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -4,16 +4,23 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
+      "RefID": "${actor.code?trim?json_string}"
    },
+
    "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
@@ -4,8 +4,9 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
+      "RefID": "${actor.code?trim?json_string}"
    },
+
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -1,54 +0,0 @@
-<#-- **** 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 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 "Reference is empty">
-            </#if>
-          </#if>
-       ]
-  <#break>
-
-  <#case "D">
-      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop>
-      <#break>
-
-
-    <#default>
-          <#stop>
-</#switch>
-
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -1,74 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "Table.ftl">
-[
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-            <#if dispute.dispute_preparation??>
-               <#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" >
-                </#if>
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-            <#if dispute.dispute_reference?? && dispute.dispute_reference!="">
-                "Title":"${dispute.dispute_reference?json_string}",
-             <#else>
-                "Title":"",
-            </#if>
-            "Criticality":"${TableCriticality[dispute.dispute_criticity]}",
-            "Amount": {
-                <#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) />
-                <#if isCurrencyCode>
-                    "Currency" : "${dispute.dispute_amount_unit?upper_case?json_string}",
-                <#else>
-                    <#if TableAmount[dispute.dispute_amount_unit?json_string]??>
-                        "Currency" : "${TableAmount[dispute.dispute_amount_unit?json_string]}",
-                    <#else>
-                        "Currency" : "XXX",
-                    </#if>
-                </#if>
-                "Value": "${dispute.dispute_amount}"
-             },
-            <#-- To configure -->
-            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
-            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-            <#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}",
-                        <#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]}"
-            <#else>
-                <#stop "Claim reason code not supported" >
-            </#if>
-        }
-    }
-]
-
-
-
-
--- a/RFXtoRP_HsaDispute_MessageSent.ftl
+++ b/RFXtoRP_HsaDispute_MessageSent.ftl
@@ -1,124 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-           <#if dispute.dispute_preparation??>
-                <#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" >
-                </#if>
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-
-            <#if dispute.dispute_preparation??>
-                "Message": "${dispute.dispute_reference?trim?json_string}"
-            <#else>
-                <#if dispute.dispute_reception??>
-                    "Message": "${dispute.dispute_reception.reception_reference?trim?json_string}"
-                </#if>
-            </#if>
-
-        }
-    },
-     <#if dispute.dispute_quantity!=0 && dispute.dispute_item??>
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-            <#if dispute.dispute_preparation??>
-                <#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" >
-                </#if>
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-                "Message": "${dispute.dispute_item.item_code?trim?json_string} - ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
-        }
-    },
-    <#elseif dispute.dispute_item??>
-     {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-            <#if dispute.dispute_preparation??>
-                <#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" >
-                </#if>
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-                "Message": "${dispute.dispute_item.item_code?trim?json_string}"
-        }
-    },
-    <#elseif dispute.dispute_quantity!=0>
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-            <#if dispute.dispute_preparation??>
-                <#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" >
-                </#if>
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-                "Message": "${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
-        }
-    },
-    </#if>
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-            <#if dispute.dispute_preparation??>
-                <#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" >
-                </#if>
-            <#else>
-                <#if dispute.dispute_reception??>
-                "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
-                </#if>
-            </#if>
-        },
-        "Payload": {
-
-            "Message": " ${dispute.dispute_description?trim?json_string}"
-
-        }
-    }
-
-]
--- a/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
+++ b/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl
@@ -1,7 +0,0 @@
-<#-- Specify table for reason code -->
-<#assign TableReasonCode = {}/>
-
-
-
-
-
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -28,11 +28,7 @@
            reflexMvtStockInterface.ipg_move_type == "370" ||
            reflexMvtStockInterface.ipg_move_type == "400" ||
            reflexMvtStockInterface.ipg_move_type == "410" ||
-            reflexMvtStockInterface.ipg_move_type == "420" ||
-            reflexMvtStockInterface.ipg_move_type == "455" ||
-            reflexMvtStockInterface.ipg_move_type == "460" ||
-            reflexMvtStockInterface.ipg_move_type == "465" ||
-            (reflexMvtStockInterface.ipg_move_type == "520" && reflexMvtStockInterface.ipg_move_creation_program == "HFST69")
+            reflexMvtStockInterface.ipg_move_type == "420"
            >
            [
            {
@@ -72,11 +68,11 @@

      <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop >
+      <#stop "event not supported - Case D ">
      <#break>


    <#default>
-          <#stop>
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -1,8 +1,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
 [
-    <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
+    <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
 	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
    {
    "Header": {
@@ -30,16 +29,13 @@
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-
        <#if reflexMvtStockInterface.receipt_reference!="">
-          "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-          "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          "ExecutionflowID": "${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)}",
+        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -1,6 +1,5 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">

 <#assign MoveType_KV = {"130":"STOCK_MOVEMENT_TYPE_PRODUCTION",
            "200":"STOCK_MOVEMENT_TYPE_FIX",
@@ -15,14 +14,10 @@
            "370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
            "400":"STOCK_MOVEMENT_TYPE_FIX",
            "410":"STOCK_MOVEMENT_TYPE_FIX",
-            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
-            "455":"STOCK_MOVEMENT_TYPE_FIX",
-            "460":"STOCK_MOVEMENT_TYPE_FIX",
-            "465":"STOCK_MOVEMENT_TYPE_FIX",
-            "520":"STOCK_MOVEMENT_TYPE_OUTBOUND"
-            }>
-<#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
+            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>
+<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
+
 [
  {
    "Header": {
@@ -43,7 +38,7 @@

        "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}"
      },
-      "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
+      "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
      "Movement": {

       "DateTime": {
@@ -53,11 +48,7 @@
        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code?json_string}",
        "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": " 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>
        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
        <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
          "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
@@ -66,7 +57,7 @@
        "Quantity":
        {
        "LVID": "${quantity_in_base_lv_RP_Cst}",
-        <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs <= 0 >
+        <#if reflexMvtStockInterface.move_sign == "+">
          "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
        <#else>
          "Value": -${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -46,6 +46,6 @@
       
      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaItmLv.ftl
+++ b/RFXtoRP_HsaItmLv.ftl
@@ -40,6 +40,6 @@
       ] 
      <#break>      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -24,9 +24,7 @@
      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,

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

    <#-- Loop for the Logistical Variants - LV -->
        <#if item.logistical_variant_list??>
--- a/RFXtoRP_HsaLstCarSta.ftl
+++ b/RFXtoRP_HsaLstCarSta.ftl
@@ -1,40 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#stop>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE *************************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
-
-    <#default>
-          <#stop >
-</#switch>
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -72,10 +72,10 @@

   <#case "D">
      <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop >
+      <#stop "event not supported (case D)">
      <#break>

   <#default>
-      <#stop >
+      <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />

 [
  {
@@ -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
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
  {
    "Header": {
      "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
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
  {
    "Header": {
      "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
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
  {
    "Header": {
      "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
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
 [
  {
    "Header": {
      "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">          
@@ -44,6 +41,6 @@
          
      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -4,18 +4,25 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}"
+      "RefID": "${actor.code?trim?json_string}"
    },
+
    "Payload": {
      "Name": "${actor.designation?json_string}",
+        "ManagedStock": false,
        "IsCarrier": false,
+    <#-- ***Partner ID could be added here *** -->
+      <#-- "PartnerID": "${}",  -->

+    <#--
    <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">,
+    -->

      "Address":
         {
        <#-- 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
@@ -4,8 +4,9 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}"
+      "RefID": "${actor.code?trim?json_string}"
    },
+
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@@ -1,40 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#stop>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE *************************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
-
-    <#default>
-          <#stop >
-</#switch>
--- 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">                       
@@ -41,6 +41,6 @@
          
      
    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -1,22 +1,28 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}"
+      "RefID": "${depot.physical_depot_code?trim?json_string}"
    },
+
    "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,23 +36,21 @@
          </#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??>
          "Name": "${depot.physical_depot_address.company_name?json_string}",
          "StreetAddressOne" : "${depot.physical_depot_address.address_1?json_string}",
          "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}",
          "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}",
 		  "CountryCode" : ""
        </#if>
-        </#if>
+
         },
-         <#if depot.physical_depot_address??>
      "Phones": ["${depot.physical_depot_address.telephone?json_string}",
                 "${depot.physical_depot_address.other_number?json_string}"
                ],
-        </#if>
-       "Typology": "TYPOLOGY_WAREHOUSE"
+       "Typology": "TYPOLOGY_UNKNOWN"
       }
  }
 ]
--- a/RFXtoRP_HsrDepot_ActorDeleted.ftl
+++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl
@@ -1,14 +1,12 @@
-<#include "ReflexUtils.ftl">
-<#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}"
+      "RefID": "${depot.physical_depot_code?trim?json_string}"
    },
+
    "Payload": {}
  }
 ]
--- a/RFXtoRP_HsrLoadInfo.ftl
+++ b/RFXtoRP_HsrLoadInfo.ftl
@@ -1,40 +0,0 @@
-<#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
-<#-- project      : projectId in ReflexPlatform  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
-
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-
-<#assign aDateTime = .now>
-
-<#stop>
-
-<#switch cloudEventMsg.action>
-  <#case "C">
-  <#case "U">
-       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-          {
-
-          }
-       ]
-      <#break>
-
-    <#case "D">
-      <#-- *********************************************** Action = DELETE *************************** -->
-        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
-           {
-
-           }
-       ]
-       <#break>
-
-    <#default>
-          <#stop >
-</#switch>
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -6,7 +6,6 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
-<#include "RFX_PartnerAPP_Settings.ftl">

 <#assign aDateTime = .now>

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

            <#assign refIDHmap ={}>
-            <#assign hd_numberHmap ={}>
-            <#assign hd_numberHmapHUadded ={}>
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+            <#if despatched_ipg.consignment_unit_id!="">
               ,
               {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
@@ -73,17 +75,6 @@
               "datas" :
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
-               <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
-               }
-            </#if>
-
            </#if>
               </#list>
            </#list>
@@ -97,9 +88,9 @@
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
-<#stop>
+<#stop "event not supported (Case D)">
 <#break>

 <#default>
-<#stop>
+<#stop "event not supported">
 </#switch>
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,6 +1,5 @@
 <#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>
@@ -15,11 +14,11 @@
      "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": {
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
      }
      <#-- Add transport grade code
      <#if preparationOrder.transport_grade_code!="">
--- a/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl
@@ -2,6 +2,8 @@

 <#--
 "MetaData" :[
+             
          ]
+
 -->
 "MetaData": [            ]
--- a/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl
@@ -24,6 +24,7 @@
            <#else>
            "Value": { "Bool" : "False"}
            },
+           
            {
            <#assign manufacturing_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> 
            "Key": "ManufacturingDate",
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
+<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />

-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
        <#if refIDHmap?size != 0 >
--- a/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl
@@ -1,27 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
-[
-<#assign dispatched_datetime5 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID":"${despatched_ipg.hd_number}",
-      "RefDate": {
-              "DateTime": "${dispatched_datetime5}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-    "Payload": {
-      "HandlingunitID": "${despatched_ipg.hd_number}"
-	    <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-      ,
-	      "HUCarrier":{
-          "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-	        }
-	    </#if>
-    }
-  }
-]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
+<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.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
@@ -1,10 +1,8 @@
-<#include "ReflexUtils.ftl">
 <#include "HfRpConfig.ftl">
-<#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.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) />
+    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
    {
    "Header": {
      "ProjectID": "${projectRP}"
@@ -76,9 +74,12 @@
       "Goods": {
           "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 />
+           <#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>
+                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+                    <#assign priority_date = despatched_ipg.ipg_receipt_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)>
@@ -89,12 +90,8 @@
                                <#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)>
-							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
-							"PriorityDate": "${priority_date}",
-						<#else>
-							<#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-								<#assign priority_date = despatched_ipg.ipg_receipt_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 (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
@@ -112,14 +109,13 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-       "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-       "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
+       "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>
          "LineID": "${preparation_line.pro_line_number!0}",
        </#if>
-        "ActorID": "${RFXtoRPprefixDepot(preparationOrder.physical_depot_code?trim?json_string)}",
+       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
       "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${despatched_ipg.quantity_lvs}
@@ -128,6 +124,7 @@
      }
      ]
    }
+
  }<#sep>,</#sep>
  </#list>
  <#sep>,</#sep>
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -0,0 +1,28 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.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":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      }
+    }
+    }
+  </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
+]
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -1,54 +1,13 @@
 <#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) />
+
  {
    "Header": {
    "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>
-            <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-            </#if>
-          </#if>
-        </#switch>
-
-      "RefDate": {
-              "DateTime": "${dispatched_datetime4}",
-              "AuthorTimeZone": "${time_zone_rfx}"
-        }
+			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
      },
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000">
@@ -59,8 +18,9 @@
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
    ,
 	    "HUCarrier":{
-        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+	    "ActorID": "${preparationOrder.load_data.carrier_code?json_string}"
 	  }
+
 	  </#if>
    }
  }
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -29,17 +29,17 @@
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
            }
            <#else>
-           <#-- preparation order already confirmed -->
-            <#stop>
+            <#stop "preparation order already confirmed">
           </#if>

          <#else>
-          <#-- preparation order type not supported -->
-          <#stop>
+          <#stop "preparation order type not supported">
          </#if>
        <#else>
          <#stop "PRO reference is empty">
        </#if>
+
+
       ]
  <#break>

@@ -63,6 +63,6 @@


    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.modification_datetime,time_zone_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
 [
  {
    "Header": {
      "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
@@ -1,15 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
    "Header": {
      "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}"
@@ -27,14 +26,21 @@
                "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
        </#if> -->
        "ShipFrom": {
-          "ActorID": "${RFXtoRPprefixDepot(preparation_order.physical_depot_code?trim?json_string)}"
+        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
        },
       "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 == "" &&
@@ -42,7 +48,7 @@
          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)}"
+            "ActorID": "${preparation_order.end_consignee_code}"
          <#else>
            "Actor":
             {
@@ -65,9 +71,8 @@
                  "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 >
@@ -79,6 +84,7 @@
                </#if>
          <#-- Line Metadata inclusion -->
          <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
+
             "RequestedContent":
             {
                   "Goods":
@@ -89,8 +95,10 @@
                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />
                           "PriorityDate": "${forced_priority_date}",
                      </#if>
+
              <#--  Segmentation Keys inclusion -->
            <#include "RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl">
+
               },
               "Quantity" :
               {
@@ -102,18 +110,13 @@
           </#list>
         ],
         </#if>
+
         "RequestedMilestones" :
          {
             "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
@@ -17,22 +17,7 @@
      <#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">
-
-          }
-          ]
+        <#stop "ignored message because receipt type = transfert">
        <#else>
          [
          {
@@ -61,14 +46,6 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#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" >
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
@@ -76,6 +53,9 @@
              "datas" :
              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
            }
+          <#else>
+            <#if receipt.receipt_type = "030">
+              <#stop "ignored message because receipt type = transfert">
            <#else>
              {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -118,6 +98,6 @@


    <#default>
-          <#stop >
+          <#stop "event not supported">
 </#switch>

--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) />

 [
  {
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+      "RefID": "${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
@@ -1,15 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#include "ActorPrefix.ftl">
 [
  {
-  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+  <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
     "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.receipt_reference?trim?json_string}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,22 +25,19 @@

      "ShipFrom":
      {
-        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+      "ActorID": "${receipt.original_code?trim?json_string}"
      },
        "ShipTo"  :
      {
-         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
+      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
      },
      "ShipToAcked": true,
-      "OrderID":"${receipt.receipt_reference?trim?json_string}",

      <#if receipt.carrier_informations.carrier_code != "">
-        "Carrier":
-        {
-          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
-        },
+          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
      </#if>

+
      <#if receipt.line_list??>
       "Lines" : [
          <#list receipt.line_list as line>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) />
 [
  {
     "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.receipt_reference?trim?json_string}",
      "RefDate": {
        "DateTime": "${receipt_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />

 [
  {
@@ -8,7 +8,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+         "RefID": "${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
@@ -1,20 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -1,94 +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": {
-      "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}",
-      "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,19 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
-[
-  {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "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}",
-      "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-    "Payload": {
-    }
-  }
-]
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -1,21 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-         "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}",
-       "RefDate": {
-        "DateTime": "${receipt_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
-]
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@@ -22,21 +22,22 @@
 	      "AuthorTimeZone": "${time_zone_rfx}"
 	    },
 	    "TechMessage": {
-	      "Code": "${restResponsetMsg.status!"no Code"}",
+	      "Code": "${restResponsetMsg.status}",
 	      "Label": ${strJsonBody}
 	      },
 	    "UserMessage": {
-	      "Code": "${restResponsetMsg.status!"no Code"}",
+	      "Code": "${restResponsetMsg.status}",
 	      "Label": ${strJsonBody},
 	      "Params": []
 	    },
 	    "DetailElements": [],
-	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": ${strJsonBody},
+	    "CorrelationID": "${id.correlationid}",
+	    "ContextPayload": "rfxresponse",
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
-	    "Task": "${id.apiRestReflexID!"no Task"}",
-	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
+	    "Task": "${id.apiRestReflexID}",
+	    "OriginalID": "${id.refid?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
 ]
+
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -4,57 +4,16 @@
 <#-- organisation : organisationtId in ReflexPlatform  -->

 <#assign restResponsetMsg = JsonUtil.jsonToMap(input)>
-<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id!"{}")>
+<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>


 <#assign aDateTime = .now>
-<#assign no_apiRestReflexID = "no apiRestReflexID"> 
-<#assign no_status = -99999> 
-
-
-<#switch id.apiRestReflexID!no_apiRestReflexID>
-	 <#case no_apiRestReflexID>
-	   [
-		   {
-			 <#if restResponsetMsg.body?? >
-			   <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-			 <#else>
-			   <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-			 </#if>
-			 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-			 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-			 "datas" :
-				<#include "RFXtoRP_PlatformLogCreate.ftl">
-		   }
-	   ]
-	   <#break>

+<#switch id.apiRestReflexID>
 	  <#case "preparation_orders_post">
-			 <#switch restResponsetMsg.status!no_status>
-			     <#case no_status>
-				   [
-					   {
-					     <#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   }
-				   ]
-				   <#break>
-				   
+			 <#switch restResponsetMsg.status>
 	             <#case 200>
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
@@ -104,7 +63,7 @@
 					     <#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}}" />
+						 <#assign restResponseBody = "{}" />
 						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -122,29 +81,7 @@
 			   <#break>

    	<#case "receipts_post">
-			 <#switch restResponsetMsg.status!no_status>
-			     <#case no_status>
-				   [
-					   {
-					     <#if restResponsetMsg.body?? >
-						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
-						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
-					   }
-				   ]
-				   <#break>
-				   
+			 <#switch restResponsetMsg.status>
 	             <#case 200>
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
@@ -184,7 +121,7 @@
 						<#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 <#assign restResponseBody = "{}" />
 						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -200,6 +137,7 @@
 				   ]
               </#switch>
 		       <#break>
+
 	  <#default>
 	        <#stop>
 </#switch>
--- a/RFXtoRP_RestResponseAllocationError.ftl
+++ b/RFXtoRP_RestResponseAllocationError.ftl
@@ -7,7 +7,7 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${id.refid!"no RefID"?trim?json_string}",
+         "RefID": "${id.refid?trim?json_string}",
       "RefDate": {
        "DateTime": "${aDateTime?iso_utc}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_RfxConfigurationRp.ftl
+++ b/RFXtoRP_RfxConfigurationRp.ftl
@@ -25,19 +25,12 @@
  

 
-<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"Europe/Paris"}<#noparse>"></#noparse>
-<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+01:00"}<#noparse>"></#noparse>
+ <#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#noparse>"></#noparse>
+ <#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+00:00"}<#noparse>"></#noparse>  
  
 
 <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>
 <#noparse><#assign text_language_rfx   = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse> 
 </#list>

-<#list file.reflex_platform_project_list?filter(j -> j.name == projectRP) as reflex_platform_project_uniqueness>
- <#if reflex_platform_project_uniqueness.site_code_unicity??>
-<#noparse><#assign uniqueness = </#noparse>${reflex_platform_project_uniqueness.site_code_unicity?c}<#noparse>></#noparse>
-<#else>
-<#noparse><#assign uniqueness = </#noparse>false<#noparse>></#noparse>
-</#if>
-</#list>
  
--- a/RP_connector.ftl
+++ b/RP_connector.ftl
@@ -1,38 +0,0 @@
-<#-- ****
-Connector provides some of parameters through the class connectorParameters
-those parameters are stored in FTL file Conf-connector.ftl for later use in some of the data ftl files
-*** -->
-
-<#-- *********************************************** Parameter global ******************** -->
-<#assign file = JsonUtil.jsonToMap(input)>
-<#assign projectRP = project>
-<#assign organisationRP = organisation>
-<#assign aDateTime = .now>
-
-<#noparse><#-- Date of last generation : </#noparse>${aDateTime}<#noparse> --></#noparse>
-<#noparse><#-- /!\ Warning the file is generated, if you modify it manually, do not enable automatic update via the pipeline --></#noparse>
-
-<#noparse><#-- Possible values for SupplyOfTheTrackingNumber parameter : --></#noparse>
-<#noparse><#-- 0 : Always empty --></#noparse>
-<#noparse><#-- 1 : Always use Reflex WMS tracking --></#noparse>
-<#noparse><#-- 2 : Always use the HU number --></#noparse>
-<#noparse><#-- 3 : Use Reflex tracking if it exists, the HU number otherwise --></#noparse>
-
-<#list file.parameters as parameter>
-<#switch parameter.type>
-  <#case "string">
-     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = "</#noparse>${parameter.value!""}<#noparse>"></#noparse>
-     <#break>
-
-  <#case "integer">
-     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = </#noparse>${parameter.value!0}<#noparse>></#noparse>
-     <#break>
-
-  <#case "boolean">
-     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = </#noparse>${(parameter.value!false)?c}<#noparse>></#noparse>
-     <#break>
-
-  <#default>
-
-</#switch>
-</#list>
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -46,6 +46,6 @@
 		   ]  
 			<#break>
 	  <#default>
-	        <#stop >
+	        <#stop "Event not processed">
 </#switch>

--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -1,6 +1,4 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
-<#include "ActorPrefix.ftl">
-<#include "HfRpConfig.ftl">
 <#-- Valeurs par défaut Adresse -->
 <#-- Default values -->
 <#assign typecode ="010">
@@ -11,18 +9,18 @@
 <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
 <#assign defaultactor ="VIZ">
 <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
-	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
+	<#assign actorID = executionflow.ShipTo.ActorID >
 <#else>
 	<#assign actorID = defaultactor >
 </#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": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
+		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
 		"originator_code": "${originator_code}"
 	},
 	"payload" :
@@ -56,16 +54,12 @@
 				"address_type_code" : "${adresstypecode}",
 				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
 				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				<#if executionflow.ShipTo.Actor.Address.Name?? && executionflow.ShipTo.Actor.Address.Name!="">
-					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Address.Name!"")?json_string}",
-				<#else>
 				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				</#if>
 				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
-					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}",
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
 				</#if>
 				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
-					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]?json_string}",
+					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
 				</#if>
 				"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
 				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
@@ -95,7 +89,7 @@
 				"owner_code_to_prepare" :"${owner_code_to_prepare}",
 				"grade_code_to_prepare" :"${grade_code_to_prepare}",
 				"input_order_data": "false",
-				"batch_1": "${batch_1?json_string}",
+				"batch_1": "${batch_1}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
 				<#--
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -1,14 +1,12 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-<#include "ActorPrefix.ftl">
-<#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": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipTo.ActorID!"")}",
+		"physical_depot_code": "${executionflow.ShipTo.ActorID!""}",
 		"originator_code": "${originator_code}"
 	},
 	"payload" : 
@@ -17,8 +15,8 @@
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}", 
 		"work_mode_code" :     "${work_mode_code}",
-		"original_code"  : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}",
-		"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
+		"original_code"  : "${executionflow.ShipFrom.ActorID}",
+		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",

 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
@@ -49,9 +47,10 @@
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1?json_string!""}",
+				"batch_1": "${batch_1!""}",					
 				"optional_attributes": {
 			   		<#--"held_for_check": "false",
+			   		"held _for_repacking": "false",
 			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
 		 		}
--- a/Table.ftl
+++ b/Table.ftl
@@ -1,15 +0,0 @@
-<#-- Table criticality -->
-<#assign TableCriticality = {
-    "1": "CLAIM_CRITICALITY_LOW",
-    "2":"CLAIM_CRITICALITY_MEDIUM",
-    "3":"CLAIM_CRITICALITY_HIGH",
-    "4":"CLAIM_CRITICALITY_BLOCKING"
- }>
-
- <#-- Table Amount -->
-<#assign TableAmount = {
-    "$": "USD",
-    "£":"GBP",
-    "DH":"MAD"
- }>
-
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.2+1
+1.2.25+1
Author	SHA1	Message	Date
freat	087346139d	Release 1.2.25+1	2024-08-08 16:55:33 +02:00
freat	0a4263d551	Release 1.2.24+1	2024-08-07 12:23:46 +02:00
freat	b00302c8e3	Release 1.2.23+2	2024-08-07 08:44:43 +02:00
Francis Reat	55b7b54b44	Merge branch 'SCPN1-6998' into 'release/1.2' SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!54	2024-08-07 06:43:11 +00:00
frea	26003c24f2	SCPN1-6998	2024-08-07 08:38:34 +02:00
freat	0468700574	Release 1.2.23+1	2024-08-06 16:08:37 +02:00
Francis Reat	fe35481144	Merge branch 'SCPN1-6998' into 'release/1.2' SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!52	2024-08-06 13:48:36 +00:00
frea	d21204a949	SCPN1-6998	2024-08-06 15:41:22 +02:00
freat	46421972a8	Release 1.2.22+1	2024-07-29 17:33:09 +02:00
freat	ccca6d1592	Release 1.2.21+1	2024-07-29 17:32:32 +02:00
freat	68622896f0	Release 1.2.20+1	2024-07-24 10:47:24 +02:00
freat	fea5691ddd	Release 1.2.19+1	2024-07-22 10:18:15 +02:00
Francis Reat	2fb5dcd103	Merge branch 'SCPN1-6912' into 'release/1.2' Merge branch 'SCPN1-6564' into 'release/1.2' See merge request r-d-technique/tiers/reflex-wms-connector!48	2024-07-22 07:54:20 +00:00
frea	04253d939f	Merge branch 'develop' into SCPN1-6912	2024-07-19 11:24:12 +02:00
freat	b80623e631	Release 1.2.18+1	2024-07-12 10:51:31 +02:00
Vincent Le Maitre	23a87c1995	Release 1.2.17+2	2024-06-28 15:12:20 +02:00
Francis Reat	a3a2fa3b23	Merge branch '1.2.17+2' into 'release/1.2' adjust json_string See merge request r-d-technique/tiers/reflex-wms-connector!45	2024-06-27 08:27:17 +00:00
frea	22b26ac7d3	adjust json_string (cherry picked from commit `af29a11b22`)	2024-06-25 17:30:03 +02:00
frea	0b3f07add9	adjust json-string	2024-06-24 11:47:44 +02:00
Vincent Le Maitre	28659b1157	Release 1.2.17+1	2024-06-24 10:54:19 +02:00
frea	3de6a2f6a9	add json_string	2024-06-24 08:38:44 +02:00
frea	4afc7fa50c	securisation	2024-06-21 13:49:56 +02:00
frea	6910fb80a8	SCPN1-6605 MovementCreated (cherry picked from commit `e8510d079c`)	2024-06-21 13:32:56 +02:00
frea	1052849c12	correction dans le cas où la commande n'a pas de ligne...	2024-06-21 13:30:15 +02:00
freat	24a94caf29	Release 1.2.16+5	2024-06-06 09:45:59 +02:00
frea	513a5c2c3e	SCPN1-6692 (cherry picked from commit `2524859cd4`)	2024-06-06 09:16:38 +02:00
freat	011540fc51	Release 1.2.16+4	2024-05-30 17:20:55 +02:00
Francis Reat	5e9804db40	Merge branch 'SCPN1-6641' into 'release/1.2' SCPN1-6641 et SCPN1-6642 See merge request r-d-technique/tiers/reflex-wms-connector!42	2024-05-30 15:05:08 +00:00
frea	e344cca043	SCPN1-6642	2024-05-30 16:30:59 +02:00
frea	b0b4714df9	SCPN1-6641	2024-05-30 14:30:09 +02:00
freat	15bd095feb	Release 1.2.16+3	2024-05-16 17:55:49 +02:00
Francis Reat	c0dd029d1f	Merge branch 'SCPN1-6564' into 'release/1.2' SCPN1-6564 See merge request r-d-technique/tiers/reflex-wms-connector!38	2024-05-16 15:30:52 +00:00
frea	2e0d61310b	SCPN1-6564	2024-05-16 17:00:32 +02:00
freat	f62ccadba5	Release 1.2.16+2	2024-05-13 17:07:22 +02:00
Francis Reat	2c29166ccb	Merge branch 'SCPN1-6535' into 'release/1.2' modifs HUGP See merge request r-d-technique/tiers/reflex-wms-connector!36	2024-05-13 15:05:20 +00:00
Laurie Montant	4534155f2e	modifs HUGP (cherry picked from commit `b3da874dd3`)	2024-05-13 16:42:15 +02:00
freat	5948467818	Release 1.2.16+1	2024-05-02 10:21:58 +02:00
freat	c63e4ff5c8	Release 1.2.15+8	2024-04-24 18:23:25 +02:00
Francis Reat	457cfc85c2	Merge branch 'SCPN1-6461' into 'release/1.2' SCPN1-6461 See merge request r-d-technique/tiers/reflex-wms-connector!33	2024-04-24 16:19:29 +00:00
Laurie Montant	6809b32410	Création de commande (cherry picked from commit `82dfc05cdb`)	2024-04-24 17:49:09 +02:00
freat	37a5e64e83	Release 1.2.15+7	2024-04-11 11:22:18 +02:00
Francis Reat	2f31833bc3	Merge branch 'versio-1.2.15' into 'release/1.2' Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31	2024-04-11 09:21:32 +00:00
Laurie Montant	cff0f18d8a	modifs ipgmove (cherry picked from commit `6b6cef5332`)	2024-04-11 11:12:11 +02:00
freat	22b78b4ffe	Release 1.2.15+6	2024-04-10 16:57:58 +02:00
Francis Reat	25bf3110e9	Merge branch 'versio-1.2.15' into 'release/1.2' modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29	2024-04-10 14:56:34 +00:00
Laurie Montant	0a32ead29a	modifs hsrpro (cherry picked from commit `d7c9c72762`)	2024-04-10 16:39:48 +02:00
freat	46a9dc8996	Release 1.2.15+5	2024-04-09 17:45:00 +02:00
Francis Reat	1eb262c91c	Merge branch 'versio-1.2.15' into 'release/1.2' SCPN1-6368 See merge request r-d-technique/tiers/reflex-wms-connector!28	2024-04-09 15:40:44 +00:00
Laurie Montant	2588fda3a8	modifs ipg (cherry picked from commit `87efb21e64`)	2024-04-09 17:16:18 +02:00
freat	d060d3eb10	Release 1.2.15+4	2024-03-27 15:03:49 +01:00
Francis Reat	28e99e9a2b	Merge branch 'version-1.2.15' into 'release/1.2' SCPN1-6284 See merge request r-d-technique/tiers/reflex-wms-connector!26	2024-03-27 14:01:44 +00:00
frea	78b0b467a3	Merge branch 'develop' into version-1.2.15	2024-03-26 14:07:53 +01:00
freat	6f287e878a	Release 1.2.15+3	2024-03-21 17:39:10 +01:00
Francis Reat	c3a23254b1	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!25	2024-03-21 16:32:23 +00:00
frea	c47672b8cc	Merge branch 'develop' into version-1.2.15	2024-03-21 17:27:44 +01:00
freat	9cdcd2784d	Release 1.2.15+2	2024-03-21 09:38:35 +01:00
Francis Reat	cfe6bddf8d	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!24	2024-03-21 07:48:06 +00:00
frea	0cb3cc7dd0	update priority_date	2024-03-21 08:45:48 +01:00
Vincent Le Maitre	6b633663e9	Release 1.2.15+1	2024-03-19 16:50:50 +01:00
Francis Reat	c801c574ab	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!23	2024-03-19 15:04:39 +00:00
frea	6282266c6d	Merge branch 'develop' into version-1.2.15	2024-03-19 08:53:51 +01:00
frea	cb9d61bfe9	version-1.2.15	2024-03-15 16:55:08 +01:00
Vincent Le Maitre	60c6f812d1	Release 1.2.14+1	2024-03-12 10:02:52 +01:00
Vincent LEMAITRE	c2f6537e0c	Merge branch 'version-1.7' into 'release/1.2' Version 1.7 See merge request r-d-technique/tiers/reflex-wms-connector!20	2024-03-12 08:56:33 +00:00
frea	f5970127b0	update version	2024-03-12 09:55:32 +01:00
Vincent LEMAITRE	33c7ab08a7	reverted VERSION	2024-03-12 08:51:41 +00:00
Vincent Le Maitre	fb8f9ca651	Release 1.2.14+1	2024-03-12 09:31:26 +01:00
frea	16c7d6b686	Merge branch 'develop' into version-1.7 # Conflicts: # RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl # RFXtoRP_HfLvTypeList.ftl # RFXtoRP_HsaIpgMove.ftl # RFXtoRP_HsaIpgMove_GoodsReceived.ftl # RFXtoRP_HsaIpgMove_StockMoved.ftl # RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl # RFXtoRP_HsaItm_ItemCreated.ftl # RFXtoRP_HsaProStatus.ftl # RFXtoRP_HsrPrepa.ftl # RFXtoRP_HsrPrepa_CarrierUpdated.ftl # RFXtoRP_HsrPrepa_GoodsPrepared.ftl # RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl # RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl # RFXtoRP_HsrPro.ftl # RFXtoRP_HsrPro_ExecutionflowDetected.ftl # RFXtoRP_HsrReceiptList.ftl # RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl # ReflexUtils.ftl # VERSION	2024-03-12 08:11:21 +01:00
Vincent Le Maitre	fc919c2199	Release 1.2.13+1	2024-03-11 16:13:48 +01:00
freat	3365a94098	Release 1.2.12+3	2024-02-29 15:35:54 +01:00
Francis Reat	e055eab522	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!18	2024-02-29 14:35:25 +00:00
frea	c95bdc7f00	SCPN1-6093	2024-02-29 15:32:01 +01:00
freat	319cb6cc51	Release 1.2.12+2	2024-02-29 14:51:31 +01:00
Francis Reat	1f289e229c	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!17	2024-02-29 13:30:33 +00:00
frea	fba36b5d77	SCPN1-6093	2024-02-29 14:16:53 +01:00
freat	892812e85e	Release 1.2.12+1	2024-02-16 11:51:17 +01:00
freat	a512e4c23a	Release 1.2.11+1	2024-01-26 11:15:57 +01:00
Francis Reat	884ad540fe	Update VERSION to roolback to 1.2.10+2	2024-01-26 10:02:42 +00:00
freat	3a9620e3ee	Release 1.2.2+1	2024-01-26 10:56:09 +01:00
Francis Reat	d5573b6dba	Merge branch 'SCPN-5764' into 'release/1.2' Modifs RPtoRFX 2301241050 See merge request r-d-technique/tiers/reflex-wms-connector!13	2024-01-26 09:52:43 +00:00
Laurie Montant	162b73e75f	Modifs RPtoRFX 2301241050 (cherry picked from commit `56cd76fe0e`)	2024-01-25 11:22:41 +01:00
Laurie Montant	bb4315bba1	SCPN1-5764	2024-01-25 11:13:44 +01:00
freat	c4910785e0	Release 1.2.10+2	2024-01-17 15:29:36 +01:00
Francis Reat	5688244be2	Update VERSION to roolback to 1.2.10+1	2024-01-17 13:34:06 +00:00
freat	de5e94be3c	Release 1.2.1+1	2024-01-17 13:58:26 +01:00
Francis Reat	646256d879	Merge branch 'SCPN1-5711' into 'release/1.2' SCPN1-5711 See merge request r-d-technique/tiers/reflex-wms-connector!12	2024-01-17 12:49:38 +00:00
frea	60355d1ba5	SCPN1-5711	2024-01-17 13:47:38 +01:00
freat	737763dc7f	Release 1.2.10+1	2024-01-17 10:16:31 +01:00
Francis Reat	098b2d4e1d	Merge branch 'SCPN1-5711' into 'release/1.2' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!10	2024-01-17 09:05:46 +00:00
Francis Reat	7b55a4bcd0	Merge branch 'cherry-pick-ca30958d' into 'SCPN1-5711' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!9	2024-01-17 09:02:23 +00:00
Laurie Montant	b369dd8adf	Modifs RPtoRFX 1701240947 (cherry picked from commit `ca30958d35`)	2024-01-17 09:02:01 +00:00
frea	fd1cfcc2c5	SCPN1-5711	2024-01-17 10:00:31 +01:00
freat	fc8290648f	Release 1.2.9+1	2024-01-10 10:40:42 +01:00
Francis Reat	378c1ba75f	Merge branch 'SCPN1-5651' into 'release/1.2' Resolve SCPN1-5651 See merge request r-d-technique/tiers/reflex-wms-connector!7	2024-01-10 09:33:49 +00:00
frea	d94a74d399	Partial Merge branch 'develop' into SCPN1-5651	2024-01-09 17:17:26 +01:00
freat	a882ac4b86	Release 1.2.8+2	2024-01-03 14:42:40 +01:00
frea	d2d9443fc7	bug SCPN1-5632	2024-01-03 13:32:45 +01:00
Vincent Le Maitre	30ae93b9e7	Release 1.2.8+1	2023-12-06 15:48:59 +01:00
Vincent Le Maitre	64e03640d1	Release 1.2.7+2	2023-12-01 16:06:45 +01:00
Laurie Montant	270f90a9b3	Modif HsrPrepa 0112231019	2023-12-01 16:05:47 +01:00
Laurie Montant	b5c85220b5	Modifs FTL 2211231645	2023-12-01 16:05:36 +01:00
Laurie Montant	2409cf3a01	Modif FTL 2211231459	2023-12-01 16:05:11 +01:00
Laurie Montant	957df51487	Modifs FTL 2211231443	2023-12-01 16:04:57 +01:00
Laurie Montant	d09fa33577	Modif 2011231720 HsrPro	2023-12-01 16:04:46 +01:00
Laurie Montant	3bcdec1d5d	Modif alignement champs techniques Reflex HsrPro 2011231657	2023-12-01 16:04:35 +01:00
Vincent Le Maitre	b4ea1e7798	Release 1.2.7+1	2023-12-01 14:29:46 +01:00
Vincent LEMAITRE	80aecb3aa7	Update VERSION	2023-12-01 13:27:11 +00:00
Vincent Le Maitre	e02218f7b1	Release 1.2.6+2	2023-12-01 14:23:58 +01:00
Cedric Rodier	6270992346	Release 1.2.6+1	2023-11-23 10:02:38 +01:00
Vincent Le Maitre	a544f6700d	Release 1.2.6	2023-11-03 09:23:43 +01:00
Vincent Le Maitre	04ec57377a	Release 1.2.5	2023-10-24 16:47:19 +02:00
Vincent Le Maitre	b209e8b5e1	release 1.2.4	2023-10-24 08:22:11 +02:00
@@ -1 +1 @@
 .0.2+1
 .2.25+1