Release 2.0.8+1

SCPN1-9296-2.0

See merge request r-d-technique/tiers/reflex-wms-connector!133

ActorPrefix.ftl

@@ -0,0 +1,162 @@
+
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- 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>

README.md

@@ -1,11 +1,20 @@
 # Reflex Platform Core FTLs
 
- 
+## Overview
 
-These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.
+The **Reflex WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from Reflex WMS** into **flows compatible with Reflex Platform**.
 
- 
+This connector does not contain any standalone executable code: it is intended to be used by **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
 
-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/
+## Role of the FTL Files
 
- 
+- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, etc.).
+- These templates use the **FreeMarker** syntax to:
+  - Extract the required fields from the WMS source flow.
+  - Apply transformation rules (mapping, conversions, enrichments).
+  - Generate a **final structured JSON** for Reflex Platform.
+
+## Useful Resources
+
+- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html)
+- [Reflex Platform](https://auth.reflex-platform.com/)

RFX_PartnerAPP_Settings.ftl

@@ -0,0 +1 @@
+<#assign trackingNumberSource = 3>

RFXtoRP_HfDtlStockLs.ftl

@@ -50,11 +50,11 @@
 
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported">
+      <#stop >
       <#break>
 
 
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl

@@ -1,27 +1,29 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   <#list reflexStockPicturesInterface.detailled_stock_list as stock>
   {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
-        "RefID": "${stock.physical_depot_code}"
+      "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
-            },
+      },
-    "Payload": {      
+    "Payload": {
-       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+       <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
       "Snapshot": {
         "EndDateTime": {
-           "DateTime": "${generation_date}",  
+           "DateTime": "${generation_date}",
-           "AuthorTimeZone": "${time_zone_rfx}"              
+           "AuthorTimeZone": "${time_zone_rfx}"
-         },   
+         },
-              "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+          "ID":  "${stock.physical_depot_code}-${idSnapshot}",
-              "MessageNb": ${sum_elt}
+          "MessageNb": ${sum_elt}
        }
-             
+
     }
   }
   <#break>
-  </#list>  
+  </#list>
 ]
 

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -1,4 +1,6 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   <#list reflexStockPicturesInterface.detailled_stock_list as stock>
   {
@@ -6,19 +8,19 @@
       "ProjectID": "${projectRP}"
     },
     "Payload": {
-      "ActorID": "${stock.physical_depot_code}",
+      "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}",
-      <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+      <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
       "Snapshot": {
         "DateTime": {
            "DateTime": "${generation_date}",
            "AuthorTimeZone": "${time_zone_rfx}"
          },
-              "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+          "ID":  "${stock.physical_depot_code}-${idSnapshot}",
-              "Quantity":
+      "Quantity":
-              {
+      {
-                "Value" : "${stock.quantity_in_base_lvs!"0"}",
+        "Value" : "${stock.quantity_in_base_lvs!"0"}",
-                "LVID": "${quantity_in_base_lv_RP_Cst}"
+        "LVID": "${quantity_in_base_lv_RP_Cst}"
-              }
+      }
        },
 
        "Goods": {

RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl

@@ -17,21 +17,21 @@
                   "Value": { "String" : "no batch"}
                 <#else>
                    "Value": { "String" : "${stock.batch_1}"}
-            </#if>  
+            </#if>
             },
             {
             "Key": "HeldForSpecificCode",
             "Value": { "Bool" : "${stock.held_for_specific_code}"}
             },
-           
+
             {
-            <#assign manufacturing_datetime = RfxDateTimetoUTC(stock.Date_of_manufacture,time_zone_offset_rfx) />  
+            <#assign manufacturing_datetime = RfxDateTimetoUTCWithTimezone(stock.Date_of_manufacture,time_zone_rfx) />
             "Key": "ManufacturingDate",
             "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_datetime}"
 						  }
-            } 
+            }
           ]
 -->
 

RFXtoRP_HfGrade.ftl

@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,11 +9,11 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Grades">	
+		<#stop "no generic FTL file available yet for Grades">
 	<#break>
-	        
+
-	    
+
 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>
 

RFXtoRP_HfLvTypeList.ftl

@@ -16,6 +16,6 @@
 
 
 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>
 

RFXtoRP_HfOwner.ftl

@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,11 +9,11 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Owners">	
+		<#stop "no generic FTL file available yet for Owners">
 	<#break>
-	        
+
-	    
+
 	<#default>
-	    <#stop "event not supported">
+	    <#stop >
 </#switch>
 

RFXtoRP_HfRpConfig.ftl

@@ -4,7 +4,7 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of
 *** -->
 
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -16,18 +16,18 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign file = JsonUtil.jsonToMap(dataRfx)>
-     
+
       <#include "RFXtoRP_RfxConfigurationRp.ftl">
-                
+
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#stop "deletion of config not supported">
       <#break>
-          
+
-      
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HliPrepaL.ftl

@@ -0,0 +1,31 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+<#case "C">
+<#--<#case "U">
+    <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+    <#stop "no generic FTL file available yet for preparationOrderLines">
+    <#break>
+<#case "D">
+    <#-- *********************************************** Action = DELETE ******************** -->
+    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+    <#stop "no generic FTL file available yet for preparationOrderLines">
+    <#break>
+<#break>
+
+<#default>
+<#stop>
+</#switch>

RFXtoRP_HliReceiptLr.ftl

@@ -0,0 +1,34 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+    <#case "U">
+        <#-- *********************************************** Action = CREATE ******************** -->
+
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
+
+        <#stop "no generic FTL file available yet for receiptLines">
+        <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
+
+        <#stop "no generic FTL file available yet for receiptLines">
+        <#break>
+
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HlrProL.ftl

@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for preparationOrderLines">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for preparationOrderLines">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HsaCarrier.ftl

@@ -2,8 +2,11 @@
 <#-- 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 cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -14,33 +17,33 @@
   <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
+          "datas" :
-              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">                       
+              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">
          }
-       ]  
+       ]
   <#break>
-      
+
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************************* -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaCarrier_ActorDeleted.ftl">          
+          <#include "RFXtoRP_HsaCarrier_ActorDeleted.ftl">
          }
-       ]  
+       ]
          <#break>
