From 65fca995775f0eb11f9bd14c9a75c5b5c8588076 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 25 Jun 2026 13:56:36 +0200 Subject: [PATCH 1/2] SCPN1-10882 (cherry picked from commit d380ec91f830648532f69e9c1c41fa14db652d92) --- RPtoRFX_AppointmentEvent.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 4dbf993..343103b 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -27,6 +27,10 @@ <#case "Updated"> <#assign AddComma = false /> <#assign appointment = eventRP.data /> + + <#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false> + <#stop> + [ <#if appointment?? && (!(appointment.WMSCreated??) || !appointment.WMSCreated) && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR> { From d4e5910933d22ee4bc0956fb9599ce4b2761dd9c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 29 Jun 2026 15:56:52 +0200 Subject: [PATCH 2/2] CMD --- RPtoRFX_PrepOrder.ftl | 8 ++++---- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 3bbf34c..239662e 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -37,15 +37,15 @@ "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", "requested_delivery_date_type": "${requested_delivery_date_type}", - "consolidated_delivery": "${consolidated_delivery_flag}", + "consolidated_delivery": "false", "pick_sequence_code": "${pick_sequence_code}", "intermediate_consignee": "false", - "protected": "${protected_flag}", - "automatic_generation": "${automatic_generation_flag}", + "protected": "false", + "automatic_generation": "true", "deactivate": "false", "optional_attributes": { <#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl"> - "apt_with_end_consignee": "${apt_with_end_consignee_flag}", + "apt_with_end_consignee": "false", "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" } diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index 6d51468..d675f0a 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -18,11 +18,7 @@ <#assign originator_code = ""/> <#assign preparation_type_code = ""/> <#assign requested_delivery_date_type = ""/> -<#assign consolidated_delivery_flag ="false"/> <#assign pick_sequence_code = ""/> -<#assign protected_flag ="false"/> -<#assign automatic_generation_flag ="false"/> -<#assign apt_with_end_consignee_flag="false"/> <#-- A supprimer si utilisation de la table de correspondance--> <#--To be deleted if using the correspondence table-->