From 8c228dd0eb106e066157e459c29c6829a797c3b9 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 7 Jul 2025 15:58:10 +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

---
 ..._HsrReceiptList_ExecutionflowCancelled.ftl | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index 4106515..5c835a6 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -24,35 +24,37 @@
             }
           }
         </#if>
+      <#else>
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+        <#else>
+          {
+            "Header": {"ProjectID": "${projectRP}"},
+            "ID": {
+              "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+              "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+              }
+            },
+            "Payload": {
+            }
+          }
+        <#break>
+        </#if>
       </#if>
     </#list>
-  <#else>
-    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-    {
-      "Header": {"ProjectID": "${projectRP}"},
-      "ID": {
-          "RefID": "${receipt.receipt_reference?trim?json_string}",
-        "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-        }
-      },
-      "Payload": {
-      }
-    }
-    <#else>
-      {
-        "Header": {"ProjectID": "${projectRP}"},
-        "ID": {
-          "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
-          "RefDate": {
-          "DateTime": "${receipt_status_datetime}",
-          "AuthorTimeZone": "${time_zone_rfx}"
-          }
-        },
-        "Payload": {
-        }
-      }
-    </#if>
   </#if>
-]
+]
\ No newline at end of file