Merge branch 'SCPN1-10253-2.0' into 'release/2.0'
SCPN1-10253-2.0 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!252
This commit is contained in:
commit
e673f7c134
@ -29,7 +29,7 @@
|
|||||||
<#assign appointment = eventRP.data />
|
<#assign appointment = eventRP.data />
|
||||||
[
|
[
|
||||||
<#if eventRP.commissionsUpdated>
|
<#if eventRP.commissionsUpdated>
|
||||||
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != "">
|
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedCommissions?? && eventRP.addedCommissions != "">
|
||||||
<#if eventRP.appointmentCustomFields?has_content>
|
<#if eventRP.appointmentCustomFields?has_content>
|
||||||
{
|
{
|
||||||
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
|
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
|
||||||
@ -47,7 +47,7 @@
|
|||||||
</#if>
|
</#if>
|
||||||
<#assign AddComma = true />
|
<#assign AddComma = true />
|
||||||
</#if>
|
</#if>
|
||||||
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!="">
|
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedCommissions?? && eventRP.removedCommissions!="">
|
||||||
<#if AddComma == true>
|
<#if AddComma == true>
|
||||||
,
|
,
|
||||||
</#if>
|
</#if>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user