From 30c48670c32415287c0d5af9013cee1eb445036a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 14 Oct 2025 17:09:53 +0200 Subject: [PATCH] SCPN1-9437 (cherry picked from commit 791a958b4d2a0d1a0fc5ebeb9535207d1d2177af) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 2cb6932..f2b4ca9 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -38,8 +38,8 @@ <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true"> "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> - <#if preparation_order.preparation_type_code == "030"> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.transfer_intermediate_consignee=="false" && preparation_order.transfer_physical_depot_code?? && preparation_order.transfer_physical_depot_code!=""> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.transfer_physical_depot_code?json_string)}" <#else> <#if preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" &&