-          
+
-      
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -4,20 +4,13 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+            "RefID": "${RFXtoRPprefixCarrier(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":
          {
@@ -29,17 +22,22 @@
           "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
           "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
-          "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
+          <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) />
+          <#if isCountryCode>
+            "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#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??>
             "Name": "${carrier.address.company_name?json_string}",
             "StreetAddressOne" : "${carrier.address.address_1?json_string}",
             "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
-            "StreetAddressThree" : "${carrier.address.address_3?json_string}"
+            "StreetAddressThree" : "${carrier.address.address_3?json_string}",
+             "CountryCode" : ""
           </#if>
         </#if>
          },

RFXtoRP_HsaCarrier_ActorDeleted.ftl

@@ -4,9 +4,8 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${carrier.carrier_code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}"
     },
-
     "Payload": {}
   }
 ]

RFXtoRP_HsaCons.ftl

@@ -2,8 +2,11 @@
 <#-- 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 cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -14,33 +17,34 @@
     <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign actor = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-       [  
+      [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaCons_ActorCreated.ftl">          
+          <#include "RFXtoRP_HsaCons_ActorCreated.ftl">
          }
-       ]  
+       ]
+
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign actor = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaCons_ActorDeleted.ftl">          
+          <#include "RFXtoRP_HsaCons_ActorDeleted.ftl">
          }
-       ]  
+       ]
       <#break>
-          
+
-      
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -4,23 +4,16 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixConsignee(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??>
 
@@ -29,7 +22,12 @@
         "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
         "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
         "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
-        "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
+        <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) />
+         <#if isCountryCode>
+            "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#if>
 			  "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}",
 			  "State": "${actor.consignee_structured_address.country_designation?json_string}"
 
@@ -40,7 +38,8 @@
             "Name": "${actor.address.company_name?json_string}",
             "StreetAddressOne" : "${actor.address.address_1?json_string}",
             "StreetAddressTwo" : "${actor.address.address_2?json_string}",
-            "StreetAddressThree" : "${actor.address.address_3?json_string}"
+            "StreetAddressThree" : "${actor.address.address_3?json_string}",
+             "CountryCode" : ""
           </#if>
         </#if>
        },

RFXtoRP_HsaCons_ActorDeleted.ftl

@@ -4,9 +4,8 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
     },
-
     "Payload": {}
   }
 ]

RFXtoRP_HsaDispute.ftl

@@ -0,0 +1,50 @@
+<#-- **** 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 >
+            {
+              <#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>
+          </#if>
+       ]
+  <#break>
+
+  <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop>
+      <#break>
+
+
+    <#default>
+          <#stop>
+</#switch>
+

RFXtoRP_HsaDispute_ClaimMetadata.ftl

@@ -0,0 +1,4 @@
+<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
+
+
+"MetaData": [        ]

RFXtoRP_HsaDispute_Created.ftl

@@ -0,0 +1,91 @@
+<#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}"
+             },
+            <#-- Claim metadata inclusion  -->
+            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
+            <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
+            <#if dispute.dispute_type_code=="050" > <#-- Preparation -->
+                <#if dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!="">
+                    "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                    "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#else>
+                    "EntityID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
+                    "DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}",
+                </#if>
+            <#else>
+                <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
+                    <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type -->
+                        <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" >
+                            "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                        <#else>
+                            <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!="">
+                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                                "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                            <#else>
+                                "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                                "DisplayID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                            </#if>
+                        </#if>
+                    <#else>
+                        <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
+                            "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
+                            "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
+                        <#else>
+                            <#stop "WMS type code not supported">
+                        </#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>
+        }
+    }
+]
+
+
+
+

RFXtoRP_HsaDispute_MessageSent.ftl

@@ -0,0 +1,124 @@
+<#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}"
+
+        }
+    }
+
+]

RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl

@@ -0,0 +1,7 @@
+<#-- Specify table for reason code -->
+<#assign TableReasonCode = {}/>
+
+
+
+
+

RFXtoRP_HsaIpgMove.ftl

@@ -24,13 +24,19 @@
             reflexMvtStockInterface.ipg_move_type == "260" ||
             reflexMvtStockInterface.ipg_move_type == "290" ||
             reflexMvtStockInterface.ipg_move_type == "300" ||
+            reflexMvtStockInterface.ipg_move_type == "350" ||
+            reflexMvtStockInterface.ipg_move_type == "370" ||
             reflexMvtStockInterface.ipg_move_type == "400" ||
             reflexMvtStockInterface.ipg_move_type == "410" ||
-            reflexMvtStockInterface.ipg_move_type == "420"
+            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")
             >
             [
             {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :
                <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
@@ -41,7 +47,6 @@
                <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                      reflexMvtStockInterface.ipg_move_type == "110" ||
                      reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                         [
                         {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@@ -50,10 +55,6 @@
                         <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
                         }
                         ]
-                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
-                     </#if>
                <#else>
                   <#stop>
                </#if>
@@ -66,11 +67,11 @@
 
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported - Case D ">
+      <#stop >
       <#break>
 
 
     <#default>
-          <#stop "event not supported">
+          <#stop>
 </#switch>
 

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -1,7 +1,8 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
-    <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+    <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
     {
     "Header": {
@@ -20,18 +21,42 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           "PriorityDate": "${priority_date}",
+           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
-
+              "PriorityDate": "${priority_date}",
+           <#else>
+              "PriorityDate": "1970-01-01T00:00:00Z",
+            </#if>
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
-        <#if reflexMvtStockInterface.receipt_reference!="">
+        <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
-          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+          <#else>
+            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+              "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            <#else>
+              "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            </#if>
+          </#if>
         <#else>
-          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          <#else>
+            "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+          </#if>
         </#if>
-        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+        <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
-        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
+        <#else>
+          "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+        </#if>
+        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
         "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
             "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}

RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl

@@ -18,21 +18,21 @@
                   "Value": { "String" : "no batch"}
                 <#else>
                    "Value": { "String" : "${reflexMvtStockInterface.batch_1}"}
-            </#if>  
+            </#if>
             },
             {
             "Key": "HeldForSpecificCode",
             "Value": { "Bool" : "${reflexMvtStockInterface.ipg_specific_code_held}"}
             },
-           
+
             {
-            <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc /> 
+            <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc />
             "Key": "ManufacturingDate",
             "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_date}"
 						  }
-            } 
+            }
           ]
 
 -->

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -1,5 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 
 <#assign MoveType_KV = {"130":"STOCK_MOVEMENT_TYPE_PRODUCTION",
             "200":"STOCK_MOVEMENT_TYPE_FIX",
