Merge branch 'Release-1.2-V14' into 'release/1.2'

Release 1.2 V 14

See merge request r-d-technique/tiers/reflex-wms-connector!284

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>
 	[
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
 		{

RPtoRFX_PrepOrder.ftl

@@ -37,15 +37,15 @@
 			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"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}"
 		  	}

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-->