Release 1.2.37+2

Merge branch 'SCPN1-8597' into 'release/1.2'
SCPN1-8597 See merge request r-d-technique/tiers/reflex-wms-connector!96
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 · 2025-04-07 12:31:37 +02:00
28 changed files with 78 additions and 36 deletions
--- a/RFX_PartnerAPP_Settings.ftl
+++ b/RFX_PartnerAPP_Settings.ftl
@@ -0,0 +1 @@
+<#assign trackingNumberSource = 3>
--- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
+++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl
@@ -11,7 +11,7 @@
      "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
      },
    "Payload": {
-       <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+       <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
      "Snapshot": {
        "EndDateTime": {
           "DateTime": "${generation_date}",
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -9,7 +9,7 @@
    },
    "Payload": {
      "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}",
-      <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
+      <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) />
      "Snapshot": {
        "DateTime": {
           "DateTime": "${generation_date}",
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl
@@ -17,21 +17,21 @@
                  "Value": { "String" : "no batch"}
                <#else>
                   "Value": { "String" : "${stock.batch_1}"}
-            </#if>  
+            </#if>
            },
            {
            "Key": "HeldForSpecificCode",
            "Value": { "Bool" : "${stock.held_for_specific_code}"}
            },
-           
+
            {
-            <#assign manufacturing_datetime = RfxDateTimetoUTC(stock.Date_of_manufacture,time_zone_offset_rfx) />  
+            <#assign manufacturing_datetime = RfxDateTimetoUTCWithTimezone(stock.Date_of_manufacture,time_zone_rfx) />
            "Key": "ManufacturingDate",
            "Value": "Timestamp": {
 							"AuthorTimeZone": "${time_zone_rfx}",
 							"DateTime": "${manufacturing_datetime}"
 						  }
-            } 
+            }
          ]
 -->

--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -65,6 +65,3 @@
        }
    }
 ]
-
-
-
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -31,7 +31,8 @@
            reflexMvtStockInterface.ipg_move_type == "420" ||
            reflexMvtStockInterface.ipg_move_type == "455" ||
            reflexMvtStockInterface.ipg_move_type == "460" ||
