From d358b41bf0209bd8efbbd3907e684fb6758f2611 Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:03 +0000 Subject: [PATCH 1/8] SCPN1-11090 (cherry picked from commit fb17a8e1172803a8de6c7c07a3b0689720f8398e) Co-authored-by: Laurie Montant --- RFXtoRP_RestResponse.ftl | 2 +- RPtoRFX_CarrierAppointmentCreated.ftl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 5c24aaa..4f87a5e 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -358,7 +358,7 @@ ] <#break> - <#-- *********************************************** ApiRestID = canceled ******************** --> + <#-- *********************************************** ApiRestID = status ******************** --> <#case "status_appointment_put_update_by_ref"> <#case "status_appointment_put_update_by_number"> <#switch restResponsetMsg.status!no_status> diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index b1a4c5c..3376ce0 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -38,7 +38,9 @@ <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? && - appointment.Unloading.Projects[0].Commissions??> + 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!= ""> "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> From baa910ab21324a042d3d01dda83029c6d2a4e67c Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:17 +0000 Subject: [PATCH 2/8] 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> From 35819ec7b5acec81acc51b7ce60b57a6900eeb64 Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:31 +0000 Subject: [PATCH 3/8] SCPN1-11090 (cherry picked from commit af2ccc088c2dd4a2ab1385ba705b7615a2297ca3) Co-authored-by: Laurie Montant --- RPtoRFX_CarrierAppointmentCreated.ftl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 97dcd3d..dc0f5c3 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -37,10 +37,11 @@ <#include "RPtoRFX_CarrierAppointmentDefaultData.ftl"> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#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]?? && + appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID != "" + && appointment.Unloading.Projects[0].Commissions[0].OrderID!= ""> + "appointment_designation":"${(appointment.Reason!"")!?json_string}", + <#else> "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> @@ -72,8 +73,6 @@ <#sep>, ], - <#else> - "appointment_designation":"${(appointment.Reason!"")!?json_string}", <#else> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> From d12a852ae4c97aa3fd7a0b9574a1c6e0d4f52cfa Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:44 +0000 Subject: [PATCH 4/8] SCPN1-11090 (cherry picked from commit cb1b99af9644613d8cc4033e10ef971f66328417) 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 dc0f5c3..5eee6fb 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -38,8 +38,8 @@ <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#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].OrderID!= ""> + appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID == "" + && appointment.Unloading.Projects[0].Commissions[0].OrderID == ""> "appointment_designation":"${(appointment.Reason!"")!?json_string}", <#else> "physical_receipt_list": [ From ff617683e7b81901080d1d40d126da55dbfd2b93 Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:51 +0000 Subject: [PATCH 5/8] SCPN1-11090 (cherry picked from commit 70fe4a3eda48a1cd6bf6be79858acb01d24c3286) Co-authored-by: Laurie Montant --- RPtoRFX_CarrierAppointmentCreated.ftl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 5eee6fb..1b8d384 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -38,8 +38,11 @@ <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#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].OrderID == ""> + 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_designation":"${(appointment.Reason!"")!?json_string}", <#else> "physical_receipt_list": [ From 3f8ee07798298761a613bb8acc5998ecdfe599be Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:59 +0000 Subject: [PATCH 6/8] SCPN1-11090 (cherry picked from commit 72bf165112481625c9164f153e5368da710375f2) Co-authored-by: Laurie Montant --- RPtoRFX_CarrierAppointmentCreated.ftl | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 1b8d384..48a3dee 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -38,15 +38,15 @@ <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#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?? > + <#if 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_designation":"${(appointment.Reason!"")!?json_string}", - <#else> - "physical_receipt_list": [ - <#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission> + <#else> + "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> { "receipt_activity": "${custom.value.activity_code?json_string}", @@ -59,9 +59,9 @@ <#sep>, - ], - "anticipated_receipt_list": [ - <#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission> + ], + "anticipated_receipt_list": [ + <#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission> <#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom> { "activity": "${custom.value.activity_code?json_string}", @@ -75,7 +75,8 @@ <#sep>, - ], + ], + <#else> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> From 3d6afa4f3019ad1a17766b96ea62aab6e1e51654 Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:21:08 +0000 Subject: [PATCH 7/8] SCPN1-11090 (cherry picked from commit 911ed1d5cf8238a7ca8d267005ca9ac18aee551b) Co-authored-by: Laurie Montant --- RPtoRFX_CarrierAppointmentCreated.ftl | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 48a3dee..89aa492 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -39,11 +39,9 @@ <#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? && appointment.Unloading.Projects[0].Commissions?? > - <#if 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_designation":"${(appointment.Reason!"")!?json_string}", + <#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" && + (appointment.Unloading.Projects[0].Commissions[0].OrderID!"") == ""> + "appointment_designation":"${(appointment.Reason!"")!?json_string}", <#else> "physical_receipt_list": [ <#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission> From 3230207b81c3ef1f45177dc798d83b60b5b055ef Mon Sep 17 00:00:00 2001 From: Nathan SOULIER Date: Wed, 29 Jul 2026 14:56:27 +0200 Subject: [PATCH 8/8] Release 2.0.25+4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4ad9f06..f1dbecd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.25+3 +2.0.25+4