Release 1.2.38+1

Release 1.2.37+2
Merge branch 'SCPN1-8597' into 'release/1.2'
2025-04-11 10:38:27 +02:00 · 2025-04-09 11:46:44 +02:00 · 2025-04-09 09:46:01 +00:00 · 2025-04-09 11:44:48 +02:00 · 2025-04-09 10:24:39 +02:00 · 2025-04-08 15:41:19 +02:00
16 changed files with 50 additions and 309 deletions
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Reflex Platform Core FTLs

-
+ 

 These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.

+ 

+You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/

-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
-
-
+ 
--- a/RFXtoRP_HsaCarrier_ActorUpdated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorUpdated.ftl
@@ -1,75 +0,0 @@
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}"
-    },
-    "Payload": {
-      "Name": "${carrier.carrier_designation?json_string}",
-      "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}",
-      "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c},
-      "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c},
-      "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected>
-      "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}",
-      </#if>
-      "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipToConnected?? &&  actorRP.Objects[0].Payload.IsShipToConnected>
-      "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}",
-      </#if>
-      "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}",
-      <#if actorRP.Objects[0].Payload.CarrierServices??>
-      "CarrierServices" : [
-         <#list actorRP.Objects[0].Payload.CarrierServices as carrierService>
-         {
-            "ID"    : "${carrierService.ID!""}",
-            "Label" : "${carrierService.Label!""}"
-         }<#sep>,</#sep>
-         </#list>
-      ],
-      </#if>
-    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
-
-    "Address":
-        {
-
-        <#-- if Reflex WMS is structured    -->
-        <#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}",
-        "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
-        "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
-        <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) />
-         <#if isCountryCode>
-            "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}",
-          <#else>
-            "CountryCode" : "",
-          </#if>
-			  "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}",
-			  "State": "${carrier.carrier_structured_address.country_designation?json_string}"
-
-        <#-- if Reflex WMS is not structured    -->
-        <#else>
-          <#if carrier.address?? >
-
-            "Name": "${carrier.address.company_name?json_string}",
-            "StreetAddressOne" : "${carrier.address.address_1?json_string}",
-            "StreetAddressTwo" : "${carrier.address.address_2?json_string}",
-            "StreetAddressThree" : "${carrier.address.address_3?json_string}",
-             "CountryCode" : ""
-          </#if>
-        </#if>
-       },
-    <#if  carrier.address?? >
-      "Phones": ["${carrier.address.telephone?json_string}",
-               "${carrier.address.other_number?json_string}"
-              ],
-    </#if>
-    "Typology": "TYPOLOGY_UNKNOWN"
-      }
-  }
-]
--- a/RFXtoRP_HsaCons_ActorUpdated.ftl
+++ b/RFXtoRP_HsaCons_ActorUpdated.ftl
@@ -1,75 +0,0 @@
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}"
-    },
-    "Payload": {
-      "Name": "${actor.designation?json_string}",
-      "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}",
-      "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c},
-      "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c},
-      "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected>
-      "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}",
-      </#if>
-      "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected>
-      "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}",
-      </#if>
-     "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}",
-      <#if actorRP.Objects[0].Payload.CarrierServices??>
-      "CarrierServices" : [
-         <#list actorRP.Objects[0].Payload.CarrierServices as carrierService>
-         {
-            "ID"    : "${carrierService.ID!""}",
-            "Label" : "${carrierService.Label!""}"
-         }<#sep>,</#sep>
-         </#list>
-      ],
-      </#if>
-    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
-
-    "Address":
-        {
-
-        <#-- if Reflex WMS is structured    -->
-        <#if actor.consignee_structured_address??>
-
-        "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}",
-        "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
-        "City" : "${actor.consignee_structured_address.post_code_area_name?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>
-          <#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}",
-             "CountryCode" : ""
-          </#if>
-        </#if>
-       },
-    <#if  actor.address?? >
-      "Phones": ["${actor.address.telephone?json_string}",
-               "${actor.address.other_number?json_string}"
-              ],
-    </#if>
-    "Typology": "TYPOLOGY_UNKNOWN"
-      }
-  }
-]
--- a/RFXtoRP_HsaDispute.ftl
+++ b/RFXtoRP_HsaDispute.ftl
@@ -16,16 +16,13 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign dispute = JsonUtil.jsonToMap(dataRfx)>
       [
-           <#if dispute.dispute_closed == true >
-            <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")>
+          <#if dispute.dispute_closed == true >
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsaDispute_Created.ftl">
-            }
-            <#if TableReasonCode[dispute.dispute_reason_code]??>
-              ,
+            },
            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -33,11 +30,7 @@
              <#include "RFXtoRP_HsaDispute_MessageSent.ftl">
            }
            <#else>
