Release 1.2.38+1

SCPN1-8597

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

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>

RFX_PartnerAPP_Settings.ftl

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

RFXtoRP_HfDtlStockLs.ftl

@@ -6,7 +6,7 @@
 
 <#include "HfRpConfig.ftl">
 
-<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg  = JsonUtil.jsonToMap(input)>
 <#assign projectRP      = project>
 <#assign organisationRP = organisation>
 
@@ -16,45 +16,45 @@
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)>
-      
+
       <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image -->
-      <#if cloudEventMsg.messageSet??>   
+      <#if cloudEventMsg.messageSet??>
          <#assign idSnapshot = cloudEventMsg.messageSet />
       <#else>
          <#assign idSnapshot = cloudEventMsg.id />
-      </#if>   
-      
+      </#if>
+
         <#list reflexStockPicturesInterface.detailled_stock_list as stock>
          <#if stock.stock_type_code != "200">
-            <#stop "stock type different from 200">
-            <#break>          
-        </#if> 
-      </#list>  
-         [  
-           {           
+            <#stop>
+            <#break>
+        </#if>
+      </#list>
+         [
+           {
             <#if sum_elt??>
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted> 
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :         
-              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">     
+             "datas" :
+              <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl">
                   <#else>
-                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted> 
+                    <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-             "datas" :         
+             "datas" :
               <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl">
-                </#if>  
+                </#if>
            }
-         ] 
+         ]
 
       <#break>
-      
+
       <#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}"
-            },
-    "Payload": {      
-       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+      "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
+      },
+    "Payload": {
+       <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
       "Snapshot": {
         "EndDateTime": {
-           "DateTime": "${generation_date}",  
-           "AuthorTimeZone": "${time_zone_rfx}"              
-         },   
-              "ID":  "${stock.physical_depot_code}-${idSnapshot}",
-              "MessageNb": ${sum_elt}
+           "DateTime": "${generation_date}",
+           "AuthorTimeZone": "${time_zone_rfx}"
+         },
+          "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+          "MessageNb": ${sum_elt}
        }
-             
+
     }
   }
   <#break>
-  </#list>  
+  </#list>
 ]
 

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -1,40 +1,44 @@
 <#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   <#list reflexStockPicturesInterface.detailled_stock_list as stock>
   {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "Payload": {
-      "ActorID": "${stock.physical_depot_code}",
-      <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+      "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}",
+      <#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}",
-              "Quantity":
-              {
-                "Value" : "${stock.quantity_in_base_lvs!"0"}",
-                "LVID": "${quantity_in_base_lv_RP_Cst}"
-              }
+           "DateTime": "${generation_date}",
+           "AuthorTimeZone": "${time_zone_rfx}"
+         },
+          "ID":  "${stock.physical_depot_code}-${idSnapshot}",
+      "Quantity":
+      {
+        "Value" : "${stock.quantity_in_base_lvs!"0"}",
+        "LVID": "${quantity_in_base_lv_RP_Cst}"
+      }
        },
-       
+
        "Goods": {
          "ItemID": "${stock.item_code?trim?json_string}",
          "LVBranchID": "${stock.item_logistical_variant_code}",
-         <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> 
+         <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc />
          <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
           "PriorityDate" : "${priority_date}",
-         </#if>
-         
+        <#else>
+            "PriorityDate": "1970-01-01T00:00:00Z",
+        </#if>
+
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
-       }   
-      
+       }
+
     }
   }<#sep>,</#sep>
-  </#list>  
+  </#list>
 ]
 

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_HfExpGrpList.ftl

@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 <#include "HfExpGrpList.ftl">
@@ -15,14 +15,14 @@
 			<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 			<#assign file = JsonUtil.jsonToMap(dataRfx)>
 
-            <#assign temp = ExpiryGroupList64>			
+            <#assign temp = ExpiryGroupList64>
 			<#list file.expiry_group_list as expiry_group>
 			<#assign temp = JsonUtil.update(temp,cloudEventMsg.action,expiry_group.exipiry_group_code,Date_Tye_Code_KV[expiry_group.priority_date_type_code])>
 			</#list>
 			<#assign output = JsonUtil.print(temp)>
-${output} 					
+${output}
 			<#break>
-			
+
 	  <#default>
 	        <#stop >
 </#switch>

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

@@ -1,5 +1,5 @@
 <#-- *********************************************** Parameter global ******************** -->
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -10,12 +10,12 @@
 	<#case "U">
 	<#case "D">
 
-		<#stop "no generic FTL file available yet for LV types">	
+		<#stop "no generic FTL file available yet for LV types">
 
 	<#break>
-	        
-	    
+
+
 	<#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_HsaCarrier.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 carrier = JsonUtil.jsonToMap(dataRfx)> 
-       [  
+      <#assign carrier = JsonUtil.jsonToMap(dataRfx)>
+       [
          {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-              <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl">                       
+          "datas" :
+              <#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" :         
-          <#include "RFXtoRP_HsaCarrier_ActorDeleted.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsaCarrier_ActorDeleted.ftl">
          }
-       ]  
+       ]
          <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaCarrier_ActorCreated.ftl

@@ -1,35 +1,40 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "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">,
-    -->
 
-    
+
+    <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
+
      "Address":
          {
         <#-- if Reflex WMS address is structured    -->
-        <#if carrier.carrier_structured_address?? > 
+        <#if carrier.carrier_structured_address?? >
 
           "Name": "${carrier.carrier_structured_address.name_or_company?json_string}",
           "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}",
-          "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}", 
+          "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}"
 
@@ -39,16 +44,17 @@
             "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}"
-          </#if>  
-        </#if>     
+            "StreetAddressThree" : "${carrier.address.address_3?json_string}",
+             "CountryCode" : ""
+          </#if>
+        </#if>
          },
       <#if  carrier.address??>
-        "Phones": ["${carrier.address.telephone?json_string}", 
+        "Phones": ["${carrier.address.telephone?json_string}",
                  "${carrier.address.other_number?json_string}"
                 ],
       </#if>
       "Typology": "TYPOLOGY_CARRIER"
        }
-  }  
+  }
 ]

RFXtoRP_HsaCarrier_ActorDeleted.ftl

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

RFXtoRP_HsaCons.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 actor = JsonUtil.jsonToMap(dataRfx)> 
-       [  
+      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsaCons_ActorCreated.ftl">          
+         "datas" :
+          <#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" :         
-          <#include "RFXtoRP_HsaCons_ActorDeleted.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsaCons_ActorDeleted.ftl">
          }
-       ]  
+       ]
       <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaCons_ActorCreated.ftl

@@ -1,12 +1,14 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
   {
     "Header": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${actor.code?trim?json_string}"
+      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
     },