@@ -10,12 +11,18 @@
             "260":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "290":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
             "300":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
+            "350":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
+            "370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS",
             "400":"STOCK_MOVEMENT_TYPE_FIX",
             "410":"STOCK_MOVEMENT_TYPE_FIX",
-            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}>
+            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
-<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+            "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) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
-
 [
   {
     "Header": {
@@ -36,7 +43,7 @@
 
         "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}"
       },
-      "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
+      "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
       "Movement": {
 
        "DateTime": {
@@ -46,7 +53,11 @@
         "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}",
-        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
+        <#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}",
@@ -55,7 +66,7 @@
         "Quantity":
         {
         "LVID": "${quantity_in_base_lv_RP_Cst}",
-        <#if reflexMvtStockInterface.move_sign == "+">
+        <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs <= 0 >
           "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
         <#else>
           "Value": -${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}

RFXtoRP_HsaItm.ftl

@@ -3,7 +3,7 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -15,37 +15,38 @@
     <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign item = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign item = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-           <#if item.logistical_variant_list?? >
+           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :   
+           "datas" :
-            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">  
+            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
         <#else>
-          <#stop "no LV for the item">
+          <#--  "no LV for the item"-->
+          <#stop>
         </#if>
          }
        ]
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign item = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign item = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemDeleted> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemDeleted>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaItm_ItemDeleted.ftl">  
+          <#include "RFXtoRP_HsaItm_ItemDeleted.ftl">
          }
-       ] 
+       ]
        <#break>
-       
+
-      
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaItmLv.ftl

@@ -3,7 +3,7 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -15,31 +15,31 @@
     <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign lv = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign lv = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantUpdated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantUpdated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl">          
+          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl">
          }
-       ]  
+       ]
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign lv = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign lv = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantRemoved>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl">  
+          <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl">
          }
-       ] 
+       ]
-      <#break>      
+      <#break>
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -12,12 +12,12 @@
            {
           "LVID": "${lv.logistical_variant_code?json_string}",
           "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??>
+          <#if lv.id_list??  && (lv.id_list?size == lv.id_list?filter(l ->l??)?size)>
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                      "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                      "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                    }<#sep>,</#sep>
                      </#list>
                    ],

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -24,7 +24,9 @@
       <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
 
       <#-- Item Photo URI could be added here -->
-      <#--"PhotoURI": " ", -->
+      <#if item.url?? && item.url!="">
+        "PhotoURI": "${item.url?json_string}",
+      </#if>
 
     <#-- Loop for the Logistical Variants - LV -->
         <#if item.logistical_variant_list??>
@@ -35,12 +37,12 @@
             "LVID": "${logistical_variant.logistical_variant_code?json_string}",
             "Name" : "${logistical_variant.lv_type_code?json_string}",
 
-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                          "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                          "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                        }<#sep>,</#sep>
                          </#list>
                        ],

RFXtoRP_HsaLstCarSta.ftl

@@ -0,0 +1,40 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
+</#switch>

RFXtoRP_HsaProStatus.ftl

@@ -17,7 +17,6 @@
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
             <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@@ -64,18 +63,15 @@
                   </#if>
                </#if>
             </#if>
-         <#else>
-            <#stop "PRO reference is empty">
-         </#if>
       ]
       <#break>
 
    <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported (case D)">
+      <#stop >
       <#break>
 
    <#default>
-      <#stop "event not supported">
+      <#stop >
 </#switch>
 

RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 
 [
   {
@@ -8,7 +8,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
     "RefDate": {
       "DateTime": "${preparation_status_datetime}",
       "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsaSup.ftl

@@ -2,8 +2,11 @@
 <#-- 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 cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -14,33 +17,33 @@
     <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign actor = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">          
+          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">
          }
-       ]  
+       ]
       <#break>
-    
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign actor = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
-       [  
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsaSup_ActorDeleted.ftl">          
+          <#include "RFXtoRP_HsaSup_ActorDeleted.ftl">
          }
-       ]  
+       ]
       <#break>
-          
+
-      
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -4,44 +4,41 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixSupplier(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}",
          "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
           "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
-          "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
+          <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) />
+          <#if isCountryCode>
+            "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#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?? >
             "Name": "${actor.optional_attributes.company_name?json_string}",
             "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}",
             "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}",
-            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}"
+            "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}",
+            "CountryCode" : ""
           </#if>
         </#if>
-
          },
       <#if actor.optional_attributes?? >
         "Phones": ["${actor.optional_attributes.telephone?json_string}",

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -4,9 +4,8 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}"
     },
-
     "Payload": {}
   }
 ]

RFXtoRP_HsrCarrierApt.ftl

@@ -0,0 +1,40 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
+</#switch>

RFXtoRP_HsrDepot.ftl

@@ -3,7 +3,7 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -14,33 +14,33 @@
   <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [    
+       [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
+          "datas" :
-              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">                       
+              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">
          }
-       ]  
+       ]
   <#break>
-      
+
     <#case "D">
       <#-- *********************************************** Action = DELETE *************************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign depot = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [    
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
+         "datas" :
-          <#include "RFXtoRP_HsrDepot_ActorDeleted.ftl">          
+          <#include "RFXtoRP_HsrDepot_ActorDeleted.ftl">
          }
-       ]  
+       ]
          <#break>
-          
+
-      
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -1,50 +1,52 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixDepot(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}",
           "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
           "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
-          "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
+          <#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code?upper_case) />
+          <#if isCountryCode >
+            "CountryCode" : "${depot.physical_depot_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#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}"
+          "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}",
+          "CountryCode" : ""
+          </#if>
         </#if>
-
          },
-      "Phones": ["${depot.physical_depot_address.telephone?json_string}",
+         <#if depot.physical_depot_address??>
-                 "${depot.physical_depot_address.other_number?json_string}"
+        "Phones": ["${depot.physical_depot_address.telephone?json_string}",
-                ],
+                  "${depot.physical_depot_address.other_number?json_string}"
-       "Typology": "TYPOLOGY_UNKNOWN"
+                  ],
+        </#if>
+       "Typology": "TYPOLOGY_WAREHOUSE"
        }
   }
 ]

RFXtoRP_HsrDepot_ActorDeleted.ftl

