Release 2.0.15+2

Edit VERSION for jira SCPN1-8601
Merge branch 'SCPN1-8601' into 'release/2.0'
2025-04-11 16:55:37 +02:00 · 2025-04-11 14:42:54 +00:00 · 2025-04-11 14:02:06 +00:00 · 2025-04-11 15:57:29 +02:00 · 2025-04-10 09:55:51 +02:00
2 changed files with 4 additions and 6 deletions
--- a/TDItoRP.ftl
+++ b/TDItoRP.ftl
@@ -7,7 +7,7 @@
 <#assign senderTag = tdiEventMsg.senderTag>

 <#-- Target = 0 : Expedition , Target = 1 : Colis   -->
-<#if tdiEvent.Target == 0 >
+<#if tdiEvent.Target == 0 ||  (tdiEvent.Target == 1 && tdiEvent.ParcelNumber?? && tdiEvent.ParcelNumber == "")>
    <#stop >
 <#else>
 	{"Header":
@@ -16,7 +16,7 @@
 		},
 		"ID":
 		{
-		   "RefID": "${tdiEvent.ParcelNumber!tdiEvent.HUReference1}"
+		   "RefID": "${tdiEvent.ParcelNumber}"
 		},
 		"Payload":
 		{"Events": [
@@ -47,7 +47,6 @@
 					tdiEvent.EventCode == "POD" ||
 					tdiEvent.EventCode == "FAC" ||
 				   	tdiEvent.EventCode == "OK-WITHDRAWA" >
-
 			  "Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed  -->
 			  <#else>
 			   <#if tdiEvent.EventCode?starts_with("DC") == true ||
@@ -71,4 +70,3 @@
 		 }
 	}
 </#if>
-
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.16+1
+2.0.15+2
Author	SHA1	Message	Date
freat	d9a3666dde	Release 2.0.15+2	2025-04-11 16:55:37 +02:00
Francis Reat	dfe1b74ab2	Edit VERSION for jira SCPN1-8601	2025-04-11 14:42:54 +00:00
Francis Reat	9dfe72ee02	Merge branch 'SCPN1-8601' into 'release/2.0' correction pour la v9 et v10 connecteur TDI See merge request r-d-technique/tiers/tdi-connector!13	2025-04-11 14:02:06 +00:00
frea	ff72d30b18	SCPN1-8601	2025-04-11 15:57:29 +02:00
frea	9d16833c49	SCPN1-8601	2025-04-10 09:55:51 +02:00
@@ -1 +1 @@
 .0.16+1
 .0.15+2