From 06df711a0eb50e91b5be4e2d1dcc535c00e541b9 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 2 Jul 2026 16:29:05 +0200 Subject: [PATCH 1/3] update RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl par defaut (cherry picked from commit 2dadea6b9781db9a604ea608260f1f738c95654a) --- RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl b/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl index 79553d0..ef3e619 100644 --- a/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl +++ b/RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl @@ -1,6 +1,6 @@ -"SegmentationSelections": [ +"SegmentationKeys": [ ] From 23e7d05ae8b7f2e62dc9d8748ce727d4e6c82eab Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Mon, 6 Jul 2026 10:22:05 +0200 Subject: [PATCH 2/3] SCPN1-10996 --- RPtoRFX_AppointmentEvent.ftl | 8 ++++---- ...erAppointmentAnticipatedReceiptAssociationByNumber.ftl | 2 +- ...rAppointmentAnticipatedReceiptDissociationByNumber.ftl | 2 +- ...rrierAppointmentPhysicalReceiptAssociationByNumber.ftl | 2 +- ..._CarrierAppointmentPhysicalReceiptAssociationByRef.ftl | 2 +- ...CarrierAppointmentPhysicalReceiptDissociationByRef.ftl | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 01b428a..5ebd44a 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -41,7 +41,7 @@ } <#else> <#if eventRP.commissionsUpdated> - <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> x.ExecutionflowID != "")?size != 0> + <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> (x.ExecutionflowID?? && x.ExecutionflowID != ""))?size != 0> <#if eventRP.appointmentCustomFields?has_content> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> @@ -59,7 +59,7 @@ <#assign AddComma = true /> - <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> x.ExecutionflowID != "")?size != 0> + <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> (x.ExecutionflowID?? && x.ExecutionflowID != ""))?size != 0> <#if AddComma == true> , @@ -82,7 +82,7 @@ <#assign AddComma = true /> - <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> x.ExecutionflowID == "")?size != 0> + <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "" && eventRP.addedUnloadCommissions?filter(x -> (!x.ExecutionflowID?? || x.ExecutionflowID == ""))?size != 0> <#if AddComma == true> , @@ -96,7 +96,7 @@ <#assign AddComma = true /> - <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> x.ExecutionflowID == "")?size != 0> + <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="" && eventRP.removedUnloadCommissions?filter(x -> (!x.ExecutionflowID?? || x.ExecutionflowID == ""))?size != 0> <#if AddComma == true> , diff --git a/RPtoRFX_CarrierAppointmentAnticipatedReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentAnticipatedReceiptAssociationByNumber.ftl index a387efd..5f3bd82 100644 --- a/RPtoRFX_CarrierAppointmentAnticipatedReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentAnticipatedReceiptAssociationByNumber.ftl @@ -17,7 +17,7 @@ "anticipated_receipt_list": [ - <#list addedCommissions?filter(l -> l.OrderID??) as addedCommission> + <#list addedCommissions?filter(l -> (l.OrderID?? && (!l.ExecutionflowID?? || l.ExecutionflowID == ""))) as addedCommission> { "activity": "${orderCustomFields[addedCommission.OrderID].activity_code?json_string}", "originator_code": "${orderCustomFields[addedCommission.OrderID].originator_code?json_string}", diff --git a/RPtoRFX_CarrierAppointmentAnticipatedReceiptDissociationByNumber.ftl b/RPtoRFX_CarrierAppointmentAnticipatedReceiptDissociationByNumber.ftl index 17a4dd6..6528680 100644 --- a/RPtoRFX_CarrierAppointmentAnticipatedReceiptDissociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentAnticipatedReceiptDissociationByNumber.ftl @@ -17,7 +17,7 @@ "anticipated_receipt_list": [ - <#list removedCommissions?filter(l -> l.OrderID??) as removedCommission> + <#list removedCommissions?filter(l -> (l.OrderID?? && (!l.ExecutionflowID?? || l.ExecutionflowID == ""))) as removedCommission> { "activity": "${orderCustomFields[removedCommission.OrderID].activity_code?json_string}", "originator_code": "${orderCustomFields[removedCommission.OrderID].originator_code?json_string}", diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index 2d532b1..63352a1 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -17,7 +17,7 @@ "physical_receipt_list": [ - <#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission> + <#list addedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as addedCommission> { "receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}", "originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}", diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl index 0fef024..f62bde4 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl @@ -16,7 +16,7 @@ "physical_receipt_list": [ - <#list addedCommissions?filter(l -> l.ExecutionflowID??) as addedCommission> + <#list addedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as addedCommission> { "receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}", "originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}", diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl index 20735f9..a5223eb 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl @@ -16,7 +16,7 @@ "physical_receipt_list": [ - <#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission> + <#list removedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as removedCommission> { "receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}", "originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}", From 101f1260562fb783051ba7cb581528ad34270df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20LE=20MA=C3=8ETRE?= Date: Mon, 6 Jul 2026 15:06:28 +0200 Subject: [PATCH 3/3] Release 2.0.24+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7e97536..8f5e11d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.24+1 +2.0.24+2