@@ -1,12 +1,14 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${depot.physical_depot_code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}"
     },
-
     "Payload": {}
   }
 ]

RFXtoRP_HsrLoadInfo.ftl

@@ -0,0 +1,40 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#stop>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+          {
+
+          }
+       ]
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE *************************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign depot = JsonUtil.jsonToMap(dataRfx)>
+       [
+           {
+
+           }
+       ]
+       <#break>
+
+    <#default>
+          <#stop >
+</#switch>

RFXtoRP_HsrPackBranch.ftl

@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Branch">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for  Pack Branch">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HsrPackOrder.ftl

@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HsrPrepa.ftl

@@ -6,6 +6,7 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">
 
 <#assign aDateTime = .now>
 
@@ -16,81 +17,100 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-   <#if	preparationOrder.total_lv_validated !=0>
+   <#if	preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0>
-         [
+      <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030">
-            {
+         <#if preparationOrder.preparation_line_lst??>
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+            [
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-            },
-            {
-
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-            }
-
-            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
-               ,
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
                },
                {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
-               }
-            </#if>
 
-            <#assign refIDHmap ={}>
-            <#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 = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
-            <#if despatched_ipg.consignment_unit_id!="">
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-               }
-            </#if>
-            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-               ,
-               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :
-               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-               },
-               {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+               <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
                }
-            </#if>
+
+               <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+                  }
+               </#if>
+
+               <#assign refIDHmap ={}>
+               <#assign hd_numberHmap ={}>
+               <#assign hd_numberHmapHUadded ={}>
+               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
+               <#list preparation_line.despatched_ipg_list as despatched_ipg>
+               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+               <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+                  <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+               <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+                  }
+                  <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
+                  <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+                  ,
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
+                  }
+               </#if>
+
+               </#if>
+                  </#list>
                </#list>
-            </#list>
+               <#assign refIDHmap ={}>
-            <#assign refIDHmap ={}>
+            ]
-         ]
+         <#else>
+         <#--   No line-->
+         <#stop>
+      </#if>
+      <#else>
+         <#--   Preparation Type not supported-->
+         <#stop>
+      </#if>
    <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop>
    </#if>
 
 
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
-<#stop "event not supported (Case D)">
+<#stop>
 <#break>
 
 <#default>
-<#stop "event not supported">
+<#stop>
 </#switch>

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,9 +1,14 @@
 <#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>
+  <#list preparationOrder.preparation_line_lst as preparation_line>
-  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+  <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+    <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}">
+  <#else>
+    <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}">
+  </#if>
     <#if !refIDHmap_local[OrderOriginReference]?? >
         <#if refIDHmap_local?size != 0 >
         ,
@@ -14,11 +19,11 @@
       "ProjectID": "${projectRP}"
       },
       "ID":{
-      "RefID": "${OrderOriginReference}"
+        "RefID": "${OrderOriginReference}"
       },
     "Payload":{
       "Carrier": {
-          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
       }
       <#-- Add transport grade code
       <#if preparationOrder.transport_grade_code!="">

RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl

@@ -2,8 +2,6 @@
 
 <#--
 "MetaData" :[
-             
+]
-          ]
-
 -->
 "MetaData": [            ]

RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl

@@ -15,7 +15,7 @@
                   "Value": { "String" : "no batch"}
                 <#else>
                    "Value": { "String" : "${despatched_ipg.batch_number}"}
-            </#if>  
+            </#if>
             },
             {
             "Key": "HeldForSpecificCode",
@@ -24,15 +24,14 @@
             <#else>
             "Value": { "Bool" : "False"}
             },
-           
             {
-            <#assign manufacturing_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> 
+            <#assign manufacturing_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
             "Key": "ManufacturingDate",
             "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_date}"
 						  }
-            } 
+            }
           ]
 
 

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3>
     <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
       <#if !refIDHmap[despatched_ipg3.carton_number]?? >
         <#if refIDHmap?size != 0 >

RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl

@@ -0,0 +1,9 @@
+<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
+
+<#--
+"MetaData" :[
+
+          ]
+
+-->
+"MetaData": [            ]

RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl

@@ -0,0 +1,27 @@
+<#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>
+    }
+  }
+]

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
       <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
           <#if refIDHmap_local?size != 0 >

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,8 +1,10 @@
+<#include "ReflexUtils.ftl">
 <#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
     {
     "Header": {
       "ProjectID": "${projectRP}"
@@ -22,7 +24,7 @@
     "Payload": {
       "Information" :{
         <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg.carton_type_code}"
+           "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
            <#if preparation_line.despatched_cartons_list?? >
               <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
               ,
@@ -74,57 +76,64 @@
        "Goods": {
            "ItemID": "${preparation_line.item_code?trim?json_string}",
            "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           <#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 />
+          <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-              "PriorityDate": "${priority_date}",
+				    <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-                <#else>
+				    "PriorityDate": "${priority_date}",
-                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+          <#else>
-                    <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+            <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                "PriorityDate": "${priority_date}",
+              <#else>
+                <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                     "PriorityDate": "${priority_date}",
-                      <#else>
+                  <#else>
-                        <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+                    <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-                          <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
-                          "PriorityDate": "${priority_date}",
+							"PriorityDate": "${priority_date}",
-                            <#else>
+						<#else>
-                              <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+							<#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-                                <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+								<#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
-                                "PriorityDate": "${priority_date}",
+								"PriorityDate": "${priority_date}",
-                                  <#else>
+							<#else>
-                                    <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+								<#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
-                                      <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+									<#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc />
-                                      "PriorityDate": "${priority_date}",
+                                    "PriorityDate": "${priority_date}",
-                                        <#else>
+                                <#else>
-                                          <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
+									"PriorityDate": "1970-01-01T00:00:00Z",
-                                            <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc />
+                                </#if>
-                                            "PriorityDate": "${priority_date}",
+                            </#if>
-                                              <#else>
-                                                  "PriorityDate": "1970-01-01T00:00:00Z",
-                                                </#if>
-                                          </#if>
-                                    </#if>
-                              </#if>
                         </#if>
-                  </#if>
+                    </#if>
+                </#if>
+             </#if>
 
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
          },
-       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+      <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
+        "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "OrderID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}",
+        "ExecutionflowID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}",
+      </#if>
+
         <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
           "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>
           "LineID": "${preparation_line.pro_line_number!0}",
         </#if>
-       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
+        "ActorID": "${RFXtoRPprefixDepot(preparationOrder.physical_depot_code?trim?json_string)}",
-       "Quantity": {
+        "Quantity": {
-            "LVID": "${quantity_in_base_lv_RP_Cst}",
+          "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${despatched_ipg.quantity_lvs}
+          "Value": ${despatched_ipg.quantity_lvs}
        }
 
       }
       ]
     }
