Release 2.0.8+4

Merge branch 'release-2.0-SCPN1-9437' into 'release/2.0'
SCPN1-9437 to release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!148
2025-10-16 15:47:04 +02:00 · 2025-10-16 13:39:30 +00:00 · 2025-10-16 15:05:23 +02:00 · 2025-10-16 15:05:10 +02:00 · 2025-10-16 15:04:55 +02:00 · 2025-10-16 15:04:43 +02:00
12 changed files with 17 additions and 19 deletions
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,15 +18,10 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
            <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
-        <#else>
-          <#--  "no LV for the item"-->
-          <#stop>
-        </#if>
         }
       ]
      <#break>
--- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
+++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl
@@ -12,7 +12,7 @@
           {
          "LVID": "${lv.logistical_variant_code?json_string}",
          "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??>
+          <#if lv.id_list??  && (lv.id_list?size == lv.id_list?filter(l ->l??)?size)>
          "Codes": [
                   <#list lv.id_list as id>
                   {
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -21,15 +21,17 @@
      },

      <#-- Item metadata inclusion -->
-      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
+      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">

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

    <#-- Loop for the Logistical Variants - LV -->
-        <#if item.logistical_variant_list??>
+        <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+        ,
          "LogisticVariants": [

           <#list item.logistical_variant_list as logistical_variant>
@@ -37,7 +39,7 @@
            "LVID": "${logistical_variant.logistical_variant_code?json_string}",
            "Name" : "${logistical_variant.lv_type_code?json_string}",

-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
            "Codes": [
                       <#list logistical_variant.id_list as id>
                       {
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -51,8 +51,7 @@
               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line>
               <#list preparation_line.despatched_ipg_list as despatched_ipg>
               <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-               <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-                  <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+               <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
                  ,
                  {
                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -53,8 +53,10 @@
    "Payload": {
      <#if despatched_ipg.carton_number != "000000000000000000">
      "HandlingunitID": "${despatched_ipg.carton_number}"
+      <#assign hd_numberHmap += {despatched_ipg.carton_number,despatched_ipg.carton_number}>
      <#else>
      "HandlingunitID": "${despatched_ipg.hd_number}"
+      <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
      </#if>
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
    ,
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -38,8 +38,8 @@
          <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true">
            "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}"
          <#else>
-            <#if preparation_order.preparation_type_code == "030">
-              "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}"
+            <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!="">
+              "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_code?json_string)}"
            <#else>
              <#if preparation_order.address.address_type_code == "" &&
              preparation_order.address.name_or_company_name == "" &&
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl
@@ -23,7 +23,7 @@
  <#else>
    <#if receipt.line_list??>
      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
            <#if refIDHmap_local?size != 0 >
            ,
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -29,7 +29,6 @@
        <#else>
          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
        </#if>
-        "OrderID":"${receipt.receipt_reference?trim?json_string}",
        <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
        "ShipFrom":
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl
@@ -23,7 +23,7 @@
  <#else>
    <#if receipt.line_list??>
      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
            <#if refIDHmap_local?size != 0 >
            ,
--- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl
@@ -23,7 +23,7 @@
  <#else>
    <#if receipt.line_list??>
      <#list receipt.line_list as receipt_line >
-        <#if receipt_line.origin_order_line_reference!="">
+        <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
          <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
            <#if refIDHmap_local?size != 0 >
            ,
--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -17,6 +17,7 @@

 <#switch eventRP.event>
 	  <#case "Created">
+	  	<#case "Renotified">
 			 <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 			<#assign executionflow = eventRP.data />

--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.7+1
+2.0.8+4
Author	SHA1	Message	Date
Francis Reat	0336a69c3a	Release 2.0.8+4	2025-10-16 15:47:04 +02:00
Francis Reat	42cf113e71	Merge branch 'release-2.0-SCPN1-9437' into 'release/2.0' SCPN1-9437 to release 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!148	2025-10-16 13:39:30 +00:00
Laurie Montant	30c48670c3	SCPN1-9437 (cherry picked from commit `791a958b4d`)	2025-10-16 15:05:23 +02:00
Laurie Montant	794d9a3b69	SCPN1-9437 (cherry picked from commit `5bdd9fbfe1`)	2025-10-16 15:05:10 +02:00
Laurie Montant	549767f035	SCPN1-9437 (cherry picked from commit `93a0fbd79c`)	2025-10-16 15:04:55 +02:00
Laurie Montant	91916d9100	SCPN1-9437 (cherry picked from commit `ae27efacf3`)	2025-10-16 15:04:43 +02:00
frea	b29f28997a	Release 2.0.8+3	2025-09-26 09:23:02 +02:00
Francis Reat	fc18c04521	Merge branch 'SCPN1-9348-2.0' into 'release/2.0' SCPN1-9348-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!141	2025-09-26 07:12:06 +00:00
GROUP\frea	f4b0561643	SCPN1-9348 (cherry picked from commit `a6628be34e`)	2025-09-25 16:31:24 +02:00
frea	12e157078c	Release 2.0.8+2	2025-09-24 10:22:52 +02:00
Francis Reat	ac7936a675	Merge branch 'SCPN1-9338' into 'release/2.0' SCPN1-9338 See merge request r-d-technique/tiers/reflex-wms-connector!138	2025-09-24 08:20:38 +00:00
Laurie Montant	36804fef81	Correction transfert (cherry picked from commit `4fd4007794`)	2025-09-24 10:13:06 +02:00
frea	c1023741bb	Release 2.0.8+1	2025-09-09 09:25:04 +02:00
Francis Reat	db40be98f4	Merge branch 'SCPN1-9296-2.0' into 'release/2.0' SCPN1-9296-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!133	2025-09-09 07:22:15 +00:00
Laurie Montant	6b7592559b	Correction list (cherry picked from commit `9b07206cf4`)	2025-09-09 08:59:50 +02:00
Laurie Montant	9db774f2b1	Renotified (cherry picked from commit `8d4721576f`)	2025-09-08 18:02:24 +02:00
frea	8cb5f4d0b5	Release 2.0.7+2	2025-09-08 10:43:06 +02:00
Francis Reat	75f791bf62	Merge branch 'SCPN1-9288-2.0' into 'release/2.0' SCPN1-9288 See merge request r-d-technique/tiers/reflex-wms-connector!129	2025-09-08 08:38:13 +00:00
Laurie Montant	aab63ed3ee	Corrections 250908 (cherry picked from commit `6b0d53926f`)	2025-09-08 10:31:29 +02:00
@@ -1 +1 @@
 .0.7+1
 .0.8+4