Release 1.2.33+2

Merge branch 'SCPN1-8183' into 'release/1.2'
move 520 See merge request r-d-technique/tiers/reflex-wms-connector!88
2025-02-25 17:42:12 +01:00 · 2025-02-25 16:15:19 +00:00 · 2025-02-25 15:58:32 +01:00 · 2025-02-18 10:08:14 +01:00 · 2025-02-18 08:59:45 +00:00 · 2025-02-18 09:35:16 +01:00
3 changed files with 10 additions and 4 deletions
--- 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_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -18,7 +18,8 @@
            "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 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/2
+++ b/2
@@ -1 +1 @@
-1.2.31+1
+1.2.33+2
Author	SHA1	Message	Date
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
@@ -1 +1 @@
 .2.31+1
 .2.33+2