-
     "Payload": {
       "Name": "${actor.designation?json_string}",
         "ManagedStock": false,
@@ -14,10 +16,10 @@
     <#-- ***Partner ID could be added here *** -->
       <#-- "PartnerID": "${}",  -->
 
-    <#--
+
     <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
-    -->
-                 
+
+
     "Address":
         {
 
@@ -26,28 +28,34 @@
 
         "Name": "${actor.consignee_structured_address.name_or_company?json_string}",
         "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO?json_string}",
-        "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}", 
+        "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}"
 
         <#-- if Reflex WMS is not structured    -->
-        <#else> 
+        <#else>
           <#if actor.address?? >
 
             "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}"       
-          </#if> 
-        </#if> 
-       },  
-    <#if  actor.address?? > 
-      "Phones": ["${actor.address.telephone?json_string}", 
+            "StreetAddressThree" : "${actor.address.address_3?json_string}",
+             "CountryCode" : ""
+          </#if>
+        </#if>
+       },
+    <#if  actor.address?? >
+      "Phones": ["${actor.address.telephone?json_string}",
                "${actor.address.other_number?json_string}"
-              ], 
+              ],
     </#if>
     "Typology": "TYPOLOGY_UNKNOWN"
       }

RFXtoRP_HsaCons_ActorDeleted.ftl

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

RFXtoRP_HsaDispute.ftl

@@ -0,0 +1,47 @@
+<#-- **** 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">
+            },
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
+            }
+            <#else>
+              <#stop>
+          </#if>
+       ]
+  <#break>
+
+  <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#stop>
+      <#break>
+
+
+    <#default>
+          <#stop>
+</#switch>
+

RFXtoRP_HsaDispute_Created.ftl

@@ -0,0 +1,67 @@
+<#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?trim?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}"
+             },
+            <#if dispute.dispute_type_code=="050" >
+                <#if dispute.dispute_preparation.preparation_order_list??  && dispute.dispute_preparation.preparation_order_list?size != 0>
+                  "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#else>
+                  <#stop "preparation order list is empty" >
+                </#if>
+            <#else>
+                <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" >
+                    "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                <#else>
+                    <#stop "Type not supported" >
+                </#if>
+            </#if>
+             <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
+
+            <#if TableReasonCode[dispute.dispute_reason_code]??>
+                "ClaimTypeID":"${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

@@ -1,4 +1,4 @@
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -9,66 +9,74 @@
     <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)> 
-      
+      <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)>
+
       <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->
+
       <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>
-      
-      <#-- IPG moves translated into Stock moves -->
-      <#if reflexMvtStockInterface.ipg_move_type == "130" || 
-           reflexMvtStockInterface.ipg_move_type == "200" ||
-           reflexMvtStockInterface.ipg_move_type == "210" ||
-           reflexMvtStockInterface.ipg_move_type == "220" ||
-           reflexMvtStockInterface.ipg_move_type == "230" ||
-           reflexMvtStockInterface.ipg_move_type == "240" ||
-           reflexMvtStockInterface.ipg_move_type == "260" ||
-           reflexMvtStockInterface.ipg_move_type == "290" ||
-           reflexMvtStockInterface.ipg_move_type == "300" ||
-           reflexMvtStockInterface.ipg_move_type == "400" ||
-           reflexMvtStockInterface.ipg_move_type == "410" ||         
-           reflexMvtStockInterface.ipg_move_type == "420" 
-           >
-         [           
-         {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved> 
-           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :         
-              <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
-              
-         }
-         ]
+         <#-- IPG moves translated into Stock moves -->
+         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
+            reflexMvtStockInterface.ipg_move_type == "200" ||
+            reflexMvtStockInterface.ipg_move_type == "210" ||
+            reflexMvtStockInterface.ipg_move_type == "220" ||
+            reflexMvtStockInterface.ipg_move_type == "230" ||
+            reflexMvtStockInterface.ipg_move_type == "240" ||
+            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 == "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.MovementCreated>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+            }
+            ]
          <#else>
-         <#-- IPG moves translated into goods received (all type of  receipt)  -->
-         <#if reflexMvtStockInterface.ipg_move_type == "100" ||
-          reflexMvtStockInterface.ipg_move_type == "110" ||
-          reflexMvtStockInterface.ipg_move_type == "120"
-          >
-         [
-         {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
-           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :         
-           <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-         }
-         ]  
-      <#else>  
-      <#-- Case of IPG move type volontarilly ignored-->         
-               <#stop>
-      </#if>
-      </#if>
-      <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
-         <#stop>
+            <#-- IPG moves translated into goods received (all type of  receipt)  -->
+               <#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>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+                        }
+                        ]
+                      <#else>
+                        <#-- Case of IPG move type volontarilly ignored-->
+                        <#stop " Reference receipt is empty">
+                     </#if>
+               <#else>
+                  <#stop>
+               </#if>
          </#if>
+      <#else>
+         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
+         <#stop>
+      </#if>
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
-      <#stop "event not supported - Case D ">
+      <#stop >
       <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop>
 </#switch>
 

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -1,44 +1,50 @@
 <#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": {
       "ProjectID": "${projectRP}"
     },
     "ID": {
          "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}"
-    },     
+    },
     "Payload": {
     "ReceivedContents" :[
        {
        "DateTime": {
             "DateTime": "${receipt_confirmation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"            
+            "AuthorTimeZone": "${time_zone_rfx}"
              },
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           "PriorityDate": "${priority_date}",
-         
+           <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+              "PriorityDate": "${priority_date}",
+           <#else>
+              "PriorityDate": "1970-01-01T00:00:00Z",
+            </#if>
+
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
+
         <#if reflexMvtStockInterface.receipt_reference!="">
           "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
         <#else>
           "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
         </#if>
-       "LineID": "${reflexMvtStockInterface.receipt_line_number}",
-        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
-       "Quantity": {
+        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+        "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}           
+            "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,31 +11,41 @@
             "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"}> 
-<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
+            "455":"STOCK_MOVEMENT_TYPE_FIX",
+            "460":"STOCK_MOVEMENT_TYPE_FIX",
+            "465":"STOCK_MOVEMENT_TYPE_FIX",
+            "520":"STOCK_MOVEMENT_TYPE_OUTBOUND"
+            }>
+<#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
-
 [
-  {    
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "Payload": {
       "Goods": {
         "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        "PriorityDate": "${ipg_priority_datetime}",
-        
+        <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+          "PriorityDate": "${ipg_priority_datetime}",
+        <#else>
+            "PriorityDate": "1970-01-01T00:00:00Z",
+        </#if>
+
         <#-- Segmentation keys inclusions -->
         <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,
-        
-        
+
+
         "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": {
         "DateTime": "${generation_date}",
         "AuthorTimeZone": "${time_zone_rfx}"
@@ -42,16 +53,20 @@
         "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": " 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}",
-        </#if> 
-        
+        </#if>
+
         "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,37 @@
     <#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?? >
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :   
-            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">  
+           "datas" :
+            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
         <#else>
           <#stop "no LV for the item">
         </#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" :         
-          <#include "RFXtoRP_HsaItm_ItemDeleted.ftl">  
+         "datas" :
+          <#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" :         
-          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl">          
+         "datas" :
+          <#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" :         
-          <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl">  
+         "datas" :
+          <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl">
          }
-       ] 
-      <#break>      
+       ]
+      <#break>
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl

@@ -1,14 +1,14 @@
 <#include "HfRpConfig.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${lv.item_code?trim?json_string}"
     },
     "Payload": {
-    "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] 
-    }      
+    "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"]
+    }
   }
 ]

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -1,37 +1,37 @@
 <#include "HfRpConfig.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${lv.item_code?trim?json_string}"
     },
     "Payload": {
         "LogisticVariants": [
-           { 
+           {
           "LVID": "${lv.logistical_variant_code?json_string}",
           "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??>  
+          <#if lv.id_list??>
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
-                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                      "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
+                      "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                    }<#sep>,</#sep>
-                     </#list> 
-                   ],  
-           </#if> 
-         
-           <#-- LV Metadata inclusion -->  
+                     </#list>
+                   ],
+           </#if>
+
+           <#-- LV Metadata inclusion -->
          <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl">,
-         
+
           "IsBaseLogisticVariant": ${lv.base_lv},
-        
+
         <#if lv.base_lv != "true">
             "RefLV": "${lv.subpackaging_lv_code?json_string}",
             </#if>
-        
+
           "QuantityInRefLV": ${lv.quantity_in_subpackaging_lv},
 
           "NetWeight": {
@@ -39,35 +39,35 @@
             "Unit": "${weight_unit_rfx}"
           },
           "GrossWeight": {
-            "Value":  ${lv.gross_weight}, 
+            "Value":  ${lv.gross_weight},
             "Unit": "${weight_unit_rfx}"
           },
           "Volume": {
             "Value": ${lv.volume},
             "Unit": "${volume_unit_rfx}"
-          },    
+          },
           "Height": {
             "Value": ${lv.height},
             "Unit": "${length_unit_rfx}"
-          }, 
+          },
           "Width": {
             "Value": ${lv.width},
             "Unit": "${length_unit_rfx}"
-          }, 
+          },
           "Length": {
             "Value": ${lv.depth},
             "Unit": "${length_unit_rfx}"
-          },  
+          },
 
         <#if lv.packaging_lv == "true">
         "BranchIDs": ["${lv.logistical_variant_code}"]
         <#else>
         "BranchIDs": []
