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

Release-2.0-V14 into release/2.0

See merge request r-d-technique/tiers/reflex-wms-connector!295
This commit is contained in:
2026-07-07 12:22:19 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -28,7 +28,7 @@
<#assign AddComma = false /> <#assign AddComma = false />
<#assign appointment = eventRP.data /> <#assign appointment = eventRP.data />
<#if !eventRP.commissionsUpdated!false && !eventRP.reasonUpdated!false && !eventRP.slotUpdated!false && !eventRP.carrierInformationUpdated!false> <#if !(eventRP.commissionsUpdated!false) && !(eventRP.reasonUpdated!false) && !(eventRP.slotUpdated!false) && !(eventRP.carrierInformationUpdated!false)>
<#stop> <#stop>
</#if> </#if>
[ [

View File

@@ -17,7 +17,7 @@
</#if> </#if>
"physical_receipt_list": [ "physical_receipt_list": [
<#list removedCommissions?filter(l -> l.ExecutionflowID??) as removedCommission> <#list removedCommissions?filter(l -> (l.ExecutionflowID?? && l.ExecutionflowID != "")) as removedCommission>
{ {
"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}", "receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}", "originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",