From 804ceb25f3816bde828212e7f189651e1e998579 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 10 Jul 2025 10:33:34 +0200
Subject: [PATCH] =?UTF-8?q?Modif=20R=C3=A9ception?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RFXtoRP_HsaDispute_Created.ftl                            | 4 ++--
 RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl          | 3 ---
 RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl | 7 ++++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl
index 16a1b90..eb9a5cd 100644
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -49,11 +49,11 @@
             <#else>
                 <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070"  >
                     <#if dispute.dispute_reception.reception_type_code=="030">
-                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                        "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
                         "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
                     <#else>
                         <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" >
-                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}",
+                            "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}",
                             "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}",
                         <#else>
                             <#stop "WMS type code not supported">
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index 510e2d8..e7d5e99 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,10 +9,7 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
-      <#else>
-        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
       </#if>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
index 3083bb8..53593cd 100644
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -12,7 +12,7 @@
           <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
             "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
           <#else>
-            "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
+            "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
           </#if>
         "RefDate": {
               "DateTime": "${receipt_creation_datetime}",
@@ -24,6 +24,11 @@
           "DateTime": "${receipt_creation_datetime}",
           "AuthorTimeZone": "${time_zone_rfx}"
           },
+        <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+          "OrderID": "${receipt.receipt_reference?trim?json_string}",
+        <#else>
+          "OrderID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+        </#if>
         "OrderID":"${receipt.receipt_reference?trim?json_string}",
         <#-- Header Metadata inclusion -->
         <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,