-        </#if> 
-        
-                          
+        </#if>
+
+
         }
-      ]    
+      ]
     }
   }
 ]

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -1,9 +1,9 @@
 <#include "HfRpConfig.ftl">
 <#include "HfExpGrpList.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${item.item_code?trim?json_string}"
@@ -12,91 +12,95 @@
       "DescriptionsByLanguage": [{
         "ShortDescription": "${item.short_designation?json_string}",
         "LongDescription": "${item.designation?json_string}",
-        "TechnicalDetails": "${item.item_description?json_string}",      
+        "TechnicalDetails": "${item.item_description?json_string}",
         "LanguageCodeISO6391": "${text_language_rfx}"
-        }    
-      ],       
+        }
+      ],
       "ExpiryConstraint": {
-          "Type":  "${ExpiryGroupList[item.expiry_group_code]!"UNKNOWN_DATE"}" 
+          "Type":  "${ExpiryGroupList[item.expiry_group_code]!"UNKNOWN_DATE"}"
       },
-      
-      <#-- Item metadata inclusion -->    
+
+      <#-- Item metadata inclusion -->
       <#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??>           
+        <#if item.logistical_variant_list??>
           "LogisticVariants": [
-           
-           <#list item.logistical_variant_list as logistical_variant>      
-               { 
+
+           <#list item.logistical_variant_list as logistical_variant>
+               {
             "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??>
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
-                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                          "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
+                          "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                        }<#sep>,</#sep>
-                         </#list> 
-                       ],  
-              </#if>      
-               
+                         </#list>
+                       ],
+              </#if>
+
             <#-- LV Metadata inclusion -->
-            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,              
-              
-            "IsBaseLogisticVariant": ${logistical_variant.base_lv},
-            
+            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,
+
+            <#if logistical_variant.base_lv?? && logistical_variant.base_lv!="">
+              "IsBaseLogisticVariant": ${logistical_variant.base_lv},
+            </#if>
+
             <#if logistical_variant.base_lv != "true">
               "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}",
               </#if>
-            
+
               "QuantityInRefLV": ${logistical_variant.quantity_in_subpackaging_lv},
-              
+
             "NetWeight": {
                 "Value":  ${logistical_variant.net_weight},
                 "Unit": "${weight_unit_rfx}"
               },
               "GrossWeight": {
-                "Value":  ${logistical_variant.gross_weight}, 
+                "Value":  ${logistical_variant.gross_weight},
                 "Unit": "${weight_unit_rfx}"
               },
               "Volume": {
                 "Value": ${logistical_variant.volume},
                 "Unit": "${volume_unit_rfx}"
-              },    
+              },
               "Height": {
                 "Value": ${logistical_variant.height},
                 "Unit": "${length_unit_rfx}"
-              }, 
+              },
               "Width": {
                 "Value": ${logistical_variant.width},
                 "Unit": "${length_unit_rfx}"
-              }, 
+              },
               "Length": {
                 "Value": ${logistical_variant.depth},
                 "Unit": "${length_unit_rfx}"
-              },    
-                     
-           
+              },
+
+
            <#if logistical_variant.packaging_lv == "true">
              "BranchIDs": ["${logistical_variant.logistical_variant_code}"]
             <#else>
            "BranchIDs": []
-             </#if> 
-                  
+             </#if>
+
             }
-            <#sep>,</#sep> 
-          
-          </#list>    
-          ]       
+            <#sep>,</#sep>
+
+          </#list>
+          ]
         </#if>
       <#-- End of LV loop -->
-        
+
     }
   }
 ]

RFXtoRP_HsaItm_ItemDeleted.ftl

@@ -1,12 +1,12 @@
 <#include "HfRpConfig.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${item.item_code?trim?json_string}"
     },
-    "Payload": {}      
+    "Payload": {}
   }
 ]

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

@@ -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,68 +14,68 @@
    <#case "U">
       <#--  Action = CREATE or UPDATE  -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> 
+      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#--**Pick batch runned (200) **-->
-         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> 
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :         
-            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">          
-            }
-         <#else>
-            <#-- ** Collection started (300) and Preparation in progress (400)** -->
-            <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+         <#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.ExecutionflowPreparationStarted> 
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-               "datas" :         
-                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">          
+               "datas" :
+               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
                }
             <#else>
-               <#-- **Preparation to package (500) and preparation completed (550)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "500" || preparationStatusInterface.preparation_status_code == "550")>
+               <#-- ** Collection started (300) and Preparation in progress (400)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
                   {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> 
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
                   "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :         
-                     <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">          
+                  "datas" :
+                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
                   }
                <#else>
-                  <#-- ****Preparation dispatched (600)** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >            
-                     {
-                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> 
-                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                     "datas" :         
-                        <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">          
-                     }
-                  <#else>
-                     <#-- ****Preparation cancelled (650)**** -->
-                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                     <#-- ****Preparation dispatched (600)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
                         {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :         
-                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">          
+                        "datas" :
+                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                        },
+                        {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                         }
+                  <#else>
+                        <#-- ****Preparation cancelled (650)**** -->
+                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                           {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           }
                      <#else>
