diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index 001ae02..3c01e2c 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -29,13 +29,27 @@
          <#-- 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}",
+        <#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}",
+          <#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>
+          </#if>
         <#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>
+          <#if reflexMvtStockInterface.receipt_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.receipt_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>
         <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0>
           "LineID": "${reflexMvtStockInterface.origin_order_line_number}",
         <#else>