Merge branch 'release/1.2' into 'main'

MR->main

See merge request r-d-technique/tiers/reflex-wms-connector!44
This commit is contained in:
Cedric RODIER 2024-06-06 08:06:19 +00:00
commit 24ae26673f
2 changed files with 3 additions and 3 deletions

View File

@ -55,8 +55,8 @@
<#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
"PriorityDate": "${line_without_detail_priority_date}", "PriorityDate": "${line_without_detail_priority_date}",
<#else> <#else>
<#if (line.line_detail?? && line.line_detail.priority_date?length != 0) && (line.line_detail.priority_date?starts_with("00") == false)> <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
<#assign line_detail_priority_date = line.line_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
"PriorityDate": "${line_detail_priority_date}", "PriorityDate": "${line_detail_priority_date}",
<#else> <#else>
"PriorityDate": "1970-01-01T00:00:00Z", "PriorityDate": "1970-01-01T00:00:00Z",

View File

@ -1 +1 @@
1.2.16+4 1.2.16+5