-                        <#stop>
-					 </#if>
+                           <#stop>
+                     </#if>
                   </#if>
                </#if>
             </#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,11 +1,11 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",

RFXtoRP_HsaProStatus_PreparationCompleted.ftl

@@ -1,10 +1,10 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
@@ -13,8 +13,8 @@
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
-     
+
     "Payload": {}
-     
+
   }
 ]

RFXtoRP_HsaProStatus_PreparationExpected.ftl

@@ -1,10 +1,10 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
@@ -13,8 +13,8 @@
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
-     
+
     "Payload": {}
-     
+
   }
 ]

RFXtoRP_HsaProStatus_PreparationStarted.ftl

@@ -1,10 +1,10 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
@@ -13,8 +13,8 @@
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
-     
+
     "Payload": {}
-     
+
   }
 ]

RFXtoRP_HsaProStatus_TransportStarted.ftl

@@ -1,10 +1,10 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
@@ -13,8 +13,8 @@
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
-     
+
     "Payload": {}
-     
+
   }
 ]

RFXtoRP_HsaSup.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 actor = JsonUtil.jsonToMap(dataRfx)> 
-       [  
+      <#assign actor = JsonUtil.jsonToMap(dataRfx)>
+       [
          {
-         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> 
+         <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsaSup_ActorCreated.ftl">          
+         "datas" :
+          <#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" :         
-          <#include "RFXtoRP_HsaSup_ActorDeleted.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsaSup_ActorDeleted.ftl">
          }
-       ]  
+       ]
       <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsaSup_ActorCreated.ftl

@@ -1,54 +1,60 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  { 
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "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,                
+        "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?? >  
+        <#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}", 
+          "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}", 
+        "Phones": ["${actor.optional_attributes.telephone?json_string}",
                   "${actor.optional_attributes.other_number?json_string}"
                   ],
       </#if>
        "Typology": "TYPOLOGY_UNKNOWN"
        }
-  } 
+  }
 ]

RFXtoRP_HsaSup_ActorDeleted.ftl

@@ -1,12 +1,14 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  { 
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "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.ActorCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-              <#include "RFXtoRP_HsrDepot_ActorCreated.ftl">                       
+          "datas" :
+              <#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" :         
-          <#include "RFXtoRP_HsrDepot_ActorDeleted.ftl">          
+         "datas" :
+          <#include "RFXtoRP_HsrDepot_ActorDeleted.ftl">
          }
-       ]  
+       ]
          <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsrDepot_ActorCreated.ftl

@@ -1,50 +1,61 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "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?? >  
+        <#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}", 
+          "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}", 
-                 "${depot.physical_depot_address.other_number?json_string}"
-                ],
+         <#if depot.physical_depot_address??>
+        "Phones": ["${depot.physical_depot_address.telephone?json_string}",
+                  "${depot.physical_depot_address.other_number?json_string}"
+                  ],
+        </#if>
        "Typology": "TYPOLOGY_UNKNOWN"
        }
-  }  
+  }
 ]

RFXtoRP_HsrDepot_ActorDeleted.ftl

@@ -1,12 +1,14 @@
+<#include "ReflexUtils.ftl">
+<#include "HfRpConfig.ftl">
+<#include "ActorPrefix.ftl">
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "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_HsrPrepa.ftl

@@ -2,59 +2,109 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
- 
-<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> 
+<#include "ReflexUtils.ftl">
+<#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 preparationOrder = JsonUtil.jsonToMap(dataRfx)> 
-       
-<#if	preparationOrder.total_lv_validated !=0>   
-	   [  
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
-         },
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
-         }
-          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-          <#list preparation_line.despatched_ipg_list as despatched_ipg>
-          <#if despatched_ipg.consignment_unit_id != ""> 
-            ,
+<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
+
+   <#if	preparationOrder.total_lv_validated !=0>
+         [
             {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :         
-            <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+            },
+            {
+
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#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">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
+               }
+            </#if>
+
+            <#assign refIDHmap ={}>
+            <#assign hd_numberHmap ={}>
+            <#assign hd_numberHmapHUadded ={}>
+            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+            <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
+               <#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]??>
+               <#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>
-       ]
-<#else>
-    <#stop "no confirmed quantity for the preparation - preparation closed">
-</#if>
-   
+            <#assign refIDHmap ={}>
+         ]
+   <#else>
+      <#stop "no confirmed quantity for the preparation - preparation closed">
+   </#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

@@ -0,0 +1,34 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  <#assign refIDHmap_local ={}>
+   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+        <#if refIDHmap_local?size != 0 >
+        ,
+        </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      }
+      <#-- Add transport grade code
+      <#if preparationOrder.transport_grade_code!="">
+      ,
+      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+      </#if> -->
+    }
+    }
+    </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
+]

RFXtoRP_HsrPrepa_GoodsPrepared.ftl

@@ -1,89 +0,0 @@
-<#include "HfRpConfig.ftl">
-
-[
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    { 
-    "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      <#if despatched_ipg.carton_number != "000000000000000000"> 
-        "RefID": "${despatched_ipg.carton_number}"
-      <#else>
-        "RefID": "${despatched_ipg.hd_number}"
-      </#if>
-    },
-     
-    "Payload": {
-      "Information" :{
-        <#if despatched_ipg.carton_number != "000000000000000000"> 
-           "ContainerType": "${despatched_ipg.carton_type_code}"
-        <#else>
-           "ContainerType": "${despatched_ipg.hd_type_code}"
-        </#if>
-      
-        },
-     <#--  HU Metadata inclusin inclusion -->
-    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">  
-    ,
-    "PreparedContents" :[
-       {
-       "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 />
-              "PriorityDate": "${priority_date}",
-             <#else>
-            <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-              <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
-              "PriorityDate": "${priority_date}",
-             <#else>
-             <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
-              "PriorityDate": "${priority_date}",
-             <#else>
-             <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-               <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
-              "PriorityDate": "${priority_date}",
-             <#else>
-              <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-              <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> 
-              "PriorityDate": "${priority_date}",
-             <#else>
-			 <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
-              <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> 
-              "PriorityDate": "${priority_date}",
-             <#else>
-                                                  "PriorityDate": "1970-01-01T00:00:00Z",
-          </#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.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}",
-       "Quantity": {
-            "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${despatched_ipg.quantity_lvs}           
-       }
-      }
-      ]
-    }
-     
-  }<#sep>,</#sep>
-  </#list>  
-  <#sep>,</#sep>
-  </#list> 
-]

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

