Release 1.2.15+7

Merge branch 'versio-1.2.15' into 'release/1.2'
Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31
2024-04-11 11:22:18 +02:00 · 2024-04-11 09:21:32 +00:00 · 2024-04-11 11:12:11 +02:00
2 changed files with 17 additions and 18 deletions
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -14,7 +14,6 @@
      <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->

      <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>
-
         <#-- IPG moves translated into Stock moves -->
         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
            reflexMvtStockInterface.ipg_move_type == "200" ||
@@ -41,7 +40,8 @@
            <#-- IPG moves translated into goods received (all type of  receipt)  -->
               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                     reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+                     reflexMvtStockInterface.ipg_move_type == "120") >
+                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                        [
                        {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@@ -51,14 +51,13 @@
                        }
                        ]
                      <#else>
-                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                        <#-- Case of IPG move type volontarilly ignored-->
                        <#stop " Reference receipt is empty">
+                     </#if>
               <#else>
                  <#stop>
               </#if>
         </#if>
-         </#if>
      <#else>
         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
         <#stop>
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.15+6
+1.2.15+7
Author	SHA1	Message	Date
freat	37a5e64e83	Release 1.2.15+7	2024-04-11 11:22:18 +02:00
Francis Reat	2f31833bc3	Merge branch 'versio-1.2.15' into 'release/1.2' Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31	2024-04-11 09:21:32 +00:00
Laurie Montant	cff0f18d8a	modifs ipgmove (cherry picked from commit `6b6cef5332`)	2024-04-11 11:12:11 +02:00
@@ -1 +1 @@
 .2.15+6
 .2.15+7