From baa910ab21324a042d3d01dda83029c6d2a4e67c Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:17 +0000 Subject: [PATCH] SCPN1-11090 (cherry picked from commit 8b8abd09daf3f10bec389d98457d2258e169c08c) Co-authored-by: Laurie Montant --- RPtoRFX_CarrierAppointmentCreated.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 3376ce0..97dcd3d 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -39,8 +39,8 @@ <#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? && appointment.Unloading.Projects[0].Commissions?? && - appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID != "" - && appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!= ""> + appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID != "" + || appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!= "")> "physical_receipt_list": [ <#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission> <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>