From fac780440b269b71f2e541a5a965d749cba5f6f8 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Thu, 19 Sep 2024 15:26:27 +0530
Subject: [PATCH 1/7] Fixed: Removed .csv from file name as this will anyways
 be added while preparing complete file path (#20).

---
 service/co/hotwax/cycleCount/InventoryCountServices.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index 5bd3f50..e262850 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -342,6 +342,7 @@
             </entity-find-one>
 
             <set field="fileName" from="uploadedFile.getName()"/>
+            <set field="fileName" from="fileName.substring(0, fileName.lastIndexOf('.csv'))"/>
             <set field="csvFilePath" from="ec.resource.expand(systemMessageType.receivePath, null,
             [contentRoot: ec.user.getPreference('mantle.content.root') ?: 'dbresource://datamanager', dateTime:ec.l10n.format(nowDate, 'yyyy-MM-dd-HH-mm-ss-SSS'), fileName: fileName], false)"/>
             <set field="fileReference" from="ec.resource.getLocationReference(csvFilePath)"/>

From 1e818141e85ed0ac101b4b317c05b4a38d9e65e0 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Thu, 19 Sep 2024 18:07:56 +0530
Subject: [PATCH 2/7] Improved: Added condition to allow adding items in any
 existing cycle count if the cycle count is in 'Draft' or 'Assigned ' status
 only (#20).

---
 service/co/hotwax/cycleCount/InventoryCountServices.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index e262850..71158f8 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -398,8 +398,11 @@
             <entity-find entity-name="co.hotwax.warehouse.InventoryCountImport" list="inventoryCountImports">
                 <econdition field-name="countImportName"/>
                 <econdition field-name="facilityId" or-null="true"/>
+                <!--Allowing addition of items in the existing cycle count in draft or assigned status only-->
+                <econdition field-name="statusId" operator="in" value="INV_COUNT_CREATED,INV_COUNT_ASSIGNED"/>
             </entity-find>
             <set field="inventoryCountImportId" from="inventoryCountImports?.first?.inventoryCountImportId"/>
+            
             <if condition="!inventoryCountImportId">
                 <service-call name="co.hotwax.cycleCount.InventoryCountServices.create#InventoryCountImport"
                         in-map="context + [statusId: 'INV_COUNT_CREATED']"

From b1fbc7a8a93564088cda032467521daa8631c90f Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Fri, 20 Sep 2024 09:41:00 +0530
Subject: [PATCH 3/7] Fixed: Correctly passed inventoryCountImportId while
 fetching InvCountImportVariance in get import item details (#20).

---
 service/co/hotwax/cycleCount/InventoryCountServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index 71158f8..687f5fe 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -95,7 +95,7 @@
                 <set field="itemDetail" from="invCountImpItem?.getMap()"/>
                 <set field="qtyOnHand" from="0.0"/>
                 <entity-find-one entity-name="co.hotwax.warehouse.InvCountImportVariance" value-field="countImportVariance">
-                    <field-map field-name="inventoryCountImportId"/>
+                    <field-map field-name="inventoryCountImportId" from="invCountImpItem.inventoryCountImportId"/>
                     <field-map field-name="invCountImportItemSeqId" from="invCountImpItem.importItemSeqId"/>
                 </entity-find-one>
                 <if condition="countImportVariance">

From a07a68023710c9fd33512cc32dff5fc6ec97a3d9 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Fri, 20 Sep 2024 13:08:06 +0530
Subject: [PATCH 4/7] Improved: Added checks to only allowed improting cycle
 count in Draft or Assigned status (#20).

---
 .../hotwax/cycleCount/InventoryCountServices.xml   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index 687f5fe..2688e3a 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -388,6 +388,13 @@
             <parameter name="idValue"/>
         </in-parameters>
         <actions>
+
+            <!--Processing cycle count items in Draft and Assigned status only-->
+            <set field="allowedStatusIds" value="['INV_COUNT_CREATED', 'INV_COUNT_ASSIGNED']"/>
+            <if condition="statusId != null &amp;&amp; !allowedStatusIds.contains(statusId)">
+                <return/>
+            </if>
+
             <if condition="!facilityId &amp;&amp; externalFacilityId">
                 <entity-find entity-name="org.apache.ofbiz.product.facility.Facility" list="facilities">
                     <econdition field-name="externalId" from="externalFacilityId"/>
@@ -395,17 +402,20 @@
                 <set field="facilityId" from="facilities?.first?.facilityId"/>
             </if>
 
+            <if condition="statusId != null">
+                <set field="allowedStatusIds" from="statusId"/>
+            </if>
             <entity-find entity-name="co.hotwax.warehouse.InventoryCountImport" list="inventoryCountImports">
                 <econdition field-name="countImportName"/>
                 <econdition field-name="facilityId" or-null="true"/>
                 <!--Allowing addition of items in the existing cycle count in draft or assigned status only-->
-                <econdition field-name="statusId" operator="in" value="INV_COUNT_CREATED,INV_COUNT_ASSIGNED"/>
+                <econdition field-name="statusId" operator="in" from="allowedStatusIds"/>
             </entity-find>
             <set field="inventoryCountImportId" from="inventoryCountImports?.first?.inventoryCountImportId"/>
             
             <if condition="!inventoryCountImportId">
                 <service-call name="co.hotwax.cycleCount.InventoryCountServices.create#InventoryCountImport"
-                        in-map="context + [statusId: 'INV_COUNT_CREATED']"
+                        in-map="context + [statusId: statusId ? statusId : 'INV_COUNT_CREATED']"
                         out-map="result"/>
                 <set field="inventoryCountImportId" from="result.inventoryCountImportId"/>
             </if>

From 03b521812ad4adc005eabd437323a36c577727ea Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Mon, 23 Sep 2024 15:57:13 +0530
Subject: [PATCH 5/7] Improved: Set createDate while adding cycle count items
 (#20).

---
 service/co/hotwax/cycleCount/InventoryCountServices.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index 2688e3a..a9c089b 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -170,6 +170,7 @@
                     <set field="item.productId" from="item.idValue"/>
                     <set field="item.inventoryCountImportId" from="context.inventoryCountImportId"/>
                     <!-- Not checking if idValue is already added. One can just reject duplicate records if added multiple times. -->
+                    <set field="item.createdDate" from="ec.user.nowTimestamp"/>
                     <service-call name="create#co.hotwax.warehouse.InventoryCountImportItem" in-map="item"/>
                 </if>
             </iterate>

From f0f5785c088b9fedfc006914cbeba21697c9c32d Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Mon, 23 Sep 2024 16:33:43 +0530
Subject: [PATCH 6/7] Improved: Set createByUserLoginId while creating cycyle
 count items (#20).

---
 service/co/hotwax/cycleCount/InventoryCountServices.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index a9c089b..f91c151 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -30,7 +30,7 @@
             <auto-parameters entity-name="co.hotwax.warehouse.InventoryCountImportView" include="all"/>
         </out-parameters>
         <actions>
-            <set field="context.uploadedByUserLogin" from="ec.user.getUsername()"/>
+            <set field="context.uploadedByUserLogin" from="ec.user.getUsername()" default-value="${System.getProperty('default.oms.user')}"/>
             <service-call name="create#co.hotwax.warehouse.InventoryCountImport" in-map="context + [createdDate: ec.user.nowTimestamp]" out-map="context"/>
 
             <if condition="context.statusId"><service-call name="create#co.hotwax.warehouse.InvCountImportStatus" in-map="[statusId:context.statusId, inventoryCountImportId:context.inventoryCountImportId, statusDate:ec.user.nowTimestamp, changeByUserLoginId:context.uploadedByUserLogin]"/></if>
@@ -171,6 +171,7 @@
                     <set field="item.inventoryCountImportId" from="context.inventoryCountImportId"/>
                     <!-- Not checking if idValue is already added. One can just reject duplicate records if added multiple times. -->
                     <set field="item.createdDate" from="ec.user.nowTimestamp"/>
+                    <set field="item.createdByUserLoginId" from="ec.user.getUsername()" default-value="${System.getProperty('default.oms.user')}"/>
                     <service-call name="create#co.hotwax.warehouse.InventoryCountImportItem" in-map="item"/>
                 </if>
             </iterate>

From 8c0b6d5e84f05dd68946c45aa9e21eebfe6b7bd5 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Mon, 23 Sep 2024 19:00:17 +0530
Subject: [PATCH 7/7] Improved: Removed setting default user while creating
 cycle count and adding items (#20).

---
 service/co/hotwax/cycleCount/InventoryCountServices.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/co/hotwax/cycleCount/InventoryCountServices.xml b/service/co/hotwax/cycleCount/InventoryCountServices.xml
index f91c151..563295d 100644
--- a/service/co/hotwax/cycleCount/InventoryCountServices.xml
+++ b/service/co/hotwax/cycleCount/InventoryCountServices.xml
@@ -30,7 +30,7 @@
             <auto-parameters entity-name="co.hotwax.warehouse.InventoryCountImportView" include="all"/>
         </out-parameters>
         <actions>
-            <set field="context.uploadedByUserLogin" from="ec.user.getUsername()" default-value="${System.getProperty('default.oms.user')}"/>
+            <set field="context.uploadedByUserLogin" from="ec.user.getUsername()"/>
             <service-call name="create#co.hotwax.warehouse.InventoryCountImport" in-map="context + [createdDate: ec.user.nowTimestamp]" out-map="context"/>
 
             <if condition="context.statusId"><service-call name="create#co.hotwax.warehouse.InvCountImportStatus" in-map="[statusId:context.statusId, inventoryCountImportId:context.inventoryCountImportId, statusDate:ec.user.nowTimestamp, changeByUserLoginId:context.uploadedByUserLogin]"/></if>
@@ -171,7 +171,7 @@
                     <set field="item.inventoryCountImportId" from="context.inventoryCountImportId"/>
                     <!-- Not checking if idValue is already added. One can just reject duplicate records if added multiple times. -->
                     <set field="item.createdDate" from="ec.user.nowTimestamp"/>
-                    <set field="item.createdByUserLoginId" from="ec.user.getUsername()" default-value="${System.getProperty('default.oms.user')}"/>
+                    <set field="item.createdByUserLoginId" from="ec.user.getUsername()"/>
                     <service-call name="create#co.hotwax.warehouse.InventoryCountImportItem" in-map="item"/>
                 </if>
             </iterate>