Release 1.2.25+2

Merge branch 'SCPN1-7065' into 'release/1.2'
SCPN1-7065 See merge request r-d-technique/tiers/reflex-wms-connector!57
2024-08-29 10:59:28 +02:00 · 2024-08-29 08:48:06 +00:00 · 2024-08-29 10:37:54 +02:00 · 2024-08-08 16:55:33 +02:00 · 2024-08-07 12:23:46 +02:00 · 2024-08-07 08:44:43 +02:00
27 changed files with 368 additions and 235 deletions
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -29,7 +29,12 @@
          "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,7 +44,8 @@
            "Name": "${carrier.address.company_name?json_string}",
            "StreetAddressOne" : "${carrier.address.address_1?json_string}",
            "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
-            "StreetAddressThree" : "${carrier.address.address_3?json_string}"
+            "StreetAddressThree" : "${carrier.address.address_3?json_string}",
+			"CountryCode" : ""
          </#if>
        </#if>
         },
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -29,7 +29,12 @@
        "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
        "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
        "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
-        "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
+        <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) />
+         <#if isCountryCode>
+        "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}",
+          <#else>
+            "CountryCode" : "",
+          </#if>
 			  "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}",
 			  "State": "${actor.consignee_structured_address.country_designation?json_string}"

@@ -40,7 +45,8 @@
            "Name": "${actor.address.company_name?json_string}",
            "StreetAddressOne" : "${actor.address.address_1?json_string}",
            "StreetAddressTwo" : "${actor.address.address_2?json_string}",
-            "StreetAddressThree" : "${actor.address.address_3?json_string}"
+            "StreetAddressThree" : "${actor.address.address_3?json_string}",
+			 "CountryCode" : ""
          </#if>
        </#if>
       },
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -14,8 +14,7 @@
      <#-- 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 -->
+         <#-- IPG moves translated into Stock moves -->
         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
            reflexMvtStockInterface.ipg_move_type == "200" ||
            reflexMvtStockInterface.ipg_move_type == "210" ||
@@ -25,13 +24,15 @@
            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"
            >
            [
            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
@@ -41,22 +42,22 @@
            <#-- 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") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                  [
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-                  }
-                  ]
+                     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>
-                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                     <#-- Case of IPG move type volontarilly ignored-->
-                     <#stop " Reference receipt is empty">
-                  <#else>
-                     <#stop>
-                  </#if>
+                  <#stop>
               </#if>
         </#if>
      <#else>
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -20,7 +20,11 @@
       "Goods": {
           "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
           "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           "PriorityDate": "${priority_date}",
+           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
+              "PriorityDate": "${priority_date}",
+           <#else>
+              "PriorityDate": "1970-01-01T00:00:00Z",
+            </#if>

         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -10,6 +10,8 @@
            "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"}>
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@@ -16,8 +16,8 @@
          "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>
                   ],
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -39,8 +39,8 @@
            "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>
                       ],
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -28,7 +28,12 @@
          "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}"

@@ -38,7 +43,8 @@
            "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>

--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -28,7 +28,12 @@
          "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}"

@@ -37,7 +42,8 @@
          "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>

         },
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -2,7 +2,7 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-
+<#include "ReflexUtils.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -25,6 +25,7 @@
            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
            },
            {
+
            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
@@ -47,8 +48,10 @@
               }
            </#if>

+            <#assign refIDHmap ={}>
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
            <#if despatched_ipg.consignment_unit_id!="">
               ,
               {
@@ -75,6 +78,7 @@
            </#if>
               </#list>
            </#list>
+            <#assign refIDHmap ={}>
         ]
   <#else>
      <#stop "no confirmed quantity for the preparation - preparation closed">
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,26 +1,33 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+  <#assign refIDHmap_local ={}>
   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${OrderOriginReference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+        <#if refIDHmap_local?size != 0 >
+        ,
+        </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      }
+      <#-- Add transport grade code
+      <#if preparationOrder.transport_grade_code!="">
+      ,
+      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+      </#if> -->
    }
-    <#-- Add transport grade code
-    <#if preparationOrder.transport_grade_code!="">
-    ,
-    "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-    </#if> -->
-  }
-  }
-  <#sep>,</#sep>
-   </#list>
+    }
+    </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,25 +1,29 @@
 <#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_line2>
-    <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2>
-    {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${despatched_ipg2.carton_number}",
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
+<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) 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>
-  <#if preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
-  <#sep>,</#sep>
-  </#if>
  </#list>
 ]
--- a/RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl
@@ -0,0 +1,9 @@
+<#-- use protobuf of class HsrPrepa to find Reflex WMS fields names  -->
+
+<#--
+"MetaData" :[
+
+          ]
+
+-->
+"MetaData": [            ]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -2,22 +2,27 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${despatched_ipg.hd_number}",
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
-      </#list>
-  <#sep>,</#sep>
+      <#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>
+    </#list>
  </#list>
