Merge branch 'develop' into release-2.0-v13

# Conflicts:
#	RFXtoRP_HsaItm_ItemCreated.ftl
#	RFXtoRP_HsrAntRec.ftl
#	RFXtoRP_HsrCarrierApt.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
#	RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl
#	RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
#	RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
#	RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
#	RFXtoRP_HsrPro_ExecutionflowDetected_ShipToMetadata.ftl
#	RFXtoRP_PlatformLogCreate.ftl
#	RFXtoRP_RestResponse.ftl
#	RPtoRFX_AppointmentEvent.ftl
#	RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl
#	RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl
#	RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl

RFXtoRP_RestResponse.ftl

@@ -8,11 +8,20 @@
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> develop
 <#assign aDateTime = .now>
 <#assign no_apiRestReflexID = "no apiRestReflexID">
 <#assign no_status = -99999>
 <#assign event = "UNKNOW_EVENT" >
+<<<<<<< HEAD
+=======
+<#-- DeleteEF_False a définir dans ce fichier -->
+<#-- DeleteEF_False to be defined in this file.-->
+<#include "InternalSettings.ftl">
+>>>>>>> develop
 
 <#switch id.apiRestReflexID!no_apiRestReflexID>
 	<#case no_apiRestReflexID>
@@ -59,6 +68,7 @@
 			<#case 201>
 				<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 				<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
+<<<<<<< HEAD
 				<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
 				[
 					{
@@ -70,6 +80,10 @@
 				]
 				<#else>
 					<#if preparationOrderPostResponse.status?? &&  preparationOrderPostResponse.status == "WARN">
+=======
+				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
+					<#if DeleteEF_False>
+>>>>>>> develop
 					[
 						{
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
@@ -81,6 +95,7 @@
 					<#else>
 					[
 						{
+<<<<<<< HEAD
 							<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 							<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
 							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -96,6 +111,32 @@
 						}
 					]
 					</#if>
+=======
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+													"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+													"datas" :
+							<#include "RFXtoRP_ExecutionflowDeleted.ftl">
+						}
+					]
+					</#if>
+				<#else>
+				[
+					{
+						<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+							<#assign event = "RP_EXECUTIONFLOW_EVENT">
+							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					},
+					{
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					}
+				]
+>>>>>>> develop
 				</#if>
 			<#break>
 			<#default>
@@ -154,9 +195,9 @@
 				[
 					{
 						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
-												"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-												"datas" :
-						<#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl">
+						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						"datas" :
+						<#include "RFXtoRP_ExecutionflowDeleted.ftl">
 					}
 				]
 				<#else>