From 0a5ec7329cc2e5a9a51c2c309f8bda71f5a4b8cb Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 3 Jul 2025 16:09:48 +0200
Subject: [PATCH] SCPN1-8863

---
 RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index 9780607..f500905 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -30,17 +30,12 @@
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
         <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
-          <#if reflexMvtStockInterface.receipt_reference!="">
-            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
-            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
           <#else>
-            <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
-              "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
-              "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
-            <#else>
-                "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-                "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
-            </#if>
+              "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
           </#if>
         <#else>
           <#if reflexMvtStockInterface.receipt_reference!="">