+  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,13 +1,17 @@
 <#include "HfRpConfig.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 = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_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>
@@ -18,9 +22,9 @@
    "Payload": {
      "Information" :{
        <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg.carton_type_code}"
+           "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
           <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
+              <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
              ,
              "Length": {
              "Unit": "${length_unit_rfx}",
@@ -43,7 +47,7 @@
        <#else>
           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
           <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
+            <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
            ,
              "Length": {
                "Unit": "${length_unit_rfx}",
@@ -70,37 +74,38 @@
       "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 />
+           
+             <#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_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>
+                <#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>
+             </#if>

       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -1,19 +1,22 @@
 <#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?? >
+  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
      ,
    "Information": {
      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
@@ -30,7 +33,10 @@
        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
      }
    }
-    </#if>
+    </#if>,
+ <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_HUsAdded_Metadata.ftl">
+

 }
 }
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,21 +1,28 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+  <#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${OrderOriginReference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+  <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+    ,
+    </#if>
+    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      }
    }
-  }
-  }
-    <#sep>,</#sep>
-   </#list>
+    }
+  </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,16 +16,18 @@
      <#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>
@@ -36,7 +38,7 @@
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-         }
+

       ]
  <#break>
@@ -46,18 +48,16 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#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">
-          }
+        }
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-        }
       ]
         <#break>

--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -52,23 +52,23 @@
          <#else>
            "Actor":
             {
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
              "Address" :
                {
-                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
+                 "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!""}"
+                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
+                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
+                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
                 }
                  },
              "Contact" :
                {
-                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
-                  "LastName" : "${preparation_order.address.last_name?json_string!""}",
-                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
-                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
+                  "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>
         },
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -51,13 +51,16 @@
            {
              "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)>
+              <#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}",
-                  </#if>
              <#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">
--- a/RFXtoRP_PrepOrder_ShipFromAcked.ftl
+++ b/RFXtoRP_PrepOrder_ShipFromAcked.ftl
@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },

 	  "Payload": {
--- a/RFXtoRP_Receipt_ShipToAcked.ftl
+++ b/RFXtoRP_Receipt_ShipToAcked.ftl
@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"	   
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 	   
 	  "Payload": {
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -28,22 +28,33 @@
 								<#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">
-					   }
-				   ]
+					<#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>
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -1,7 +1,21 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.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 = 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": {
@@ -9,15 +23,15 @@
 		"physical_depot_code": "${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":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"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":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+			"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}",
@@ -30,53 +44,66 @@
 			"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}",
+				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
+				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
+				</#if>
+				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
+					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
+				</#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}",
+				"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>
+
 	 }
 }
-	
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/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>-->



--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -1,7 +1,7 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.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": {
@@ -11,7 +11,7 @@
 	},
 	"payload" : 
 	 {
-		"receipt_reference": "${executionflow.OrderID}",
+		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}", 
 		"work_mode_code" :     "${work_mode_code}",
@@ -25,9 +25,10 @@
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
+		"dock_occupation_duration": 1
 		  
 		<#if executionflow.Lines??> 
+		,
 			"line_list": [
 			<#list executionflow.Lines as line>

@@ -61,7 +62,6 @@
 			}<#sep>,</#sep>
 		</#list> 	     	
 		]
