From cff0f18d8a6e5843fe0ba5f6b8c1d1336060f6a1 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 11 Apr 2024 11:01:05 +0200
Subject: [PATCH 1/2] modifs ipgmove

(cherry picked from commit 6b6cef5332f47dbe93445eacce63d7fa70b723aa)
---
 RFXtoRP_HsaIpgMove.ftl | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl
index c1a22d7..4a98824 100644
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -14,8 +14,7 @@
       <#-- 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 -->
+         <#-- IPG moves translated into Stock moves -->
          <#if reflexMvtStockInterface.ipg_move_type == "130" ||
             reflexMvtStockInterface.ipg_move_type == "200" ||
             reflexMvtStockInterface.ipg_move_type == "210" ||
@@ -41,22 +40,22 @@
             <#-- 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!="">
-                  [
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-                  }
-                  ]
+                     reflexMvtStockInterface.ipg_move_type == "120") >
+                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+                        [
+                        {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+                        }
+                        ]
+                      <#else>
+                        <#-- Case of IPG move type volontarilly ignored-->
+                        <#stop " Reference receipt is empty">
+                     </#if>
                <#else>
-                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                     <#-- Case of IPG move type volontarilly ignored-->
-                     <#stop " Reference receipt is empty">
-                  <#else>
-                     <#stop>
-                  </#if>
+                  <#stop>
                </#if>
          </#if>
       <#else>

From 37a5e64e83d1d6af52d5b6021ab3b698587810c7 Mon Sep 17 00:00:00 2001
From: freat <francis.reat@hardis-group.com>
Date: Thu, 11 Apr 2024 11:22:18 +0200
Subject: [PATCH 2/2] Release 1.2.15+7

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 851b5bb..2a4c332 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.15+6
+1.2.15+7