Merge branch 'develop-rdz' into 'develop'

modif sur les rdz

See merge request r-d-technique/tiers/reflex-wms-connector!199
This commit is contained in:
Francis REAT 2025-12-17 16:45:44 +00:00
commit eea8276d78

View File

@ -2,7 +2,6 @@
<#-- How to use MD Header map <#-- How to use MD Header map
Example : Example :
<<<<<<< HEAD
<#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/> <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
If your MD is : If your MD is :
@ -17,14 +16,6 @@
<#assign activity_code = "ALI"/> <#assign activity_code = "ALI"/>
<#assign originator_code = "001"/> <#assign originator_code = "001"/>
=======
<#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/>
-->
<#assign activity_code = "ALI"/>
<#assign originator_code = "DEPT ALIM"/>
>>>>>>> main
<#assign preparation_type_code = "010"/> <#assign preparation_type_code = "010"/>
<#assign requested_delivery_date_type = "010"/> <#assign requested_delivery_date_type = "010"/>
<#assign consolidated_delivery_flag ="false"/> <#assign consolidated_delivery_flag ="false"/>
@ -32,7 +23,6 @@
<#assign protected_flag ="false"/> <#assign protected_flag ="false"/>
<#assign automatic_generation_flag ="false"/> <#assign automatic_generation_flag ="false"/>
<#assign apt_with_end_consignee_flag="false"/> <#assign apt_with_end_consignee_flag="false"/>
<<<<<<< HEAD
<#-- A supprimer si utilisation de la table de correspondance--> <#-- A supprimer si utilisation de la table de correspondance-->
<#--To be deleted if using the correspondence table--> <#--To be deleted if using the correspondence table-->
@ -55,6 +45,3 @@ Assigning to a load if you set up Load Grouping+Distribution Master Plan-->
=======
<#assign load_grouping = "STD"/>
>>>>>>> main