-                <#stop>
-              </#if>
-            <#else>
-              <#stop "Reference is empty">
-            </#if>
+              <#stop>
          </#if>
       ]
  <#break>
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -39,28 +39,29 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
-            <#-- To configure -->
-            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
            <#if dispute.dispute_type_code=="050" >
-                "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
-                "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}",
+                <#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}",
-                        "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
+                    "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}",
                <#else>
-                    <#stop "WMS type code not supported">
+                    <#stop "Type not supported" >
                </#if>
            </#if>
+             <#-- To configure -->
+            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">

            <#if TableReasonCode[dispute.dispute_reason_code]??>
-                "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}"
+                "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}"
            <#else>
-                <#stop "Reason code not supported">
+                <#stop "Claim reason code not supported" >
            </#if>
+
+
        }
    }
 ]
-
-
-
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -26,15 +26,15 @@
           <#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}",
-          "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
        <#else>
          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
        </#if>
        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
@@ -47,4 +47,4 @@
    }
  }

-]
+]
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -54,7 +54,7 @@
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
        <#if reflexMvtStockInterface.ipg_move_type == "520" >
-          "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+          "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>
--- a/RFXtoRP_HsaSup_ActorUpdated.ftl
+++ b/RFXtoRP_HsaSup_ActorUpdated.ftl
@@ -1,75 +0,0 @@
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}"
-    },
-    "Payload": {
-      "Name": "${actor.designation?json_string}",
-      "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}",
-      "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c},
-      "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c},
-      "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected>
-      "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}",
-      </#if>
-      "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c},
-      <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected>
-      "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}",
-      </#if>
-      "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}",
-      <#if actorRP.Objects[0].Payload.CarrierServices??>
-      "CarrierServices" : [
-         <#list actorRP.Objects[0].Payload.CarrierServices as carrierService>
-         {
-            "ID"    : "${carrierService.ID!""}",
-            "Label" : "${carrierService.Label!""}"
-         }<#sep>,</#sep>
-         </#list>
-      ],
-      </#if>
-    <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">,
-
-    "Address":
-        {
-
-        <#-- if Reflex WMS is structured    -->
-        <#if actor.supplier_structured_address??>
-
-        "Name": "${actor.supplier_structured_address.name_or_company?json_string}",
-        "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}",
-        "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
-        "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
-        "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
-        <#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 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}",
-             "CountryCode" : ""
-          </#if>
-        </#if>
-       },
-    <#if  actor.optional_attributes?? >
-      "Phones": ["${actor.optional_attributes.telephone?json_string}",
-               "${actor.optional_attributes.other_number?json_string}"
-              ],
-    </#if>
-    "Typology": "TYPOLOGY_UNKNOWN"
-      }
-  }
-]
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -55,7 +55,7 @@
                  "${depot.physical_depot_address.other_number?json_string}"
                  ],
        </#if>
-       "Typology": "TYPOLOGY_WAREHOUSE"
+       "Typology": "TYPOLOGY_UNKNOWN"
       }
  }
 ]
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -6,7 +6,6 @@
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
-<#include "RFX_PartnerAPP_Settings.ftl">

 <#assign aDateTime = .now>

@@ -55,7 +54,7 @@
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
+            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
               {
@@ -79,16 +78,16 @@
               "datas" :
               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
               }