@@ -0,0 +1,29 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+[
+<#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 preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
+      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
+        <#if refIDHmap?size != 0 >
+        ,
+        </#if>
+        <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}>
+        {
+        "Header": {
+          "ProjectID": "${projectRP}"
+           },
+        "ID": {
+          "RefID": "${despatched_ipg3.carton_number}",
+          "RefDate": {
+            "DateTime": "${dispatched3_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+                }
+           },
+          "Payload": { }
+        }
+     </#if>
+      </#list>
+  </#list>
+]

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,27 +1,28 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+<#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 preparation_line.despatched_ipg_list as despatched_ipg>
-    { 
-    "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      <#if despatched_ipg.carton_number != "000000000000000000"> 
-      "RefID": "${despatched_ipg.carton_number}",
-      <#else>
-      "RefID": "${despatched_ipg.hd_number}",
+      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={despatched_ipg.hd_number,despatched_ipg.hd_number}>
+          {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            "RefID": "${despatched_ipg.hd_number}",
+            "RefDate": {
+              "DateTime": "${dispatched_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+            },
+            "Payload": { }
+            }
       </#if>
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"            
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
-      </#list>
-  <#sep>,</#sep>
-  </#list> 
+    </#list>
+  </#list>
+  <#assign refIDHmap_local ={}>
 ]

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -0,0 +1,134 @@
+<#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 preparation_line.despatched_ipg_list as despatched_ipg>
+    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
+    {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+       "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${packing_datetime}"
+    },
+      <#if despatched_ipg.carton_number != "000000000000000000">
+        "RefID": "${despatched_ipg.carton_number}"
+      <#else>
+        "RefID": "${despatched_ipg.hd_number}"
+      </#if>
+    },
+
+    "Payload": {
+      "Information" :{
+        <#if despatched_ipg.carton_number != "000000000000000000">
+           "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>
+              ,
+              "Length": {
+              "Unit": "${length_unit_rfx}",
+              "Value": "${dimensionCarton.overall_depth}"
+              },
+              "Weight": {
+              "Unit": "${weight_unit_rfx}",
+              "Value": "${dimensionCarton.carton_gross_weight}"
+              },
+              "Height": {
+              "Unit": "${length_unit_rfx}",
+              "Value": "${dimensionCarton.overall_height}"
+              },
+              "Width": {
+              "Unit": "${length_unit_rfx}",
+              "Value": "${dimensionCarton.overall_width}"
+              }
+              </#list>
+            </#if>
+        <#else>
+           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
+           <#if preparation_line.despatched_hds_list??>
+            <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
+            ,
+              "Length": {
+                "Unit": "${length_unit_rfx}",
+                "Value": "${dimensionHU.hd_type_depth}"
+              },
+              "Weight": {
+                "Unit": "${weight_unit_rfx}",
+                "Value": "${dimensionHU.hd_gross_weight}"
+              },
+              "Width": {
+                "Unit": "${length_unit_rfx}",
+                "Value": "${dimensionHU.hd_type_width}"
+              }
+            </#list>
+          </#if>
+        </#if>
+      },
+
+     <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">
+    ,
+    "PreparedContents" :[
+       {
+       "Goods": {
+           "ItemID": "${preparation_line.item_code?trim?json_string}",
+           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
+
+             <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+				<#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+				"PriorityDate": "${priority_date}",
+             <#else>
+				<#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+					<#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${priority_date}",
+                <#else>
+					<#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+						<#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+                        "PriorityDate": "${priority_date}",
+					<#else>
+						<#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+							"PriorityDate": "${priority_date}",
+						<#else>
+							<#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+								<#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+								"PriorityDate": "${priority_date}",
+							<#else>
+								<#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
+									<#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc />
+                                    "PriorityDate": "${priority_date}",
+                                <#else>
+									"PriorityDate": "1970-01-01T00:00:00Z",
+                                </#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.pro_originator_reference_line_number!0) != 0>
+          "LineID": "${preparation_line.pro_originator_reference_line_number}",
+        <#else>
+          "LineID": "${preparation_line.pro_line_number!0}",
+        </#if>
+        "ActorID": "${RFXtoRPprefixDepot(preparationOrder.physical_depot_code?trim?json_string)}",
+        "Quantity": {
+          "LVID": "${quantity_in_base_lv_RP_Cst}",
+          "Value": ${despatched_ipg.quantity_lvs}
+       }
+
+      }
+      ]
+    }
+  }<#sep>,</#sep>
+  </#list>
+  <#sep>,</#sep>
+  </#list>
+]

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -0,0 +1,43 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+[
+ {
+    "Header": {
+    "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${HUadded_packing_datetime}"
+    },
+    "RefID": "${despatched_ipg.hd_number}"
+  },
+
+ "Payload": {
+
+"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
+  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
+      ,
+    "Information": {
+      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
+      "Length": {
+        "Unit": "${length_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth}
+      },
+      "Weight": {
+        "Unit": "${weight_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight}
+      },
+      "Width": {
+        "Unit": "${length_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
+      }
+    }
+    </#if>,
+ <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl">
+
+
+ }
+ }
+]

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -0,0 +1,29 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  <#assign refIDHmap_local ={}>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
+  <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+    ,
+    </#if>
+    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+        "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}"
+      }
+    }
+    }
+  </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
+]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -1,20 +1,40 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
- 
-  { 
+<#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
+  {
     "Header": {
-    "ProjectID": "${projectRP}"     
+    "ProjectID": "${projectRP}"
     },
     "ID": {
-			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      <#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>
+
+      "RefDate": {
+              "DateTime": "${dispatched_datetime4}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+        }
       },
     "Payload": {
-      <#if despatched_ipg.carton_number != "000000000000000000"> 
+      <#if despatched_ipg.carton_number != "000000000000000000">
       "HandlingunitID": "${despatched_ipg.carton_number}"
       <#else>
       "HandlingunitID": "${despatched_ipg.hd_number}"
       </#if>
+	  <#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_HsrPro.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,49 +14,55 @@
   <#case "U">
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> 
-       [  
-         {
-        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-         <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-          <#-- Only if preparation order not confirmed  -->
-          <#if preparation_order.preparation_order_confirmed == "false" >
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :         
-            <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">          
-          <#else>
-          <#stop "preparation order already confirmed">
-          </#if>
+      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+       [
 
-        <#else>
-          <#stop "preparation order type not supported">  
-        </#if>         
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          <#-- check preparation type code (internal order and reservation are ignored)  -->
+          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
+            <#-- Only if preparation order not confirmed  -->
+            <#if preparation_order.preparation_order_confirmed == "false" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            }
+           <#else>
+           <#-- preparation order already confirmed -->
+            <#stop>
+           </#if>
+
+          <#else>
+          <#-- preparation order type not supported -->
+          <#stop>
+          </#if>
         <#else>
           <#stop "PRO reference is empty">
         </#if>
-         }
-         
-       ]  
+       ]
   <#break>
-      
+
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> 
-       [  
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
+      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
+       [
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">                 
-         }
-       ]  
+          "datas" :
+          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
+        }
+        <#else>
+          <#stop "PRO reference is empty">
+        </#if>
+       ]
          <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsrPro_ExecutionflowCancelled.ftl

@@ -1,10 +1,10 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${preparation_order.originator_reference?trim?json_string}",

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -1,124 +1,126 @@
 <#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 pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_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 = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${preparation_order.originator_reference?trim?json_string}",
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"            
+           "AuthorTimeZone": "${time_zone_rfx}"
              }
     },
     "Payload": {
          "CreationDateTime": {
             "DateTime": "${pro_creation_datetime}",
-           "AuthorTimeZone": "${time_zone_rfx}"            
-             },   
+           "AuthorTimeZone": "${time_zone_rfx}"
+             },
             <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">,