-
   }<#sep>,</#sep>
   </#list>
   <#sep>,</#sep>

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -33,7 +33,10 @@
         "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
       }
     }
-    </#if>
+    </#if>,
+ <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl">
+
 
  }
  }

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,28 +0,0 @@
-<#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 ={}>
-]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -1,13 +1,54 @@
 <#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": {
-			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      <#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}"
+        }
       },
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000">
@@ -18,9 +59,8 @@
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
     ,
 	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code?json_string}"
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
-	  }
+	    }
-
 	  </#if>
     }
   }

RFXtoRP_HsrPro.ftl

@@ -16,12 +16,9 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
           <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-            <#-- Only if preparation order not confirmed  -->
+            <#if preparation_order.line_list??>
-            <#if preparation_order.preparation_order_confirmed == "false" >
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -29,17 +26,13 @@
               <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
             }
             <#else>
-            <#stop "preparation order already confirmed">
+              <#-- No line -->
-           </#if>
+              <#stop>
-
+            </#if>
           <#else>
-          <#stop "preparation order type not supported">
+          <#-- Preparation order type not supported -->
+            <#stop>
           </#if>
-        <#else>
-          <#stop "PRO reference is empty">
-        </#if>
-
-
        ]
   <#break>
 
@@ -48,21 +41,25 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        <#if  preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" >
-        {
+          <#if preparation_order.line_list??>
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            {
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-          "datas" :
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+              "datas" :
-        }
+              <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#-- No line -->
+            <#stop>
+          </#if>
         <#else>
-          <#stop "PRO reference is empty">
+          <#-- Preparation order type not supported -->
+          <#stop>
         </#if>
        ]
          <#break>
-
-
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.modification_datetime,time_zone_rfx) />
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -1,14 +1,19 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${preparation_order.originator_reference?trim?json_string}",
+      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+      </#if>
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
@@ -26,53 +31,55 @@
                 "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
         </#if> -->
         "ShipFrom": {
-        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+          "ActorID": "${RFXtoRPprefixDepot(preparation_order.physical_depot_code?trim?json_string)}"
         },
        "ShipFromAcked": true,
          "ShipTo": {
-          <#if
+          <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true">
-          <#-- preparation_order.address.type_code == "" &&
+            "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
-          preparation_order.address.title_code == "" &&
-          preparation_order.address.first_name == "" &&
-          preparation_order.address.last_name == "" &&
-          preparation_order.address.mail_address == "" &&
-          preparation_order.address.contact_type_code == "" &&
-          preparation_order.address.mobile_phone_number == "" &&
-          preparation_order.address.land_line_phone_number == "" &&
-          preparation_order.address.fax_number == "" && -->
-          preparation_order.address.address_type_code == "" &&
-          preparation_order.address.name_or_company_name == "" &&
-          preparation_order.address.additional_address_data_1 == "" &&
-          preparation_order.address.additional_address_data_2 == "" &&
-          preparation_order.address.post_code_area_name == "" &&
-          preparation_order.address.territorial_division_code == "" &&
-          preparation_order.address.postal_code == "" &&
-          preparation_order.address.iso_country_code == "">
-            "ActorID": "${preparation_order.end_consignee_code}"
           <#else>
-            "Actor":
+            <#if preparation_order.preparation_type_code == "030">
-             {
+              "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+            <#else>
-              "Address" :
+              <#if preparation_order.address.address_type_code == "" &&
+              preparation_order.address.name_or_company_name == "" &&
+              preparation_order.address.additional_address_data_1 == "" &&
+              preparation_order.address.additional_address_data_2 == "" &&
+              preparation_order.address.post_code_area_name == "" &&
+              preparation_order.address.territorial_division_code == "" &&
+              preparation_order.address.postal_code == "" &&
+              preparation_order.address.iso_country_code == "">
+                "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+              <#else>
+                "Actor":
                 {
-                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
+                  "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
-                 "CountryCode" : "${preparation_order.address.iso_country_code!""}",
+                  "Address" :
-                 "PostalCode" : "${preparation_order.address.postal_code!""}",
+                    {
-                 "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
+                    "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
-                 "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
+                    "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
+                    "PostalCode" : "${preparation_order.address.postal_code!""}",
-                 }
+                    "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                  },
+                    "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-              "Contact" :
+                    "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
-                {
+                    }
-                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
+                      },
-                  "LastName" : "${preparation_order.address.last_name?json_string!""}",
+                  "Contact" :
-                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
+                    {
-                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
+                      "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                }
+                      "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
+                      "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
+                      "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
+                    }
+              </#if>
+            </#if>
           </#if>
-         },
+          },
-
+        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          "OrderID": "${preparation_order.originator_reference?trim?json_string}",
+        <#else>
+          "OrderID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        </#if>
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
@@ -84,7 +91,6 @@
                 </#if>
           <#-- Line Metadata inclusion -->
           <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
-
              "RequestedContent":
              {
                    "Goods":
@@ -95,10 +101,8 @@
                        <#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" :
                {
@@ -110,13 +114,18 @@
            </#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}"
+                "AuthorTimeZone": "${time_zone_rfx}"
+              </#if>
              }
          }
     }

RFXtoRP_HsrReceiptList.ftl

@@ -15,65 +15,126 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
+        <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type -->
-        <#if receipt.receipt_type = "030">
-        <#stop "ignored message because receipt type = transfert">
-        <#else>
           [
-          {
+            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
+              "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
 
-          },
+            },
-          {
+            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
+              "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+              <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
 
-          }
+            }
           ]
+        <#else>
+          <#if receipt.line_list ??>
+          [
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+            }
+          ]
+          <#else>
+            <#stop>
+          </#if>
         </#if>
-      <#else>
-        <#stop "Receipt reference is empty">
-      </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-          <#if receipt.receipt_confirmed == "true" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
+            }
+          <#else>
+            <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true">
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
             }
-          <#else>
-            <#if receipt.receipt_type = "030">
-              <#stop "ignored message because receipt type = transfert">
             <#else>
