Merge branch 'release/1.2' into 'main'

MR->main

See merge request r-d-technique/tiers/reflex-wms-connector!70
This commit is contained in:
Cedric RODIER 2024-10-29 14:35:45 +00:00
commit 7b22eea31d
2 changed files with 7 additions and 4 deletions

View File

@ -33,8 +33,11 @@
<#noparse><#assign text_language_rfx = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse> <#noparse><#assign text_language_rfx = </#noparse>"${reflex_platform_project.text_language!"en"}<#noparse>"></#noparse>
</#list> </#list>
<#if file.reflex_platform_project_list[0].site_code_unicity??> <#list file.reflex_platform_project_list?filter(j -> j.name == projectRP) as reflex_platform_project_uniqueness>
<#noparse><#assign uniqueness = </#noparse>${file.reflex_platform_project_list[0].site_code_unicity?c}<#noparse>></#noparse> <#if reflex_platform_project_uniqueness.site_code_unicity??>
<#noparse><#assign uniqueness = </#noparse>${reflex_platform_project_uniqueness.site_code_unicity?c}<#noparse>></#noparse>
<#else> <#else>
<#noparse><#assign uniqueness = </#noparse>false<#noparse>></#noparse> <#noparse><#assign uniqueness = </#noparse>false<#noparse>></#noparse>
</#if> </#if>
</#list>

View File

@ -1 +1 @@
1.2.28+3 1.2.28+4