-       <#-- Add transport grade code 
+       <#-- Add transport grade code
         <#if preparation_order.transport_grade_code!="">
                 "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
         </#if> -->
-        "ShipFrom": { 
-        "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
+        "ShipFrom": {
+          "ActorID": "${RFXtoRPprefixDepot(preparation_order.physical_depot_code?trim?json_string)}"
         },
-       "ShipFromAcked": true,    
+       "ShipFromAcked": true,
          "ShipTo": {
-          <#if 
-          <#-- preparation_order.address.type_code == "" && 
-          preparation_order.address.title_code == "" && 
-          preparation_order.address.first_name == "" && 
-          preparation_order.address.last_name == "" && 
-          preparation_order.address.mail_address == "" && 
-          preparation_order.address.contact_type_code == "" && 
-          preparation_order.address.mobile_phone_number == "" && 
-          preparation_order.address.land_line_phone_number == "" && 
+          <#if
+          <#-- preparation_order.address.type_code == "" &&
+          preparation_order.address.title_code == "" &&
+          preparation_order.address.first_name == "" &&
+          preparation_order.address.last_name == "" &&
+          preparation_order.address.mail_address == "" &&
+          preparation_order.address.contact_type_code == "" &&
+          preparation_order.address.mobile_phone_number == "" &&
+          preparation_order.address.land_line_phone_number == "" &&
           preparation_order.address.fax_number == "" && -->
-          preparation_order.address.address_type_code == "" && 
-          preparation_order.address.name_or_company_name == "" && 
-          preparation_order.address.additional_address_data_1 == "" && 
-          preparation_order.address.additional_address_data_2 == "" && 
-          preparation_order.address.post_code_area_name == "" && 
-          preparation_order.address.territorial_division_code == "" && 
-          preparation_order.address.postal_code == "" && 
-          preparation_order.address.iso_country_code == ""> 
-            "ActorID": "${preparation_order.end_consignee_code}"
-          <#else>        
-            "Actor": 
-             { 
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+          preparation_order.address.address_type_code == "" &&
+          preparation_order.address.name_or_company_name == "" &&
+          preparation_order.address.additional_address_data_1 == "" &&
+          preparation_order.address.additional_address_data_2 == "" &&
+          preparation_order.address.post_code_area_name == "" &&
+          preparation_order.address.territorial_division_code == "" &&
+          preparation_order.address.postal_code == "" &&
+          preparation_order.address.iso_country_code == "">
+            "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}"
+          <#else>
+            "Actor":
+             {
+              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
               "Address" :
                 {
-                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
-                 "CountryCode" : "${preparation_order.address.iso_country_code!""}",
-                 "PostalCode" : "${preparation_order.address.postal_code!""}",
-                 "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
-                 "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
-                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
+                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
+                 <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) />
+                 <#if isCountryCode>
+                 "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}",
+                 <#else>
+                  "CountryCode" : "",
+                 </#if>
+                 "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}",
+                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
                  }
                   },
-              "Contact" : 
+              "Contact" :
                 {
-                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
-                  "LastName" : "${preparation_order.address.last_name?json_string!""}",  
-                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},   
-                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
-                }                          
-          </#if>         
+                  "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 preparation_order.line_list??>   
+
+       <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >
-           { 
-             <#if (preparation_order_line.originator_reference_line_number!0) != 0> 
+           {
+             <#if (preparation_order_line.originator_reference_line_number!0) != 0>
                "LineID": "${preparation_order_line.originator_reference_line_number}",
                <#else>
                "LineID": "${preparation_order_line.preparation_order_line_number!0}",
                 </#if>
           <#-- Line Metadata inclusion -->
           <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
-          
-             "RequestedContent": 
-             {             
-                   "Goods": 
+             "RequestedContent":
+             {
+                   "Goods":
                {
                   "ItemID":   "${preparation_order_line.item_code?trim?json_string!"0"}",
                   "LVBranchID":   "${preparation_order_line.item_lv_code?json_string!"0"}",
                   <#if (preparation_order_line.optional_attributes.forced_priority_date?length  != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)>
-                       <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />                       
-                           "PriorityDate": "${forced_priority_date}", 
+                       <#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" : 
+               "Quantity" :
                {
                   "LVID":   "${quantity_in_base_lv_RP_Cst}",
-                  "Value":  "${preparation_order_line.base_lv_quantity_to_prepare!0}" 
+                  "Value":  "${preparation_order_line.base_lv_quantity_to_prepare!0}"
                }
              }
            }<#sep>,</#sep>
-           </#list>          
+           </#list>
          ],
          </#if>
-         
          "RequestedMilestones" :
           {
-             "RequestedDeliveryDateTime" : 
+             "RequestedDeliveryDateTime" :
              {
-                "DateTime": "${planned_final_delivery_start_datetime}",  
-               "AuthorTimeZone": "${time_zone_rfx}"            
-             }   
-         }  
+                "DateTime": "${planned_final_delivery_start_datetime}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+             }
+         }
     }
   }
 ]

RFXtoRP_HsrReceiptList.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>
 
@@ -12,86 +12,92 @@
 <#switch cloudEventMsg.action>
     <#case "C">
         <#-- *********************************************** Action = CREATE ******************** -->
-           
+
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-      <#if receipt.receipt_type = "030">
-      <#stop "ignored message because receipt type = transfert">
-      <#else>
-       [  
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">  
-          
-        },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">  
-          
-        }
-       ] 
-       </#if> 
+        <#if receipt.receipt_type = "030">
+        <#stop "ignored message because receipt type = transfert">
         <#else>
-          <#stop "Receipt reference is empty">
+          [
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+
+          },
+          {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+          }
+          ]
         </#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_confirmed == "true" >
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">  
-        }        
-        <#else>
-          <#if receipt.receipt_type = "030">
-          <#stop "ignored message because receipt type = transfert">
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+       [
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.receipt_confirmed == "true" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+            }
           <#else>
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :         
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">  
-          },
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">  
-          
-          }
+            <#if receipt.receipt_type = "030">
+              <#stop "ignored message because receipt type = transfert">
+            <#else>
+              {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+              },
+              {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+            }
+            </#if>
+          </#if>
+        <#else>
+          <#stop "Receipt reference is empty">
         </#if>
-        </#if>
-       ]  
+       ]
       <#break>
-      
+
       <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign receipt = JsonUtil.jsonToMap(dataRfx)> 