-              {
+              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-              },
+                }
-              {
+              <#else>
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" >
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  {
-              "datas" :
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            }
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+                  }
+                <#else>
+                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??>
+                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                    [
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+
+                      },
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
+
+                      }
+                    ]
+                    <#else>
+                      <#stop> <#-- Receipt reference for transfer is empty-->
+                    </#if>
+                  <#else>
+                    <#if receipt.line_list ??>
+                      {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                      },
+                      {
+                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                      "datas" :
+                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                      }
+                    <#else>
+                      <#stop>
+                    </#if>
+                  </#if>
+                </#if>
+              </#if>
             </#if>
           </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
        ]
       <#break>
 
@@ -81,8 +142,8 @@
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+      <#if receipt.line_list ??>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
           {
 
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -90,14 +151,14 @@
             "datas" :
             <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
           }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
        ]
+       <#else>
+        <#stop> <#-- No line-->
+      </#if>
          <#break>
 
 
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
 
 [
   {
@@ -8,7 +8,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -1,14 +1,15 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
-  <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
      "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -25,18 +26,28 @@
 
       "ShipFrom":
       {
-      "ActorID": "${receipt.original_code?trim?json_string}"
+        <#if receipt.receipt_type == '020'>
+          "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
+        <#else>
+        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+        </#if>
       },
         "ShipTo"  :
       {
-      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
       "ShipToAcked": true,
-
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-      <#if receipt.carrier_informations.carrier_code != "">
+        "OrderID":"${receipt.receipt_reference?trim?json_string}",
-          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
+      <#else>
+        "OrderID":"R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      </#if>
+      <#if receipt.carrier_informations.carrier_code != "">
+        "Carrier":
+        {
+          "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
+        },
       </#if>
-
 
       <#if receipt.line_list??>
        "Lines" : [

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,13 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
 [
   {
      "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
 
 [
   {
@@ -8,8 +8,8 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
+      "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-       "RefDate": {
+      "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
       }

RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl

@@ -0,0 +1,67 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${receipt_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+      "Payload": {
+      }
+  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                 <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#else>
+                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+            "RefDate": {
+            "DateTime": "${receipt_status_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

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

RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl

@@ -0,0 +1,67 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+       <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${receipt_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+      "Payload": {
+      }
+  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#else>
+                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]

RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl

@@ -0,0 +1,67 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
+[
+  <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+    {
+      "Header": {"ProjectID": "${projectRP}"},
+      "ID": {
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${receipt_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
+        }
+      },
+      "Payload": {
+      }
+  }
+  <#else>
+    <#if receipt.line_list??>
+      <#list receipt.line_list as receipt_line >
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+            <#if refIDHmap_local?size != 0 >
+            ,
+            </#if>
+            <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
+            {
+              "Header": {"ProjectID": "${projectRP}"},
+              "ID": {
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                  "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                <#else>
+                  "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}",
+                </#if>
+                "RefDate": {
+                "DateTime": "${receipt_status_datetime}",
+                "AuthorTimeZone": "${time_zone_rfx}"
+                }
+            },
+              "Payload": {
+              }
+            }
+          </#if>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+          <#break>
+        </#if>
+      </#list>
+    </#if>
+  </#if>
+]

RFXtoRP_PlatformLogCreate.ftl

@@ -22,22 +22,21 @@
 	      "AuthorTimeZone": "${time_zone_rfx}"
 	    },
 	    "TechMessage": {
-	      "Code": "${restResponsetMsg.status}",
+	      "Code": "${restResponsetMsg.status!"no Code"}",
 	      "Label": ${strJsonBody}
 	      },
 	    "UserMessage": {
-	      "Code": "${restResponsetMsg.status}",
+	      "Code": "${restResponsetMsg.status!"no Code"}",
 	      "Label": ${strJsonBody},
 	      "Params": []
 	    },
 	    "DetailElements": [],
-	    "CorrelationID": "${id.correlationid}",
+	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": "rfxresponse",
+	    "ContextPayload": ${strJsonBody},
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
-	    "Task": "${id.apiRestReflexID}",
+	    "Task": "${id.apiRestReflexID!"no Task"}",
-	    "OriginalID": "${id.refid?trim?json_string}",
+	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
-]
+]
-

RFXtoRP_PrepOrder_ShipFromAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 
 	  "Payload": {

RFXtoRP_Receipt_ShipToAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"	   
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 	   
 	  "Payload": {

RFXtoRP_RestResponse.ftl

@@ -4,16 +4,57 @@
 <#-- 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>
+
+<#switch id.apiRestReflexID!no_apiRestReflexID>
+	 <#case no_apiRestReflexID>
+	   [
+		   {
+			 <#if restResponsetMsg.body?? >
+			   <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+			 <#else>
+			   <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+			 </#if>
+			 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+			 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+			 "datas" :
+				<#include "RFXtoRP_PlatformLogCreate.ftl">
+		   }
+	   ]
+	   <#break>
+				   
 	  <#case "preparation_orders_post">
-			 <#switch restResponsetMsg.status>
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+				   <#break>
+				   
 	             <#case 200>
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
@@ -28,22 +69,33 @@
 								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
 						   }
 					   ]
-				   <#else>
+					<#else>
-				   [
+						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
-					   {
+							[
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+							{
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
+								"datas" :
-							<#include "RFXtoRP_PlatformLogCreate.ftl">
+									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
-					   },
+							}
-					   {
+							]
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+				  		 <#else>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						[
-						 "datas" :
+							{
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+								<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					   }
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
-				   ]
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PlatformLogCreate.ftl">
+							},
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_RestResponseAllocationError.ftl">
+							}
+						]
+				   		</#if>
 				   </#if>
 				   <#break>
 	           <#default>
@@ -52,7 +104,7 @@
 					     <#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "{}" />
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}}" />
 						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -70,7 +122,29 @@
 			   <#break>
 
     	<#case "receipts_post">
-			 <#switch restResponsetMsg.status>
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
+					   {
+					     <#if restResponsetMsg.body?? >
+						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						 <#else>
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
+						 </#if>
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   }
+				   ]
+				   <#break>
+				   
 	             <#case 200>
 	             <#case 201>
 					<#-- *********************************************** ApiRestID = receipts_post ******************** -->
@@ -110,7 +184,7 @@
 						<#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "{}" />
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
 						 </#if>
 						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -126,7 +200,6 @@
 				   ]
                </#switch>
 		       <#break>
