Merge pull request #262 from odisha-muktasoft/PFM-5585-FIX-1

PFM-5585 : updated the logic of deduction calculation and fixes
odisha-muktasoft · Feb 29, 2024 · f9473d1 · f9473d1
2 parents 1455c6a + 0316809
commit f9473d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -20,7 +20,7 @@
     "@egovernments/digit-ui-module-estimate": "0.3.28",
     "@egovernments/digit-ui-module-masters": "0.3.3",
     "@egovernments/digit-ui-module-project": "0.3.8",
-    "@egovernments/digit-ui-module-expenditure": "0.3.11",
+    "@egovernments/digit-ui-module-expenditure": "0.3.12",
     "@egovernments/digit-ui-customisation-mukta": "0.2.1",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egovernments/digit-ui-module-expenditure",
-    "version": "0.3.11",
+    "version": "0.3.12",
     "description": "Expenditure Management Module UI",
     "main": "dist/index.js",
     "module": "dist/index.modern.js",

diff --git a/...als/packages/modules/Expenditure/src/pages/employee/CreateBills/CreatePurchaseBillForm.js b/...als/packages/modules/Expenditure/src/pages/employee/CreateBills/CreatePurchaseBillForm.js
@@ -91,7 +91,7 @@ const CreatePurchaseBillForm = ({
             }
 
             if(difference?.billDetails_billAmt){
-                let billAmount = parseFloat(Digit.Utils.dss.convertFormatterToNumber(formData?.billDetails_billAmt));
+                let billAmount = parseFloat(Digit.Utils.dss.convertFormatterToNumber(formData.invoiceDetails_materialCost));
                 formData?.deductionDetails && formData?.deductionDetails?.forEach((data, index)=>{
                   if(data?.name?.calculationType === "percentage") {
                     const amount = billAmount ? (billAmount * (parseFloat(data?.name?.value)/100)).toFixed(1) : 0

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/Expenditure/src/utils/index.js
@@ -49,7 +49,7 @@ const setDeductionTableData = (bill,charges,t) => {
       "comments": row?.additionalDetails?.comments,
       "name":{
         "name": `COMMON_MASTERS_DEDUCTIONS_${row.headCode}`,
-        ...chargesObject?.[0]
+        ...chargesObject
       }
   }
   })

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -28,7 +28,7 @@
     "@egovernments/digit-ui-module-estimate": "0.3.28",
     "@egovernments/digit-ui-module-masters": "0.3.3",
     "@egovernments/digit-ui-module-project": "0.3.8",
-    "@egovernments/digit-ui-module-expenditure": "0.3.11",
+    "@egovernments/digit-ui-module-expenditure": "0.3.12",
     "@egovernments/digit-ui-customisation-mukta": "0.2.1",
     "babel-loader": "8.1.0",
     "clean-webpack-plugin": "4.0.0",