-       [  
-         {
+      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
+       [
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          {
 
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">  
-                 
-         }
-       ]  
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
+        <#else>
+          <#stop "Receipt reference is empty">
+        </#if>
+       ]
          <#break>
-          
-      
+
+
     <#default>
-          <#stop "event not supported">
+          <#stop >
 </#switch>
 

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -1,11 +1,11 @@
 <#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) />
 
 [
-  {  
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${receipt.receipt_reference?trim?json_string}",

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -1,87 +1,93 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
 [
-  {  
-  <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+  {
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
      "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${receipt.receipt_reference?trim?json_string}",
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
-            "AuthorTimeZone": "${time_zone_rfx}"            
+            "AuthorTimeZone": "${time_zone_rfx}"
              }
     },
     "Payload": {
          "CreationDateTime": {
            "DateTime": "${receipt_creation_datetime}",
            "AuthorTimeZone": "${time_zone_rfx}"
-             },   
-   
+             },
+
        <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
-      
-      "ShipFrom": 
+
+      "ShipFrom":
       {
-      "ActorID": "${receipt.original_code?trim?json_string}"
+        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
       },
-        "ShipTo"  : 
+        "ShipTo"  :
       {
-      "ActorID": "${receipt.physical_depot_code?trim?json_string}"
+         "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}"
       },
-      "ShipToAcked": true,  
-        
+      "ShipToAcked": true,
+
       <#if receipt.carrier_informations.carrier_code != "">
-          "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
-      </#if>         
-       
-      
-      <#if receipt.line_list??> 
+        "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": 
+          "RequestedContent":
+          {
+            "Goods":
             {
               "ItemID":   "${line.item_code?trim?json_string!"0"}",
               "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if line.line_without_detail??> 
-                  <#if (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}", 
-                  </#if>
+              <#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>
-                <#stop >
+                <#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" : 
+            "Quantity" :
             {
               "LVID":   "${quantity_in_base_lv_RP_Cst}",
-              "Value":  "${line.order_quantity_in_lv!0}" 
+              "Value":  "${line.order_quantity_in_lv!0}"
             }
           }
-        
+
         }
       <#sep>,</#sep>
-          </#list>          
+          </#list>
          ],
       </#if>
-         
+
          "RequestedMilestones" :
          {
-             "RequestedDeliveryDateTime" : 
+             "RequestedDeliveryDateTime" :
              {
-                "DateTime": "${receipt_datetime}",  
-               "AuthorTimeZone": "${time_zone_rfx}"            
-             }  
+                "DateTime": "${receipt_datetime}",
+               "AuthorTimeZone": "${time_zone_rfx}"
+             }
          }
     }
   }

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,10 +1,10 @@
 <#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}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
       "RefID": "${receipt.receipt_reference?trim?json_string}",

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -1,11 +1,11 @@
 <#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) />
 
 [
-  { 
+  {
     "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
     },
     "ID": {
          "RefID": "${receipt.receipt_reference?trim?json_string}",
@@ -14,8 +14,8 @@
         "AuthorTimeZone": "${time_zone_rfx}"
       }
     },
-     
+
     "Payload": {}
-     
+
   }
 ]

RFXtoRP_PlatformLogCreate.ftl

@@ -2,9 +2,9 @@
 [
     <#assign UUID = UUID.randomUUID()>
     <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
-	{ 
+	{
 	  "Header": {
-	    "ProjectID": "${projectRP}"	   
+	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
 	        "RefID": "${UUID}",
@@ -12,7 +12,7 @@
 		      "DateTime": "${aDateTime?iso_utc}",
 		      "AuthorTimeZone": "${time_zone_rfx}"
 		    }
-	  },	   
+	  },
 	  "Payload": {
 	      <#assign severity = SeverityLevel.ERROR>
 	     "Severity": "${severity}",
@@ -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}",
-	    "ContextPayload": "rfxresponse",
+	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
+	    "ContextPayload": ${strJsonBody},
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
-	    "Task": "${id.apiRestReflexID}",
-	    "OriginalID": "${id.refid}",
+	    "Task": "${id.apiRestReflexID!"no Task"}",
+	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
-]
-
+]

RFXtoRP_PrepOrder_ShipFromAcked.ftl