-
 	  <#default>
 	        <#stop>
 </#switch>

RFXtoRP_RestResponseAllocationError.ftl

@@ -7,7 +7,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${id.refid?trim?json_string}",
+         "RefID": "${id.refid!"no RefID"?trim?json_string}",
        "RefDate": {
         "DateTime": "${aDateTime?iso_utc}",
         "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_RfxConfigurationRp.ftl

@@ -2,35 +2,42 @@
 <#noparse><#-- /!\ Warning the file is generated, if you modify it manually, do not enable automatic update via the pipeline --></#noparse>
 <#noparse><#-- Date of last generation : </#noparse>${aDateTime}<#noparse> --></#noparse>
 
-<#noparse>      
+<#noparse>
 <#-- if LVID is egal to **quantity_in_base_lv** keyword then LVID is egal to base VL of the item -->
- <#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" > 
+<#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" >
- <#assign rfx_date_format_default = "yyyy-MM-dd" > 
+<#assign rfx_date_format_default = "yyyy-MM-dd" >
- 
- 
- <#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}>
- <#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}>
- <#assign area_unit_KV_rfx   = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}>
- <#assign volume_unit_KV_rfx = {"MM³":"CUBIC_MILLIMETER","CM³":"CUBIC_CENTIMETER","DM³":"CUBIC_DECIMETER","M³":"CUBIC_METER","CI":"CUBIC_INCH","CF":"CUBIC_FOOT","CY":"CUBIC_YARD","ML":"MILLI_LITER","CL":"CENTI_LITER","DL":"DECI_LITER","LIT":"LITER","HL":"HECTO_LITER","FT":"US_FLUID_OUNCE","USG":"US_GAL","PI":"IMPERIAL_PINT","GL":"IMPERIAL_GAL"}>
 
- </#noparse>
 
- <#noparse><#assign length_unit_rfx             = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"></#noparse> 
+<#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}>
- <#noparse><#assign distance_unit_rfx           = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"></#noparse> 
+<#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}>
- <#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"></#noparse> 
+<#assign area_unit_KV_rfx   = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}>
- <#noparse><#assign weight_unit_rfx             = weight_unit_KV_rfx[</#noparse>"${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"></#noparse> 
+<#assign volume_unit_KV_rfx = {"MM³":"CUBIC_MILLIMETER","CM³":"CUBIC_CENTIMETER","DM³":"CUBIC_DECIMETER","M³":"CUBIC_METER","CI":"CUBIC_INCH","CF":"CUBIC_FOOT","CY":"CUBIC_YARD","ML":"MILLI_LITER","CL":"CENTI_LITER","DL":"DECI_LITER","LIT":"LITER","HL":"HECTO_LITER","FT":"US_FLUID_OUNCE","USG":"US_GAL","PI":"IMPERIAL_PINT","GL":"IMPERIAL_GAL"}>
- <#noparse><#assign area_unit_rfx               = area_unit_KV_rfx[</#noparse>"${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"></#noparse> 
- <#noparse><#assign volume_unit_rfx             = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"></#noparse> 
- <#noparse><#assign number_of_litres_unit_rfx   = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"></#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>  
+<#noparse><#assign length_unit_rfx             = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"></#noparse>
-  
+<#noparse><#assign distance_unit_rfx           = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"></#noparse>
- 
+<#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx[</#noparse>"${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"></#noparse>
- <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>
+<#noparse><#assign weight_unit_rfx             = weight_unit_KV_rfx[</#noparse>"${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"></#noparse>
- <#noparse><#assign text_language_rfx   = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse> 
+<#noparse><#assign area_unit_rfx               = area_unit_KV_rfx[</#noparse>"${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"></#noparse>
+<#noparse><#assign volume_unit_rfx             = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"></#noparse>
+<#noparse><#assign number_of_litres_unit_rfx   = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"></#noparse>
+
+
+
+<#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>
+
+
+<#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>
 
-  

RP_connector.ftl

@@ -0,0 +1,38 @@
+<#-- ****
+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>

RPtoRFX_ExecutionflowEvent.ftl

@@ -5,7 +5,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 
-<#assign eventRP = JsonUtil.jsonToMap(input)> 
+<#assign eventRP = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -17,6 +17,7 @@
 
 <#switch eventRP.event>
 	  <#case "Created">
+	  	<#case "Renotified">
 			 <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 			<#assign executionflow = eventRP.data />
 
@@ -24,28 +25,28 @@
 				<#if executionflow.MetaData??>
 				<#assign Header_MetaData_Map = JsonUtil.sequenceToMap(executionflow.MetaData, "Key", "Value") />
 				</#if>
-			
+
-		   [  
+		   [
-		       <#if eventRP.partnerAppRole ==  "ShipFrom" && executionflow.ShipFrom.ActorID != "" && executionflow.ShipFrom.Actor.IsShipFromConnected?? && executionflow.ShipFrom.Actor.IsShipFromConnected> 
+		       <#if eventRP.partnerAppRole ==  "ShipFrom" && executionflow.ShipFrom.ActorID != "" && executionflow.ShipFrom.Actor.IsShipFromConnected?? && executionflow.ShipFrom.Actor.IsShipFromConnected>
 			   {
-				 <#assign apiRestReflexID = ApiRestReflexID.preparation_orders_post> 
+				 <#assign apiRestReflexID = ApiRestReflexID.preparation_orders_post>
 				 "apiRestReflexID" :  "${apiRestReflexID}",
-				 "datas" :         
+				 "datas" :
-					<#include "RPtoRFX_PrepOrder.ftl">	
+					<#include "RPtoRFX_PrepOrder.ftl">
 			   }
 			   </#if>
-  		       <#if eventRP.partnerAppRole ==  "ShipTo" && executionflow.ShipTo.ActorID != "" && executionflow.ShipTo.Actor.IsShipToConnected?? && executionflow.ShipTo.Actor.IsShipToConnected> 
+  		       <#if eventRP.partnerAppRole ==  "ShipTo" && executionflow.ShipTo.ActorID != "" && executionflow.ShipTo.Actor.IsShipToConnected?? && executionflow.ShipTo.Actor.IsShipToConnected>
 			   {
-				 <#assign apiRestReflexID = ApiRestReflexID.receipts_post> 
+				 <#assign apiRestReflexID = ApiRestReflexID.receipts_post>
 				 "apiRestReflexID" :  "${apiRestReflexID}",
-				 "datas" :         
+				 "datas" :
-					<#include "RPtoRFX_Receipt.ftl">	
+					<#include "RPtoRFX_Receipt.ftl">
 			   }
 			   </#if>
 
-		   ]  
+		   ]
 			<#break>
 	  <#default>
-	        <#stop "Event not processed">
+	        <#stop >
 </#switch>
 

RPtoRFX_PrepOrder.ftl

@@ -1,4 +1,6 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
+<#include "ActorPrefix.ftl">
+<#include "HfRpConfig.ftl">
 <#-- Valeurs par défaut Adresse -->
 <#-- Default values -->
 <#assign typecode ="010">
@@ -9,23 +11,24 @@
 <#-- 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 = executionflow.ShipTo.ActorID >
+	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
 <#else>
 	<#assign actorID = defaultactor >
 </#if>
 
 {
-	"id" : {"refid" : "${executionflow.OrderID}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
 		"originator_code": "${originator_code}"
 	},
 	"payload" :
 	 {
-		"originator_reference": "${executionflow.OrderID}",
+		<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
+		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
@@ -41,45 +44,57 @@
         "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
+			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
-		  	},
+		  	}
 		<#if actorID == defaultactor >
+		,
 			"address": {
 				"type_code": "${typecode}",
 				"title_code" : "${titlecode}",
 				"contact_type_code" : "${contacttypecode}",
 				"address_type_code" : "${adresstypecode}",
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
+				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
-				"last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}",
+				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${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]}",
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}",
 				</#if>
 				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