-               <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )>
-                  <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
-                  ,
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl">
-                  }
-               </#if>
+               <#if !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>
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -3,7 +3,7 @@
 [
 <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />

-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
        <#if refIDHmap?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -3,7 +3,7 @@
 [
 <#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.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
          <#if refIDHmap_local?size != 0 >
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -2,7 +2,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
@@ -112,7 +112,6 @@
       <#-- Segmentation Keys inclusion -->
       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
         },
-         "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
          "LineID": "${preparation_line.pro_originator_reference_line_number}",
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -1,7 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
-<#include "RFX_PartnerAPP_Settings.ftl">
 [
 <#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
  {
@@ -9,41 +8,15 @@
    "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#switch trackingNumberSource>
-        <#case 1>
-          <#if despatched_ipg.consignment_unit_id!="">
-			      "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          </#if>
-        <#break>
-        <#case 2>
-          <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-          </#if>
-        <#break>
-        <#case 3>
-          <#if despatched_ipg.consignment_unit_id!="">
-            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          <#else>
-            <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-            </#if>
-          </#if>
-        <#break>
-        <#default>
-          <#if despatched_ipg.consignment_unit_id!="">
-            "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}",
-          <#else>
-            <#if despatched_ipg.carton_number != "000000000000000000">
-              "RefID":"${despatched_ipg.carton_number}",
-            <#else>
-              "RefID":"${despatched_ipg.hd_number}",
-            </#if>
-          </#if>
-        </#switch>
+      <#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}",
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -52,6 +52,7 @@
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
 			   		<#--"held_for_check": "false",
+			   		"held _for_repacking": "false",
 			   		"hold_code": "false", -->
 					"hold_for_specific_code": "false"
 		 		}
--- a/2
+++ b/2
@@ -1 +1 @@
-1.3.0-SNAPSHOT
+1.2.38+1
Author	SHA1	Message	Date
freat	1905105118	Release 1.2.38+1	2025-04-11 10:38:27 +02:00
freat	9cadf3329e	Release 1.2.37+2	2025-04-09 11:46:44 +02:00
Francis Reat	4502df6fb0	Merge branch 'SCPN1-8597' into 'release/1.2' SCPN1-8597 See merge request r-d-technique/tiers/reflex-wms-connector!96	2025-04-09 09:46:01 +00:00
frea	3ca4b61e3b	SCPN1-8597	2025-04-09 11:44:48 +02:00
freat	4a26fd9249	Release 1.2.37+1	2025-04-09 10:24:39 +02:00
freat	4624bab7ad	Release 1.2.36+1	2025-04-08 15:41:19 +02:00
freat	c754edaafb	Release 1.2.35+1	2025-04-07 12:31:37 +02:00
Francis Reat	adff1396c1	Merge branch 'connector-1.2-to-visibility1.10' into 'release/1.2' connector-1.2-to-visibility1.10 See merge request r-d-technique/tiers/reflex-wms-connector!95	2025-04-07 09:32:40 +00:00
frea	0b70c90257	Merge branch 'develop-1.2' into connector-1.2-to-visibility1.10 # Conflicts: # RFXtoRP_HsaDispute.ftl # RFXtoRP_HsaDispute_Created.ftl # RFXtoRP_HsaIpgMove_StockMoved.ftl # RFXtoRP_HsrDepot_ActorCreated.ftl # RFXtoRP_HsrPrepa.ftl # RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl	2025-03-31 17:21:37 +02:00
freat	cdc78d71b1	Release 1.2.34+1	2025-03-19 11:16:37 +01:00
Francis Reat	6b840c0ce7	Merge branch 'SCPN1-8483' into 'release/1.2' SCPN1-8483 See merge request r-d-technique/tiers/reflex-wms-connector!93	2025-03-19 10:14:45 +00:00
frea	8ee7527ba4	SCPN1-8483	2025-03-19 10:52:07 +01:00
freat	eb6182c337	Release 1.2.33+3	2025-03-13 10:38:21 +01:00
Laurie Montant	5b3de10184	modif claim	2025-03-13 10:27:05 +01:00
Francis Reat	8cfd636c72	Merge branch 'SCPN1-8401' into 'release/1.2' SCPN1-8401 See merge request r-d-technique/tiers/reflex-wms-connector!91	2025-03-13 09:19:19 +00:00
Laurie Montant	18808b6033	modifs Claim_order	2025-03-13 10:01:06 +01:00
frea	1dc77965ce	SCPN1-8401	2025-03-07 14:14:28 +01:00
freat	58bcf838bd	Release 1.2.33+2	2025-02-25 17:42:12 +01:00
Francis Reat	24f17f434e	Merge branch 'SCPN1-8183' into 'release/1.2' move 520 See merge request r-d-technique/tiers/reflex-wms-connector!88	2025-02-25 16:15:19 +00:00
Laurie Montant	c16c48b270	move 520 (cherry picked from commit `df2332b17e`)	2025-02-25 15:58:32 +01:00
freat	29e16f12cc	Release 1.2.33+1	2025-02-18 10:08:14 +01:00
Francis Reat	c74470b780	Merge branch 'SCPN1-8183' into 'release/1.2' SCPN1-8383 See merge request r-d-technique/tiers/reflex-wms-connector!87	2025-02-18 08:59:45 +00:00
frea	fab2238278	SCPN1-8383	2025-02-18 09:35:16 +01:00
freat	432cca8ec9	Release 1.2.32+1	2025-02-12 10:24:01 +01:00
Vincent Le Maitre	08e4b04f7f	Release 1.2.31+1	2024-12-13 15:34:11 +01:00
freat	bf0ae15a50	Release 1.2.30+1	2024-12-04 09:05:53 +01:00
Francis Reat	3f7cd7a245	Merge branch 'pour-1.9' into 'release/1.2' pour 1.9 See merge request r-d-technique/tiers/reflex-wms-connector!81	2024-12-04 07:09:16 +00:00
frea	173deec755	pour 1.9	2024-12-04 08:08:26 +01:00
freat	85bfe55af7	Release 1.2.29+4	2024-11-19 11:47:55 +01:00
Francis Reat	730750b898	Merge branch 'SCPN1-7609' into 'release/1.2' Correction priority date SCPN1-7609 See merge request r-d-technique/tiers/reflex-wms-connector!78	2024-11-19 10:46:07 +00:00
Laurie Montant	d85abf8235	Correction priority date (cherry picked from commit `e41309e744`)	2024-11-19 11:38:58 +01:00
freat	46a9a82e12	Release 1.2.29+3	2024-11-18 11:44:58 +01:00
Francis Reat	ae0b82b6e4	Merge branch 'SCPN1-7578' into 'release/1.2' SCPN1-7578 See merge request r-d-technique/tiers/reflex-wms-connector!76	2024-11-18 10:41:23 +00:00
frea	5fc26e6015	SCPN1-7578	2024-11-18 11:36:01 +01:00
freat	236c2d754c	Release 1.2.29+2	2024-11-12 14:28:03 +01:00
Francis Reat	5499e3059f	Merge branch 'SCPN1-7528' into 'release/1.2' json_string SCPN1-7528 See merge request r-d-technique/tiers/reflex-wms-connector!74	2024-11-12 13:21:27 +00:00
Laurie Montant	cae9bf80bb	json_string (cherry picked from commit `4d24367b58`)	2024-11-12 14:13:28 +01:00
freat	ed0141584b	Release 1.2.29+1	2024-11-06 14:48:50 +01:00
freat	e6a27c2ba2	Release 1.2.28+5	2024-11-05 11:31:06 +01:00
Francis Reat	0a26159dc9	Merge branch 'SCPN1-7496' into 'release/1.2' SCPN1-7496 See merge request r-d-technique/tiers/reflex-wms-connector!71	2024-11-05 10:29:16 +00:00
frea	a4f3bf8151	SCPN1-7496	2024-11-05 11:28:00 +01:00
frea	867fdc5743	SCPN1-7496	2024-11-05 11:10:04 +01:00
Cedric Rodier	b69bfa50ba	Release 1.2.28+4	2024-10-29 15:20:15 +01:00
Cedric Rodier	834abe1b78	SCPN1-7418	2024-10-29 15:17:50 +01:00
freat	e190a16ddc	Release 1.2.28+3	2024-10-24 10:22:41 +02:00
frea	e63b14d0ff	SCPN1-7421	2024-10-24 10:05:02 +02:00
freat	04bc005cda	Release 1.2.28+2	2024-10-17 11:07:16 +02:00
Francis Reat	6e46d30221	Merge branch 'SCPN1-6728' into 'release/1.2' SCPN1-6728 See merge request r-d-technique/tiers/reflex-wms-connector!67	2024-10-17 09:04:24 +00:00
frea	1f2d3ab212	SCPN1-6728	2024-10-17 10:36:14 +02:00
freat	771915ad19	Release 1.2.28+1	2024-10-14 11:51:48 +02:00
Francis Reat	4a1fe56381	Merge branch 'SCPN1-7341' into 'release/1.2' SCPN1-7341 See merge request r-d-technique/tiers/reflex-wms-connector!65	2024-10-14 07:57:53 +00:00
frea	a9a357d4ed	SCPN1-7341	2024-10-14 09:56:41 +02:00
freat	0e3e60b45a	Release 1.2.27+2	2024-10-03 15:39:13 +02:00
Francis Reat	f0e27a6f88	Merge branch 'SCPN1-7302' into 'release/1.2' SCPN1-7302 See merge request r-d-technique/tiers/reflex-wms-connector!63	2024-10-03 13:31:09 +00:00
frea	f72bcc2537	SCPN1-7302	2024-10-03 15:30:18 +02:00
Francis Reat	9700548214	Merge branch 'SCPN1-7302' into 'release/1.2' modifs See merge request r-d-technique/tiers/reflex-wms-connector!62	2024-10-03 13:15:28 +00:00
frea	96aec6555c	SCPN1-7302	2024-10-03 15:08:49 +02:00
Laurie Montant	54511c55f1	modifs (cherry picked from commit `e2c0735dc7`)	2024-10-03 15:06:18 +02:00
Laurie Montant	de828ed606	modifs (cherry picked from commit `25011e68e6`)	2024-10-03 15:05:45 +02:00
freat	eaa7ef1b9b	Release 1.2.27+1	2024-09-25 16:12:56 +02:00
freat	4c84e4195b	Release 1.2.26+1	2024-09-13 10:38:27 +02:00
Francis Reat	113c94f100	Merge branch 'SCPN1-7155' into 'release/1.2' SCPN1-7155 See merge request r-d-technique/tiers/reflex-wms-connector!59	2024-09-13 08:09:08 +00:00
frea	7963b351aa	SCPN1-7155	2024-09-12 14:11:04 +02:00
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
freat	b80623e631	Release 1.2.18+1	2024-07-12 10:51:31 +02:00
Vincent Le Maitre	23a87c1995	Release 1.2.17+2	2024-06-28 15:12:20 +02:00
Francis Reat	a3a2fa3b23	Merge branch '1.2.17+2' into 'release/1.2' adjust json_string See merge request r-d-technique/tiers/reflex-wms-connector!45	2024-06-27 08:27:17 +00:00
frea	22b26ac7d3	adjust json_string (cherry picked from commit `af29a11b22`)	2024-06-25 17:30:03 +02:00
frea	0b3f07add9	adjust json-string	2024-06-24 11:47:44 +02:00
Vincent Le Maitre	28659b1157	Release 1.2.17+1	2024-06-24 10:54:19 +02:00
frea	3de6a2f6a9	add json_string	2024-06-24 08:38:44 +02:00
frea	4afc7fa50c	securisation	2024-06-21 13:49:56 +02:00
frea	6910fb80a8	SCPN1-6605 MovementCreated (cherry picked from commit `e8510d079c`)	2024-06-21 13:32:56 +02:00
frea	1052849c12	correction dans le cas où la commande n'a pas de ligne...	2024-06-21 13:30:15 +02:00
freat	24a94caf29	Release 1.2.16+5	2024-06-06 09:45:59 +02:00
frea	513a5c2c3e	SCPN1-6692 (cherry picked from commit `2524859cd4`)	2024-06-06 09:16:38 +02:00
freat	011540fc51	Release 1.2.16+4	2024-05-30 17:20:55 +02:00
Francis Reat	5e9804db40	Merge branch 'SCPN1-6641' into 'release/1.2' SCPN1-6641 et SCPN1-6642 See merge request r-d-technique/tiers/reflex-wms-connector!42	2024-05-30 15:05:08 +00:00
frea	e344cca043	SCPN1-6642	2024-05-30 16:30:59 +02:00
frea	b0b4714df9	SCPN1-6641	2024-05-30 14:30:09 +02:00
freat	15bd095feb	Release 1.2.16+3	2024-05-16 17:55:49 +02:00
Francis Reat	c0dd029d1f	Merge branch 'SCPN1-6564' into 'release/1.2' SCPN1-6564 See merge request r-d-technique/tiers/reflex-wms-connector!38	2024-05-16 15:30:52 +00:00
frea	2e0d61310b	SCPN1-6564	2024-05-16 17:00:32 +02:00
freat	f62ccadba5	Release 1.2.16+2	2024-05-13 17:07:22 +02:00
Francis Reat	2c29166ccb	Merge branch 'SCPN1-6535' into 'release/1.2' modifs HUGP See merge request r-d-technique/tiers/reflex-wms-connector!36	2024-05-13 15:05:20 +00:00
Laurie Montant	4534155f2e	modifs HUGP (cherry picked from commit `b3da874dd3`)	2024-05-13 16:42:15 +02:00
freat	5948467818	Release 1.2.16+1	2024-05-02 10:21:58 +02:00
freat	c63e4ff5c8	Release 1.2.15+8	2024-04-24 18:23:25 +02:00
Francis Reat	457cfc85c2	Merge branch 'SCPN1-6461' into 'release/1.2' SCPN1-6461 See merge request r-d-technique/tiers/reflex-wms-connector!33	2024-04-24 16:19:29 +00:00
Laurie Montant	6809b32410	Création de commande (cherry picked from commit `82dfc05cdb`)	2024-04-24 17:49:09 +02:00
freat	37a5e64e83	Release 1.2.15+7	2024-04-11 11:22:18 +02:00
Francis Reat	2f31833bc3	Merge branch 'versio-1.2.15' into 'release/1.2' Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31	2024-04-11 09:21:32 +00:00
Laurie Montant	cff0f18d8a	modifs ipgmove (cherry picked from commit `6b6cef5332`)	2024-04-11 11:12:11 +02:00
freat	22b78b4ffe	Release 1.2.15+6	2024-04-10 16:57:58 +02:00
Francis Reat	25bf3110e9	Merge branch 'versio-1.2.15' into 'release/1.2' modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29	2024-04-10 14:56:34 +00:00
Laurie Montant	0a32ead29a	modifs hsrpro (cherry picked from commit `d7c9c72762`)	2024-04-10 16:39:48 +02:00
freat	46a9dc8996	Release 1.2.15+5	2024-04-09 17:45:00 +02:00
Francis Reat	1eb262c91c	Merge branch 'versio-1.2.15' into 'release/1.2' SCPN1-6368 See merge request r-d-technique/tiers/reflex-wms-connector!28	2024-04-09 15:40:44 +00:00
Laurie Montant	2588fda3a8	modifs ipg (cherry picked from commit `87efb21e64`)	2024-04-09 17:16:18 +02:00
freat	d060d3eb10	Release 1.2.15+4	2024-03-27 15:03:49 +01:00
Francis Reat	28e99e9a2b	Merge branch 'version-1.2.15' into 'release/1.2' SCPN1-6284 See merge request r-d-technique/tiers/reflex-wms-connector!26	2024-03-27 14:01:44 +00:00
frea	78b0b467a3	Merge branch 'develop' into version-1.2.15	2024-03-26 14:07:53 +01:00
freat	6f287e878a	Release 1.2.15+3	2024-03-21 17:39:10 +01:00
Francis Reat	c3a23254b1	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!25	2024-03-21 16:32:23 +00:00
frea	c47672b8cc	Merge branch 'develop' into version-1.2.15	2024-03-21 17:27:44 +01:00
freat	9cdcd2784d	Release 1.2.15+2	2024-03-21 09:38:35 +01:00
Francis Reat	cfe6bddf8d	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!24	2024-03-21 07:48:06 +00:00
frea	0cb3cc7dd0	update priority_date	2024-03-21 08:45:48 +01:00
Vincent Le Maitre	6b633663e9	Release 1.2.15+1	2024-03-19 16:50:50 +01:00
Francis Reat	c801c574ab	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!23	2024-03-19 15:04:39 +00:00
frea	6282266c6d	Merge branch 'develop' into version-1.2.15	2024-03-19 08:53:51 +01:00
frea	cb9d61bfe9	version-1.2.15	2024-03-15 16:55:08 +01:00
Vincent Le Maitre	60c6f812d1	Release 1.2.14+1	2024-03-12 10:02:52 +01:00
Vincent LEMAITRE	c2f6537e0c	Merge branch 'version-1.7' into 'release/1.2' Version 1.7 See merge request r-d-technique/tiers/reflex-wms-connector!20	2024-03-12 08:56:33 +00:00
frea	f5970127b0	update version	2024-03-12 09:55:32 +01:00
Vincent LEMAITRE	33c7ab08a7	reverted VERSION	2024-03-12 08:51:41 +00:00
Vincent Le Maitre	fb8f9ca651	Release 1.2.14+1	2024-03-12 09:31:26 +01:00
frea	16c7d6b686	Merge branch 'develop' into version-1.7 # Conflicts: # RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl # RFXtoRP_HfLvTypeList.ftl # RFXtoRP_HsaIpgMove.ftl # RFXtoRP_HsaIpgMove_GoodsReceived.ftl # RFXtoRP_HsaIpgMove_StockMoved.ftl # RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl # RFXtoRP_HsaItm_ItemCreated.ftl # RFXtoRP_HsaProStatus.ftl # RFXtoRP_HsrPrepa.ftl # RFXtoRP_HsrPrepa_CarrierUpdated.ftl # RFXtoRP_HsrPrepa_GoodsPrepared.ftl # RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl # RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl # RFXtoRP_HsrPro.ftl # RFXtoRP_HsrPro_ExecutionflowDetected.ftl # RFXtoRP_HsrReceiptList.ftl # RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl # ReflexUtils.ftl # VERSION	2024-03-12 08:11:21 +01:00
Vincent Le Maitre	fc919c2199	Release 1.2.13+1	2024-03-11 16:13:48 +01:00
freat	3365a94098	Release 1.2.12+3	2024-02-29 15:35:54 +01:00
Francis Reat	e055eab522	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!18	2024-02-29 14:35:25 +00:00
frea	c95bdc7f00	SCPN1-6093	2024-02-29 15:32:01 +01:00
freat	319cb6cc51	Release 1.2.12+2	2024-02-29 14:51:31 +01:00
Francis Reat	1f289e229c	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!17	2024-02-29 13:30:33 +00:00
frea	fba36b5d77	SCPN1-6093	2024-02-29 14:16:53 +01:00
freat	892812e85e	Release 1.2.12+1	2024-02-16 11:51:17 +01:00
freat	a512e4c23a	Release 1.2.11+1	2024-01-26 11:15:57 +01:00
Francis Reat	884ad540fe	Update VERSION to roolback to 1.2.10+2	2024-01-26 10:02:42 +00:00
freat	3a9620e3ee	Release 1.2.2+1	2024-01-26 10:56:09 +01:00
Francis Reat	d5573b6dba	Merge branch 'SCPN-5764' into 'release/1.2' Modifs RPtoRFX 2301241050 See merge request r-d-technique/tiers/reflex-wms-connector!13	2024-01-26 09:52:43 +00:00
Laurie Montant	162b73e75f	Modifs RPtoRFX 2301241050 (cherry picked from commit `56cd76fe0e`)	2024-01-25 11:22:41 +01:00
Laurie Montant	bb4315bba1	SCPN1-5764	2024-01-25 11:13:44 +01:00
freat	c4910785e0	Release 1.2.10+2	2024-01-17 15:29:36 +01:00
Francis Reat	5688244be2	Update VERSION to roolback to 1.2.10+1	2024-01-17 13:34:06 +00:00
freat	de5e94be3c	Release 1.2.1+1	2024-01-17 13:58:26 +01:00
Francis Reat	646256d879	Merge branch 'SCPN1-5711' into 'release/1.2' SCPN1-5711 See merge request r-d-technique/tiers/reflex-wms-connector!12	2024-01-17 12:49:38 +00:00
frea	60355d1ba5	SCPN1-5711	2024-01-17 13:47:38 +01:00
freat	737763dc7f	Release 1.2.10+1	2024-01-17 10:16:31 +01:00
Francis Reat	098b2d4e1d	Merge branch 'SCPN1-5711' into 'release/1.2' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!10	2024-01-17 09:05:46 +00:00
Francis Reat	7b55a4bcd0	Merge branch 'cherry-pick-ca30958d' into 'SCPN1-5711' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!9	2024-01-17 09:02:23 +00:00
Laurie Montant	b369dd8adf	Modifs RPtoRFX 1701240947 (cherry picked from commit `ca30958d35`)	2024-01-17 09:02:01 +00:00
frea	fd1cfcc2c5	SCPN1-5711	2024-01-17 10:00:31 +01:00
freat	fc8290648f	Release 1.2.9+1	2024-01-10 10:40:42 +01:00
Francis Reat	378c1ba75f	Merge branch 'SCPN1-5651' into 'release/1.2' Resolve SCPN1-5651 See merge request r-d-technique/tiers/reflex-wms-connector!7	2024-01-10 09:33:49 +00:00
frea	d94a74d399	Partial Merge branch 'develop' into SCPN1-5651	2024-01-09 17:17:26 +01:00
freat	a882ac4b86	Release 1.2.8+2	2024-01-03 14:42:40 +01:00
frea	d2d9443fc7	bug SCPN1-5632	2024-01-03 13:32:45 +01:00
Vincent Le Maitre	30ae93b9e7	Release 1.2.8+1	2023-12-06 15:48:59 +01:00
Vincent Le Maitre	64e03640d1	Release 1.2.7+2	2023-12-01 16:06:45 +01:00
Laurie Montant	270f90a9b3	Modif HsrPrepa 0112231019	2023-12-01 16:05:47 +01:00
Laurie Montant	b5c85220b5	Modifs FTL 2211231645	2023-12-01 16:05:36 +01:00
Laurie Montant	2409cf3a01	Modif FTL 2211231459	2023-12-01 16:05:11 +01:00
Laurie Montant	957df51487	Modifs FTL 2211231443	2023-12-01 16:04:57 +01:00
Laurie Montant	d09fa33577	Modif 2011231720 HsrPro	2023-12-01 16:04:46 +01:00
Laurie Montant	3bcdec1d5d	Modif alignement champs techniques Reflex HsrPro 2011231657	2023-12-01 16:04:35 +01:00
Vincent Le Maitre	b4ea1e7798	Release 1.2.7+1	2023-12-01 14:29:46 +01:00
Vincent LEMAITRE	80aecb3aa7	Update VERSION	2023-12-01 13:27:11 +00:00
Vincent Le Maitre	e02218f7b1	Release 1.2.6+2	2023-12-01 14:23:58 +01:00
Cedric Rodier	6270992346	Release 1.2.6+1	2023-11-23 10:02:38 +01:00
Vincent Le Maitre	a544f6700d	Release 1.2.6	2023-11-03 09:23:43 +01:00
Vincent Le Maitre	04ec57377a	Release 1.2.5	2023-10-24 16:47:19 +02:00
Vincent Le Maitre	b209e8b5e1	release 1.2.4	2023-10-24 08:22:11 +02:00