-		</#if>
-		  
+		</#if>		  
 	 }
 }
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.15+3
+1.2.25+2
Author	SHA1	Message	Date
freat	8425747b42	Release 1.2.25+2	2024-08-29 10:59:28 +02:00
Francis Reat	03e20e7aed	Merge branch 'SCPN1-7065' into 'release/1.2' SCPN1-7065 See merge request r-d-technique/tiers/reflex-wms-connector!57	2024-08-29 08:48:06 +00:00
frea	04b7974c77	SCPN1-7065 (cherry picked from commit `ca33a85694`)	2024-08-29 10:37:54 +02:00
freat	087346139d	Release 1.2.25+1	2024-08-08 16:55:33 +02:00
freat	0a4263d551	Release 1.2.24+1	2024-08-07 12:23:46 +02:00
freat	b00302c8e3	Release 1.2.23+2	2024-08-07 08:44:43 +02:00
Francis Reat	55b7b54b44	Merge branch 'SCPN1-6998' into 'release/1.2' SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!54	2024-08-07 06:43:11 +00:00
frea	26003c24f2	SCPN1-6998	2024-08-07 08:38:34 +02:00
freat	0468700574	Release 1.2.23+1	2024-08-06 16:08:37 +02:00
Francis Reat	fe35481144	Merge branch 'SCPN1-6998' into 'release/1.2' SCPN1-6998 See merge request r-d-technique/tiers/reflex-wms-connector!52	2024-08-06 13:48:36 +00:00
frea	d21204a949	SCPN1-6998	2024-08-06 15:41:22 +02:00
freat	46421972a8	Release 1.2.22+1	2024-07-29 17:33:09 +02:00
freat	ccca6d1592	Release 1.2.21+1	2024-07-29 17:32:32 +02:00
freat	68622896f0	Release 1.2.20+1	2024-07-24 10:47:24 +02:00
freat	fea5691ddd	Release 1.2.19+1	2024-07-22 10:18:15 +02:00
Francis Reat	2fb5dcd103	Merge branch 'SCPN1-6912' into 'release/1.2' Merge branch 'SCPN1-6564' into 'release/1.2' See merge request r-d-technique/tiers/reflex-wms-connector!48	2024-07-22 07:54:20 +00:00
frea	04253d939f	Merge branch 'develop' into SCPN1-6912	2024-07-19 11:24:12 +02:00
Laurie Montant	5c0b112c39	Modifs 170724	2024-07-17 11:07:36 +02:00
Laurie Montant	c3d1ceb0c5	ODP	2024-07-12 11:17:30 +02:00
freat	b80623e631	Release 1.2.18+1	2024-07-12 10:51:31 +02:00
Laurie Montant	45e8c4fee2	ajout MD HuAdded	2024-07-05 10:40:55 +02:00
Vincent Le Maitre	23a87c1995	Release 1.2.17+2	2024-06-28 15:12:20 +02:00
Francis Reat	a3a2fa3b23	Merge branch '1.2.17+2' into 'release/1.2' adjust json_string See merge request r-d-technique/tiers/reflex-wms-connector!45	2024-06-27 08:27:17 +00:00
frea	22b26ac7d3	adjust json_string (cherry picked from commit `af29a11b22`)	2024-06-25 17:30:03 +02:00
frea	af29a11b22	adjust json_string	2024-06-25 17:29:36 +02:00
frea	74b976b367	adjust json_string	2024-06-24 16:20:09 +02:00
frea	0b3f07add9	adjust json-string	2024-06-24 11:47:44 +02:00
Vincent Le Maitre	28659b1157	Release 1.2.17+1	2024-06-24 10:54:19 +02:00
frea	3de6a2f6a9	add json_string	2024-06-24 08:38:44 +02:00
frea	4afc7fa50c	securisation	2024-06-21 13:49:56 +02:00
frea	6910fb80a8	SCPN1-6605 MovementCreated (cherry picked from commit `e8510d079c`)	2024-06-21 13:32:56 +02:00
frea	1052849c12	correction dans le cas où la commande n'a pas de ligne...	2024-06-21 13:30:15 +02:00
frea	044fda9d16	correction dans le cas où la commande n'a pas de ligne...	2024-06-21 13:28:44 +02:00
frea	e8510d079c	SCPN1-6605 MovementCreated	2024-06-07 11:15:47 +02:00
freat	24a94caf29	Release 1.2.16+5	2024-06-06 09:45:59 +02:00
Francis Reat	aa19de32a5	Merge branch 'SCPN1-6692' into 'develop' SCPN1-6692 Closes SCPN1-6692 See merge request r-d-technique/tiers/reflex-wms-connector!43	2024-06-06 07:44:29 +00:00
frea	513a5c2c3e	SCPN1-6692 (cherry picked from commit `2524859cd4`)	2024-06-06 09:16:38 +02:00
frea	2524859cd4	SCPN1-6692	2024-06-06 09:15:09 +02:00
freat	011540fc51	Release 1.2.16+4	2024-05-30 17:20:55 +02:00
frea	06147dd8d4	SCPN1-6642 SCPN1-6641	2024-05-30 17:18:16 +02:00
Francis Reat	5e9804db40	Merge branch 'SCPN1-6641' into 'release/1.2' SCPN1-6641 et SCPN1-6642 See merge request r-d-technique/tiers/reflex-wms-connector!42	2024-05-30 15:05:08 +00:00
frea	e344cca043	SCPN1-6642	2024-05-30 16:30:59 +02:00
frea	b0b4714df9	SCPN1-6641	2024-05-30 14:30:09 +02:00
Laurie Montant	9cbacc0ebc	priority date	2024-05-17 11:00:25 +02:00
Francis Reat	c31d6de4a2	Merge branch 'SCPN1-6564' into 'release/1.2' SCPN1-6564 See merge request r-d-technique/tiers/reflex-wms-connector!38 (cherry picked from commit `c0dd029d1f`)	2024-05-17 10:57:10 +02:00
freat	15bd095feb	Release 1.2.16+3	2024-05-16 17:55:49 +02:00
Francis Reat	c0dd029d1f	Merge branch 'SCPN1-6564' into 'release/1.2' SCPN1-6564 See merge request r-d-technique/tiers/reflex-wms-connector!38	2024-05-16 15:30:52 +00:00
frea	2e0d61310b	SCPN1-6564	2024-05-16 17:00:32 +02:00
freat	f62ccadba5	Release 1.2.16+2	2024-05-13 17:07:22 +02:00
Francis Reat	2c29166ccb	Merge branch 'SCPN1-6535' into 'release/1.2' modifs HUGP See merge request r-d-technique/tiers/reflex-wms-connector!36	2024-05-13 15:05:20 +00:00
Laurie Montant	4534155f2e	modifs HUGP (cherry picked from commit `b3da874dd3`)	2024-05-13 16:42:15 +02:00
Laurie Montant	b3da874dd3	modifs HUGP	2024-05-13 16:00:46 +02:00
freat	5948467818	Release 1.2.16+1	2024-05-02 10:21:58 +02:00
freat	c63e4ff5c8	Release 1.2.15+8	2024-04-24 18:23:25 +02:00
Francis Reat	457cfc85c2	Merge branch 'SCPN1-6461' into 'release/1.2' SCPN1-6461 See merge request r-d-technique/tiers/reflex-wms-connector!33	2024-04-24 16:19:29 +00:00
Laurie Montant	6809b32410	Création de commande (cherry picked from commit `82dfc05cdb`)	2024-04-24 17:49:09 +02:00
Laurie Montant	82dfc05cdb	Création de commande	2024-04-24 15:09:45 +02:00
Laurie Montant	eda5fe4e07	modifs hsrprepa	2024-04-15 10:16:14 +02:00
Laurie Montant	26654a9820	modifs	2024-04-12 09:37:03 +02:00
freat	37a5e64e83	Release 1.2.15+7	2024-04-11 11:22:18 +02:00
Francis Reat	2f31833bc3	Merge branch 'versio-1.2.15' into 'release/1.2' Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31	2024-04-11 09:21:32 +00:00
Laurie Montant	cff0f18d8a	modifs ipgmove (cherry picked from commit `6b6cef5332`)	2024-04-11 11:12:11 +02:00
Laurie Montant	6b6cef5332	modifs ipgmove	2024-04-11 11:01:05 +02:00
freat	22b78b4ffe	Release 1.2.15+6	2024-04-10 16:57:58 +02:00
Francis Reat	25bf3110e9	Merge branch 'versio-1.2.15' into 'release/1.2' modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29	2024-04-10 14:56:34 +00:00
Laurie Montant	0a32ead29a	modifs hsrpro (cherry picked from commit `d7c9c72762`)	2024-04-10 16:39:48 +02:00
Laurie Montant	d7c9c72762	modifs hsrpro	2024-04-10 16:25:27 +02:00
freat	46a9dc8996	Release 1.2.15+5	2024-04-09 17:45:00 +02:00
Francis Reat	1eb262c91c	Merge branch 'versio-1.2.15' into 'release/1.2' SCPN1-6368 See merge request r-d-technique/tiers/reflex-wms-connector!28	2024-04-09 15:40:44 +00:00
Laurie Montant	2588fda3a8	modifs ipg (cherry picked from commit `87efb21e64`)	2024-04-09 17:16:18 +02:00
Laurie Montant	87efb21e64	modifs ipg	2024-04-09 16:53:34 +02:00
freat	d060d3eb10	Release 1.2.15+4	2024-03-27 15:03:49 +01:00
Francis Reat	28e99e9a2b	Merge branch 'version-1.2.15' into 'release/1.2' SCPN1-6284 See merge request r-d-technique/tiers/reflex-wms-connector!26	2024-03-27 14:01:44 +00:00
frea	78b0b467a3	Merge branch 'develop' into version-1.2.15	2024-03-26 14:07:53 +01:00
frea	eca09f2e9e	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into SCPN1-6203	2024-03-26 11:46:09 +01:00
Laurie Montant	cfb8e2ab5a	modifs HUadded	2024-03-26 11:21:10 +01:00
Laurie Montant	d1512d4269	modifs date packing	2024-03-26 11:08:38 +01:00
Laurie Montant	264f9131d0	modifs goods	2024-03-26 10:26:59 +01:00
Laurie Montant	fd9f248619	modifs goods	2024-03-26 10:19:20 +01:00
Laurie Montant	0fff71b759	modifs goods	2024-03-26 10:09:15 +01:00
Laurie Montant	196ab387ac	modifs date	2024-03-26 10:00:03 +01:00
Laurie Montant	5cafa068a7	Modifs date emballage	2024-03-25 18:03:45 +01:00
@@ -1 +1 @@
 .2.15+3
 .2.25+2