From 68a39fab3d4b326e54e67acc261380fcad52432d Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Mon, 2 Mar 2026 16:18:04 +0100
Subject: [PATCH] SCPN1-10253

(cherry picked from commit eea2a41313e5ee3b118223b3d0e748b8a69eb17e)
---
 ...rCarrierApt_BookingForceBookAppointment.ftl | 18 ++++++------------
 ...rCarrierApt_BookingWMSUpdateAppointment.ftl |  9 +++------
 RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl    |  5 -----
 RFXtoRP_HsrCarrierApt_Quantities.ftl           |  5 -----
 RFXtoRP_HsrCarrierApt_TotalQuantities.ftl      |  5 -----
 5 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl
 delete mode 100644 RFXtoRP_HsrCarrierApt_Quantities.ftl
 delete mode 100644 RFXtoRP_HsrCarrierApt_TotalQuantities.ftl

diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
index 0ac420f..abbb1bf 100644
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -114,15 +114,12 @@
 										"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 										"ProjectID": "${projectRP}",
 										"PartnerAppID": "${partnerApplicationRP}",
-										"OrganisationID": "${organisationRP}",
-										<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
+										"OrganisationID": "${organisationRP}"
 									}<#sep>,</#sep>
 									</#list>
 								],
-							    "ProjectID"	: "${projectRP}",
-							    <#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl">
-					   }],
-						<#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl">
+							    "ProjectID"	: "${projectRP}"
+					   }]
 					},
 			<#else>
 				"Loading" :
@@ -132,13 +129,10 @@
 								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 								"ProjectID": "${projectRP}",
 								"PartnerAppID": "${partnerApplicationRP}",
-								"OrganisationID": "${organisationRP}",
-								<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">		
+								"OrganisationID": "${organisationRP}"		
 						}],
-							"ProjectID"	: "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-							<#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl">
-					}],
-						<#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl">
+							"ProjectID"	: "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
+					}]
 					},
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 					"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index 15f77e8..568f477 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -109,15 +109,12 @@
 						</#if>
 						"ProjectID": "${projectRP}",
 						"PartnerAppID": "${partnerApplicationRP}",
-						"OrganisationID": "${organisationRP}",
-						<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
+						"OrganisationID": "${organisationRP}"
 					}<#sep>,</#sep>
 					</#list>
 					],
-					"ProjectID"	: "${projectRP}",
-					<#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl">
-				}],			
-				<#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl">
+					"ProjectID"	: "${projectRP}"
+				}]
 			},
 		<#else>
 			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
diff --git a/RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl b/RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl
deleted file mode 100644
index 6c84c6f..0000000
--- a/RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-"ProjectQuantities": [
-   
- ]
-
-
diff --git a/RFXtoRP_HsrCarrierApt_Quantities.ftl b/RFXtoRP_HsrCarrierApt_Quantities.ftl
deleted file mode 100644
index 22b0ec5..0000000
--- a/RFXtoRP_HsrCarrierApt_Quantities.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-"Quantities": [
-   
- ]
-
-
diff --git a/RFXtoRP_HsrCarrierApt_TotalQuantities.ftl b/RFXtoRP_HsrCarrierApt_TotalQuantities.ftl
deleted file mode 100644
index 61bfaac..0000000
--- a/RFXtoRP_HsrCarrierApt_TotalQuantities.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-"TotalQuantities": [
-   
- ]
-
-