-					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
+					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]?json_string}",
 				</#if>
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
+				"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
-				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
+				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
+				"additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}",
-				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
+				"postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}",
-				"post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}",
+				"post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}",
-				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
+				"iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}"
-			},
+			}
 		</#if>
 		<#if executionflow.Lines??>
+		 ,
 			"line_list": [
 			<#list executionflow.Lines as line>
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 				{
+				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
@@ -87,20 +102,14 @@
 				"owner_code_to_prepare" :"${owner_code_to_prepare}",
 				"grade_code_to_prepare" :"${grade_code_to_prepare}",
 				"input_order_data": "false",
-				"batch_1": "${batch_1}",
+				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
-				<#--
-				"stock_reservation": "false",
-				"forced_priority_date_min_lead_time": "false",
-				"temp_substitution_possible": "false",
-				"substitution_possible": "false"
-				-->
-
 				}
 			<#sep>,</#sep>
 			</#list>
+			]
 		</#if>
-		]
+
 	 }
  }

RPtoRFX_PrepOrder_HeaderMetadata.ftl

@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->

RPtoRFX_PrepOrder_LineMetadata.ftl

@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->

RPtoRFX_PrepOrder_OptionalAttributes.ftl

@@ -0,0 +1,8 @@
+<#-- Here are the fields that can be added
+"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
+"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
+"reason_code": "str",
+"planned_preparation_date": "0000-00-00",
+"despatch_grouping": "string",
+"reservation_end_datetime": "0000-00-00T00:00:00",
+-->

RPtoRFX_Receipt.ftl

@@ -1,67 +1,68 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
+<#include "ActorPrefix.ftl">
+<#include "HfRpConfig.ftl">
 
 {
-	"id" : {"refid" : "${executionflow.OrderID}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${executionflow.ShipTo.ActorID!""}",
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipTo.ActorID!"")}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" : 
+	"payload" :
 	 {
-		"receipt_reference": "${executionflow.OrderID}",
+		<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
+		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
-		"receipt_reason_code": "${receipt_reason_code}", 
+		"receipt_reason_code": "${receipt_reason_code}",
 		"work_mode_code" :     "${work_mode_code}",
-		"original_code"  : "${executionflow.ShipFrom.ActorID}",
+		"original_code"  : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}",
-		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
+		"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
 
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
+		"dock_occupation_duration": 1
-		  
+
-		<#if executionflow.Lines??> 
+		<#if executionflow.Lines??>
+		,
 			"line_list": [
 			<#list executionflow.Lines as line>
 
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
 			{
+				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1!""}",					
+				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
+					<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
-			   		"held _for_repacking": "false",
-			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
-		 		}
+				}
-		  		<#--"quality_control_attributes": {
-	        		"qcf_to_create_for_receipt_line": "false",
-	         		"exclude_item_from_inspection": "false"
-  				} -->
-
 			}<#sep>,</#sep>
-		</#list> 	     	
+		</#list>
 		]
 		</#if>
-		  
 	 }
  }

RPtoRFX_Receipt_DefaultLineData.ftl

@@ -2,7 +2,7 @@
 <#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
 
 <#-- How to use MD or SK map
-    Example : 
+    Example :
     <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
 
     If your SK is :

RPtoRFX_Receipt_HeaderMetadata.ftl

@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->

RPtoRFX_Receipt_LineMetadata.ftl

@@ -0,0 +1,17 @@
+<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- You can map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->

RPtoRFX_Receipt_OptionalAttributes.ftl

@@ -0,0 +1,16 @@
+<#-- Here are the fields that can be added
+ "batch_2": "string",
+"batch_3": "string",
+"anticipated_receipt_line_activity_code": "str",
+"anticipated_receipt_line_physical_depot_code": "str",
+"anticipated_receipt_line_originator_code": "string",
+"anticipated_receipt_reference": "string",
+"anticipated_receipt_planned_date": "0000-00-00",
+"anticipated_receipt_reference_line_no": 999999,
+"reservation_consignee_code": "string",
+"reservation_consignee_group_code": "string",
+"pro_reservation_reference": "string",
+"held_for_check": "false",
+"held_for_repacking": "false",
+"hold_code": "str"
+-->

ReflexUtils.ftl

@@ -17,14 +17,14 @@
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
 <#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
-<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>   
+<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
-<#if str != "[">		  
+<#if str != "[">
 <#local str += ",">
 </#if>
 <#local str += "\"">
 <#local str += email>
 <#local str += "\"">
-</#if>   
+</#if>
 </#list>
 <#local str += "]">
 <#return (str)>

Table.ftl

@@ -0,0 +1,15 @@
+<#-- 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"
+ }>
+

VERSION

@@ -1 +1 @@
-1.2.16+5
+2.0.8+1