-            reflexMvtStockInterface.ipg_move_type == "465"
+            reflexMvtStockInterface.ipg_move_type == "465" ||
+            (reflexMvtStockInterface.ipg_move_type == "520" && reflexMvtStockInterface.ipg_move_creation_program == "HFST69")
            >
            [
            {
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -2,7 +2,7 @@
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
 [
-    <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+    <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
    {
    "Header": {
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -18,9 +18,10 @@
            "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION",
            "455":"STOCK_MOVEMENT_TYPE_FIX",
            "460":"STOCK_MOVEMENT_TYPE_FIX",
-            "465":"STOCK_MOVEMENT_TYPE_FIX"
+            "465":"STOCK_MOVEMENT_TYPE_FIX",
+            "520":"STOCK_MOVEMENT_TYPE_OUTBOUND"
            }>
-<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) />
+<#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
 <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
 [
  {
@@ -52,7 +53,11 @@
        "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code?json_string}",
        "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}",
        "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}",
-        "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
+        <#if reflexMvtStockInterface.ipg_move_type == "520" >
+          "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}",
+        <#else>
+          "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}",
+        </#if>
        "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
        <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
          "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />

 [
  {
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) />
 [
  {
    "Header": {
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -53,7 +53,7 @@
            <#assign hd_numberHmapHUadded ={}>
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
-            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
            <#if !hd_numberHmap[despatched_ipg.hd_number]?? >
               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
               ,
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />

  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
--- a/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl
@@ -2,7 +2,7 @@
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
 [
-<#assign dispatched_datetime5 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime5 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
  {
    "Header": {
    "ProjectID": "${projectRP}"
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
 <#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -4,7 +4,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 packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+    <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
    {
    "Header": {
      "ProjectID": "${projectRP}"
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -2,7 +2,7 @@
 <#include "ReflexUtils.ftl">
 <#include "ActorPrefix.ftl">
 [
-<#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) />
  {
    "Header": {
    "ProjectID": "${projectRP}"
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) />
+<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.modification_datetime,time_zone_rfx) />
 [
  {
    "Header": {
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -3,8 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
  {
-  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) />
-  <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) />
+  <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) />
+  <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) />
    "Header": {
      "ProjectID": "${projectRP}"
    },
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />

 [
  {
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -3,8 +3,8 @@
 <#include "ActorPrefix.ftl">
 [
  {
-  <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) />
-  <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+  <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) />
+  <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
     "Header": {
      "ProjectID": "${projectRP}"
    },
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
 [
  {
     "Header": {
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -1,6 +1,6 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />

 [
  {
--- a/RFXtoRP_RfxConfigurationRp.ftl
+++ b/RFXtoRP_RfxConfigurationRp.ftl
@@ -25,8 +25,8 @@



-<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"UTC"}<#noparse>"></#noparse>
-<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+00:00"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"Europe/Paris"}<#noparse>"></#noparse>
+<#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+01:00"}<#noparse>"></#noparse>


 <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project>
--- a/RP_connector.ftl
+++ b/RP_connector.ftl
@@ -0,0 +1,38 @@
+<#-- ****
+Connector provides some of parameters through the class connectorParameters
+those parameters are stored in FTL file Conf-connector.ftl for later use in some of the data ftl files
+*** -->
+
+<#-- *********************************************** Parameter global ******************** -->
+<#assign file = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+<#assign aDateTime = .now>
+
+<#noparse><#-- Date of last generation : </#noparse>${aDateTime}<#noparse> --></#noparse>
+<#noparse><#-- /!\ Warning the file is generated, if you modify it manually, do not enable automatic update via the pipeline --></#noparse>
+
+<#noparse><#-- Possible values for SupplyOfTheTrackingNumber parameter : --></#noparse>
+<#noparse><#-- 0 : Always empty --></#noparse>
+<#noparse><#-- 1 : Always use Reflex WMS tracking --></#noparse>
+<#noparse><#-- 2 : Always use the HU number --></#noparse>
+<#noparse><#-- 3 : Use Reflex tracking if it exists, the HU number otherwise --></#noparse>
+
+<#list file.parameters as parameter>
+<#switch parameter.type>
+  <#case "string">
+     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = "</#noparse>${parameter.value!""}<#noparse>"></#noparse>
+     <#break>
+
+  <#case "integer">
+     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = </#noparse>${parameter.value!0}<#noparse>></#noparse>
+     <#break>
+
+  <#case "boolean">
+     <#noparse><#assign </#noparse>${parameter.name}<#noparse> = </#noparse>${(parameter.value!false)?c}<#noparse>></#noparse>
+     <#break>
+
+  <#default>
+
+</#switch>
+</#list>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.30+1
+1.2.37+2
Author	SHA1	Message	Date
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
Laurie Montant	2828c01cc4	modifs HU received	2025-03-26 15:08:56 +01:00
Laurie Montant	4553507e3b	modifs HU	2025-03-26 14:59:09 +01:00
Laurie Montant	830db1493b	modifs receipt	2025-03-24 15:58:33 +01:00
Laurie Montant	79ad7f53e8	dispute	2025-03-21 14:30:15 +01:00
Laurie Montant	c280b2c83a	hsrdepot	2025-03-21 14:27:52 +01:00
Laurie Montant	3a0bbdc479	claim reference empty	2025-03-21 11:21:59 +01:00
Laurie Montant	1e9ce7cdc4	claim	2025-03-20 18:02:43 +01:00
frea	eefc7070ac	SCPN1-8474 (cherry picked from commit `53c400be49`)	2025-03-20 17:38:36 +01:00
frea	f9c62d5ee4	SCPN1-8474 (cherry picked from commit `02e8dc2566`)	2025-03-20 17:11:58 +01:00
frea	bcf77601b9	SCPN1-8496	2025-03-20 13:52:24 +01:00
frea	1670a22218	SCPN1-8483 (cherry picked from commit `8ee7527ba4`)	2025-03-19 11:48:17 +01: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
Laurie Montant	1be67f65b2	modif	2025-03-19 10:41:13 +01:00
Laurie Montant	dec9a4b17f	displayID	2025-03-19 10:38:29 +01:00
freat	eb6182c337	Release 1.2.33+3	2025-03-13 10:38:21 +01:00
Laurie Montant	9f63f0ee62	Modifs Claim	2025-03-13 10:35:14 +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	a849b1c92e	update URL in readme.md (cherry picked from commit `5963948635`)	2025-03-12 15:05:32 +01:00
frea	810e0eaa89	SCPN1-8401 (cherry picked from commit 0cec20a8aa91ce5d958a9d6087d4778f86f2c5fd)	2025-03-07 14:17:58 +01:00
frea	1dc77965ce	SCPN1-8401	2025-03-07 14:14:28 +01:00
frea	9aee7a9448	SCPN1-8401 (syntaxe error in RXftoRP-HsrReceiptList_ExecutionflowDetected.ftl et RXftoRP-HsrReceiptList_ExecutionflowReceiptComplet.ftl) (cherry picked from commit `2681a4dc24`)	2025-03-06 16:14:47 +01:00
frea	d4765890e5	SCPN1-8401 (syntaxe error in RXftoRP-HsrPro_ExecutionflowDetected.ftl) (cherry picked from commit `9380d39bb6`)	2025-03-04 14:29:03 +01:00
Laurie Montant	9997441edb	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-02-28 09:45:55 +01:00
Laurie Montant	d2a00ffe2e	claim	2025-02-28 09:45:48 +01:00
frea	45a31fb33f	SCPN1-8401 (cherry picked from commit 724d4dd0c756a8c2f5b461874b36cd513feafbbd)	2025-02-27 17:56:42 +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
Laurie Montant	57d4cb6be2	modifs hsrprepa	2025-02-19 17:45:45 +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
Laurie Montant	172d6ead58	trackingNumberSource	2025-02-11 17:54:26 +01:00
frea	57533e8735	SCPN1-8280	2025-02-11 17:53:39 +01:00
Laurie Montant	4d59a53517	modifs	2025-02-10 11:56:10 +01:00
Laurie Montant	71a73bded4	modif	2025-02-10 11:06:00 +01:00
Laurie Montant	0e0397708f	modif	2025-02-07 16:15:15 +01:00
Laurie Montant	6319051741	modif	2025-02-07 16:05:57 +01:00
Laurie Montant	d955ccdbc4	include	2025-02-07 15:56:20 +01:00
Laurie Montant	817209a095	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2025-02-07 10:50:57 +01:00
Laurie Montant	af0d846271	HU	2025-02-07 10:50:35 +01:00
frea	fda736c295	SCPN1-8291	2025-02-07 10:11:04 +01:00
frea	2318bee797	SCPN1-8291	2025-02-06 09:50:00 +01:00
Laurie Montant	df2332b17e	move 520	2025-01-21 15:41:31 +01:00
Francis Reat	1de373be9c	Merge branch 'query_in_ftl' into 'develop' SCPN1-8043 See merge request r-d-technique/tiers/reflex-wms-connector!84	2025-01-16 17:00:28 +00:00
frea	e806da1129	SCPN1-8043	2025-01-16 17:59:55 +01:00
Francis Reat	b40475626e	Merge branch 'query_in_ftl' into 'develop' SCPN1-8043 See merge request r-d-technique/tiers/reflex-wms-connector!83	2025-01-13 15:28:57 +00:00
frea	559fff82e5	SCPN1-8043	2025-01-13 16:23:17 +01:00
Francis Reat	37f73115ff	Merge branch 'query_in_ftl' into 'develop' SCPN1-8043 See merge request r-d-technique/tiers/reflex-wms-connector!82	2025-01-07 16:42:00 +00:00
frea	a7bf18f25d	SCPN1-8043	2025-01-07 17:40:55 +01:00
frea	498ef5a5bf	SCPN1-8043	2025-01-07 11:16:32 +01:00
frea	b6415fa316	commit first	2025-01-06 17:56:10 +01:00
Vincent Le Maitre	08e4b04f7f	Release 1.2.31+1	2024-12-13 15:34:11 +01:00
Laurie Montant	d3c7d5a96c	modifs	2024-12-02 16:26:44 +01:00
Laurie Montant	329747d225	modifs ID Claim	2024-12-02 16:21:14 +01:00
Laurie Montant	f5e6c2b22e	modif trim	2024-12-02 16:03:45 +01:00
Laurie Montant	e41309e744	Correction priority date	2024-11-19 11:17:59 +01:00
Laurie Montant	20d77f21ed	CountryCode	2024-11-18 11:20:56 +01:00
Laurie Montant	3c11695650	CountryCode	2024-11-18 10:25:57 +01:00
Laurie Montant	5c6e200d3e	suppression logs d'erreurs	2024-11-13 10:50:10 +01:00
frea	d896aa95f4	SCPN1-7518	2024-11-12 17:59:03 +01:00
Laurie Montant	ea58acc353	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-11-12 10:16:13 +01:00
Laurie Montant	4d24367b58	json_string	2024-11-12 10:16:06 +01:00
frea	5901619f6a	SCPN1-7518	2024-11-08 16:39:08 +01:00
Laurie Montant	19c87e38df	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-11-05 16:36:54 +01:00
Laurie Montant	821b58b3bf	Claim	2024-11-05 16:36:47 +01:00
frea	31f38e9626	SCPN1-7496	2024-11-05 11:37:39 +01:00
Laurie Montant	5d799566fe	unicité	2024-11-04 17:13:19 +01:00
Laurie Montant	867a894e2e	unicité	2024-11-04 10:49:32 +01:00
Laurie Montant	a11124d144	unicité	2024-11-04 10:42:40 +01:00
Laurie Montant	dbfcccfdd9	modifs	2024-10-29 13:49:45 +01:00
Laurie Montant	0c4e85067b	correction	2024-10-29 11:24:45 +01:00
Laurie Montant	b1e5d51ba0	modifs uniqueness	2024-10-29 11:18:35 +01:00
Laurie Montant	1e42f6d81c	modifs HsrReceipt	2024-10-18 15:52:08 +02:00
frea	8aab4296a2	update "uniqueness" variable	2024-10-16 17:37:17 +02:00
frea	8160342c63	update "uniqueness" variable	2024-10-16 16:23:43 +02:00
frea	72abd3b22a	update "uniqueness" variable	2024-10-16 16:04:00 +02:00
Laurie Montant	bcddf351a0	modifs	2024-10-16 11:51:25 +02:00
Laurie Montant	9c229997b3	espace	2024-10-16 09:40:53 +02:00
Laurie Montant	cdbb00ea4c	modifs	2024-10-16 09:13:07 +02:00
Laurie Montant	ffbeb4cadc	modifs	2024-10-15 17:03:15 +02:00
Laurie Montant	f736d62ee4	modifs	2024-10-15 17:00:34 +02:00
Laurie Montant	6f636b4ee7	modifs	2024-10-15 16:56:15 +02:00
Laurie Montant	0406a2ff3a	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-10-15 16:54:31 +02:00
Laurie Montant	833ed4ebd6	modifs	2024-10-15 16:54:24 +02:00
frea	90bfd41f41	Ajout du flux LoadInfo	2024-10-15 16:19:31 +02:00
Laurie Montant	557828b459	modifs nom	2024-10-11 11:01:13 +02:00
Laurie Montant	1cc34e6657	modifs depot	2024-10-10 14:08:43 +02:00
Laurie Montant	42571ef2a1	modifs	2024-10-09 17:13:05 +02:00
Laurie Montant	63db993164	modifs dispute	2024-10-09 17:07:16 +02:00
Laurie Montant	86335ba52d	modifs	2024-10-09 16:06:17 +02:00
Laurie Montant	37773416ff	modifs	2024-10-09 15:17:53 +02:00
Laurie Montant	e9e09a5eb1	modifs	2024-10-09 15:03:29 +02:00
Laurie Montant	234918a77e	modifs	2024-10-09 14:56:26 +02:00
Laurie Montant	8d4067a58e	modifs	2024-10-09 11:32:48 +02:00
Laurie Montant	aa62c276d1	modifs	2024-10-08 14:19:15 +02:00
Laurie Montant	de5a9b431e	modifs	2024-10-08 11:44:47 +02:00
Laurie Montant	deba22e9d4	modifs	2024-10-08 11:12:47 +02:00
Laurie Montant	81720b2547	modifs	2024-10-08 10:20:15 +02:00
frea	ed8aff1e3c	SCPN1-7052	2024-10-08 10:00:14 +02:00
Laurie Montant	153df99ed1	modifs	2024-10-08 09:25:04 +02:00
Laurie Montant	65601133f1	unicité	2024-10-07 14:52:28 +02:00
Laurie Montant	25011e68e6	modifs	2024-10-03 14:46:45 +02:00
Laurie Montant	3a9f26cef2	modifs	2024-10-01 11:25:06 +02:00
Laurie Montant	7c1b05d76e	modifs	2024-10-01 11:07:39 +02:00
Laurie Montant	134e44185a	modifs	2024-10-01 10:12:12 +02:00
Laurie Montant	49b2f6e17a	modifs	2024-10-01 10:07:43 +02:00
Laurie Montant	6400c985a2	message	2024-09-30 16:59:22 +02:00
Laurie Montant	e97066c118	modifs labelled	2024-09-30 15:28:24 +02:00
Laurie Montant	9f02fce236	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-09-30 15:19:33 +02:00
Laurie Montant	10bb90bf92	modifs	2024-09-30 15:19:24 +02:00
frea	e53e4ec9a0	SCPN1-7265	2024-09-30 12:05:38 +02:00
frea	9524923f0c	SCPN1-7265	2024-09-27 10:08:36 +02:00
Laurie Montant	138bcdadf8	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-09-26 16:09:30 +02:00
Laurie Montant	e2c0735dc7	modifs	2024-09-26 15:58:37 +02:00
Laurie Montant	aba22026bb	date tracking	2024-09-26 15:58:04 +02:00
frea	360c0743bc	SCPN1-7088	2024-09-20 17:22:27 +02:00
Laurie Montant	307ae9ebe2	modifs	2024-09-17 17:29:04 +02:00
Laurie Montant	80a34b354d	modifs	2024-09-17 16:28:49 +02:00
Laurie Montant	09ec0e4509	modifs	2024-09-17 11:46:24 +02:00
Laurie Montant	c05a4653ba	modifs	2024-09-17 10:25:53 +02:00
Laurie Montant	956105fc38	modifs uniqueness	2024-09-16 16:12:43 +02:00
Laurie Montant	d91d15c1c9	modifs	2024-09-16 15:25:39 +02:00
Laurie Montant	550c0047da	modifs	2024-09-16 15:25:10 +02:00
Laurie Montant	a8b044fdba	modifs	2024-09-16 14:54:43 +02:00
Laurie Montant	89fae85a2f	modifs	2024-09-16 14:48:12 +02:00
Laurie Montant	bfc96d37ab	modifs	2024-09-16 14:35:15 +02:00
Laurie Montant	c742c3639f	modifs	2024-09-16 14:30:11 +02:00
Laurie Montant	d60a75cbbc	modifs	2024-09-16 14:25:29 +02:00
Laurie Montant	cde81b3e8b	modifs	2024-09-16 14:20:20 +02:00
Laurie Montant	75a9a1727c	modifs	2024-09-16 14:12:45 +02:00
Laurie Montant	6d45f474d4	modifs	2024-09-16 14:04:35 +02:00
Laurie Montant	7857dfd696	modifs	2024-09-16 13:54:09 +02:00
Laurie Montant	01d58746d8	modifs	2024-09-12 17:07:33 +02:00
frea	ab7c45bcd7	SCPN1-7155	2024-09-12 11:55:45 +02:00
Laurie Montant	f4f0a50493	modifs	2024-09-11 15:12:17 +02:00
Laurie Montant	65fed72146	modifs	2024-09-11 15:09:41 +02:00
Laurie Montant	0a0121c020	modifs	2024-09-11 14:59:45 +02:00
Laurie Montant	50fb9b467f	modifs	2024-09-06 16:21:09 +02:00
Laurie Montant	843bf837b2	motifs	2024-09-06 16:14:11 +02:00
frea	ca33a85694	SCPN1-7065	2024-08-29 10:34:55 +02:00
Laurie Montant	c183ade001	hsadispute	2024-08-08 11:47:14 +02:00
Laurie Montant	d4b927b7f7	hsrdispute	2024-08-08 10:55:39 +02:00
frea	08cf8ec1a6	add hsaDispute flow	2024-08-06 17:40:16 +02:00
Laurie Montant	66d002052c	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-08-06 17:13:10 +02:00
Laurie Montant	949d4c6a8d	CC vide	2024-08-06 17:13:04 +02:00
frea	2b828c2f4b	code country ISO	2024-08-06 14:18:02 +02:00
Laurie Montant	a9fec0b5f9	country	2024-08-06 11:29:02 +02:00
Laurie Montant	b7f383d531	country code 2	2024-08-06 11:26:18 +02:00
Laurie Montant	d21a863060	country code	2024-08-06 11:21:18 +02:00
Laurie Montant	9ee9743b81	Code ico controle	2024-08-06 10:54:28 +02:00
Laurie Montant	b5ef671512	MD Actor	2024-07-31 17:15:44 +02:00
Laurie Montant	3eb072f36d	Mouvements	2024-07-26 14:06:19 +02:00
Laurie Montant	f98e963b76	modifs HsrPRo	2024-07-19 11:22:18 +02:00
@@ -1 +1 @@
 .2.30+1
 .2.37+2