@@ -1,15 +1,15 @@
 [
-	{ 
+	{
 	  "Header": {
-	    "ProjectID": "${projectRP}"	   
+	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
-	   
+
 	  "Payload": {
 	     "ShipFromAcked": true
 	  }
-	   
+
 	}
 ]

RFXtoRP_Receipt_ShipToAcked.ftl

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

RFXtoRP_RestResponse.ftl

@@ -3,106 +3,203 @@
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 
-<#assign restResponsetMsg = JsonUtil.jsonToMap(input)> 
-<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)> 
+<#assign restResponsetMsg = JsonUtil.jsonToMap(input)>
+<#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>
-	             <#case 200>
-	             <#case 201>
-					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
-					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
-					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
-						[  
-						   {
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> 
-							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :         
-								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">							
-						   }
-					   ]
-				   <#else> 
-				   [  
-					   {
-					     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :         
-							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   }
-				   ] 
-				   </#if>
-				   <#break> 				  
-	           <#default>
-				   [  
+			 <#switch restResponsetMsg.status!no_status>
+			     <#case no_status>
+				   [
 					   {
 					     <#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "{}" />
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
 						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :         
-							<#include "RFXtoRP_PlatformLogCreate.ftl">						
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
-				   ]  	           
-               </#switch>				   
+				   ]
+				   <#break>
+				   
+	             <#case 200>
+	             <#case 201>
+					<#-- *********************************************** ApiRestID = preparation_orders_post ******************** -->
+					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
+					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+						[
+						   {
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							 "datas" :
+								<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+						   }
+					   ]
+					<#else>
+						<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
+							[
+							{
+								<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+								"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+								"datas" :
+									<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+							}
+							]
+				  		 <#else>
+						[
+							{
+								<#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>
+				   [
+					   {
+					     <#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">
+					   }
+				   ]
+               </#switch>
 			   <#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 ******************** -->
 					<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> 
-					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > 
-					   [  
+					<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
+					<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
+					   [
 						   {
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked> 
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked>
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :         
-								<#include "RFXtoRP_Receipt_ShipToAcked.ftl">						
+							 "datas" :
+								<#include "RFXtoRP_Receipt_ShipToAcked.ftl">
 						   }
-					   ]  
-					<#else> 
-					   [  
+					   ]
+					<#else>
+					   [
 						   {
 						     <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
-							 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
+							 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							 "datas" :         
-								<#include "RFXtoRP_PlatformLogCreate.ftl">						
-						   }
-					   ] 
-		   				
+							 "datas" :
+								<#include "RFXtoRP_PlatformLogCreate.ftl">
+						   },
+						   {
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							"datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   		}
+					   ]
+
 			   		</#if>
 			   		<#break>
 	           <#default>
-				   [  
+				   [
 					   {
 						<#if restResponsetMsg.body?? >
 						  <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 						 <#else>
-						 <#assign restResponseBody = "{}" />
+						 <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" />
 						 </#if>
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> 
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :         
-							<#include "RFXtoRP_PlatformLogCreate.ftl">						
+						 "datas" :
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
-				   ]  	           
-               </#switch>				   
+				   ]
+               </#switch>
 		       <#break>
-    
 	  <#default>
 	        <#stop>
 </#switch>

RFXtoRP_RestResponseAllocationError.ftl

@@ -0,0 +1,20 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+         "RefID": "${id.refid!"no RefID"?trim?json_string}",
+       "RefDate": {
+        "DateTime": "${aDateTime?iso_utc}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {}
+
+  }
+]

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 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"}>
+<#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" >
+<#assign rfx_date_format_default = "yyyy-MM-dd" >
 
- </#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> 
- <#noparse><#assign weight_unit_rfx             = weight_unit_KV_rfx[</#noparse>"${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"></#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> 
-  
+<#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><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#noparse>"></#noparse>
- <#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+00:00"}<#noparse>"></#noparse>  
-  
- 
- <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>
- <#noparse><#assign text_language_rfx   = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse> 
+</#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>
+<#noparse><#assign weight_unit_rfx             = weight_unit_KV_rfx[</#noparse>"${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"></#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

@@ -2,8 +2,10 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
 
-<#assign eventRP = JsonUtil.jsonToMap(input)> 
+<#assign eventRP = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
@@ -22,28 +24,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" :         
-					<#include "RPtoRFX_PrepOrder.ftl">	
+				 "datas" :
+					<#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" :         
-					<#include "RPtoRFX_Receipt.ftl">	
+				 "datas" :
+					<#include "RPtoRFX_Receipt.ftl">
 			   }
 			   </#if>
 
-		   ]  
+		   ]
 			<#break>
 	  <#default>
-	        <#stop "Event not processed">
+	        <#stop >
 </#switch>
 

RPtoRFX_PrepOrder.ftl

@@ -1,26 +1,39 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
-
-<#assign aDateTime = .now>
-
+<#include "ActorPrefix.ftl">
+<#include "HfRpConfig.ftl">
+<#-- Valeurs par défaut Adresse -->
+<#-- Default values -->
+<#assign typecode ="010">
+<#assign titlecode ="1">
+<#assign contacttypecode ="010">
+<#assign adresstypecode ="010">
+<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans Reflex WMS pour utiliser cette fonctionnalité -->
+<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
+<#assign defaultactor ="VIZ">
+<#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
+	<#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" >
+<#else>
+	<#assign actorID = defaultactor >
+</#if>
 
 {
-	"id" : {"refid" : "${executionflow.OrderID}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" : 
+	"payload" :
 	 {
-		"originator_reference": "${executionflow.OrderID}",
+		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
-		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+		"end_consignee_code": "${actorID}",
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
+			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
+			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
@@ -33,53 +46,70 @@
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
-		  	},
-		<#if executionflow.ShipTo.ActorID == ""> 
-		"address": {
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
-				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
-				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
-				"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_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
-				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
-				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
-			  },
+		  	}
+		<#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}",
+				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				<#if executionflow.ShipTo.Actor.Address.Name?? && executionflow.ShipTo.Actor.Address.Name!="">
+					"name_or_company_name" : "${(executionflow.ShipTo.Actor.Address.Name!"")?json_string}",
+				<#else>
+					"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				</#if>
+				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}",
+				</#if>
+				<#if executionflow.ShipTo.Contact.Phones?? && 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}",
+				"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
+				"additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}",
+				"postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}",
+				"post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}",
+				"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") />
-			</#if>
-			<#if line.RequestedContent.Goods.SegmentationKeys??>
-			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-			</#if>
-			<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
-		{
-	  	    "originator_reference_line_number": ${line.LineID?number},
-			"item_code": "${line.RequestedContent.Goods.ItemID!""}",
-			"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
-			"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
-			"owner_code_to_prepare" :"${owner_code_to_prepare}",
-			"grade_code_to_prepare" :"${grade_code_to_prepare}",
-			"input_order_data": "false",
-			"batch_1": "${batch_1}",
-			"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>	     	
-		]	  
+		<#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") />
+				</#if>
+				<#if line.RequestedContent.Goods.SegmentationKeys??>
+				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				</#if>
+				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
+				{
+				"originator_reference_line_number": ${line.LineID?number},
+				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
+				"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
+				"owner_code_to_prepare" :"${owner_code_to_prepare}",
+				"grade_code_to_prepare" :"${grade_code_to_prepare}",
+				"input_order_data": "false",
+				"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_DefaultHeaderData.ftl

@@ -1,7 +1,7 @@
 <#-- Note : you can use Order Header Metadata, using the define map : Header_MetaData_Map  -->
 
 <#-- How to use MD Header map
-    Example : 
+    Example :
     <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
 
     If your MD is :
@@ -23,8 +23,22 @@
 <#assign protected_flag ="false"/>
 <#assign automatic_generation_flag ="false"/>
 <#assign apt_with_end_consignee_flag="false"/>
-<#assign load_grouping = "DEFAUT"/>
-
+
+<#-- A supprimer si utilisation de la table de correspondance-->
+<#--To be deleted if using the correspondence table-->
+<#assign load_grouping = "default">
+
+
+<#-- Table de correspondance Transporteur/Code regroupement chargement,
+affectation à un chargement si paramétrage  regroupement chargement+plan de base distribution-->
+<#--Carrier / Load Grouping Code Correspondence Table,
+Assigning to a load if you set up Load Grouping+Distribution Master Plan-->
+<#-- Example -->
+    <#--<#if executionflow.Carrier.ActorID == "TEST" >
+        <#assign load_grouping = "TEST">
+        <#else>
+        <#assign load_grouping = "default">
+    </#if>-->
 
 
 

RPtoRFX_Receipt.ftl

@@ -1,33 +1,36 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-<#assign aDateTime = .now>
+<#include "ActorPrefix.ftl">
+<#include "HfRpConfig.ftl">
+
 {
-	"id" : {"refid" : "${executionflow.OrderID}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
 		"activity_code": "${activity_code}",
-		"physical_depot_code": "${executionflow.ShipTo.ActorID!""}",
+		"physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipTo.ActorID!"")}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" : 
+	"payload" :
 	 {
-		"receipt_reference": "${executionflow.OrderID}",
+		"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}",
-		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
+		"original_code"  : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}",
+		"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
 
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
+			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-			"receipt_datetime":  "${aDateTime?iso_utc}",
+			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
-		  
-		<#if executionflow.Lines??> 
+		"dock_occupation_duration": 1
+
+		<#if executionflow.Lines??>
+		,
 			"line_list": [
 			<#list executionflow.Lines as line>
 
@@ -46,7 +49,7 @@
 				"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",
 			   		"held _for_repacking": "false",
@@ -59,9 +62,8 @@
   				} -->
 
 			}<#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 :

ReflexUtils.ftl

@@ -2,8 +2,11 @@
 <#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
-  <#assign datetimeUTC = JsonUtil.createUTCDateTime(rfxdatetime,time_zone_rfx , "yyyy-MM-dd'T'HH:mm:ss") />
-  <#return (datetimeUTC)>
+  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
+</#function>
+
+<#function DateTimeUTCtoRfxLocale dateutc locale >
+  <#return dateutc?datetime.iso?iso_nz(locale)>
 </#function>
 
 <#-- --------------------------------------------------------------------------------------- -->
@@ -13,15 +16,15 @@
 <#-- --------------------------------------------------------------------------------------- -->
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
-<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
+<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
 <#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.12+3
+1.2.38+1