shareneus 1.5.1 → 1.5.3

package/dist/sales/sales/sales-print.service.js

@@ -5,9 +5,9 @@ const tr_utils_1 = require("../../utils/tr-utils");
 const code_enums_1 = require("../../enums/code-enums");
 const my_date_1 = require("../../utils/my-date");
 const enums_1 = require("../../enums/enums");
-const aggregation_1 = require("../../aggregation/aggregation");
 const shared_print_service_1 = require("../../shared/shared-print.service");
 const sales_totals_service_1 = require("./sales-totals.service");
+const math_operations_1 = require("../../shared/math-operations");
 class SalesPrintService {
     static GetSalesPrintInfo(OriginalInvoiceData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, isOtherIndustry) {
         var _a, _b;
@@ -108,16 +108,16 @@ class SalesPrintService {
                 DiscAmt = DiscAmt + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.Disc) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.RecDisc);
                 TaxAmt = TaxAmt + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST)
                     + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
-                let NetAmt = (0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc, Item.RecDisc);
+                let NetAmt = (0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc, Item.RecDisc);
                 TotalAmt = TotalAmt + tr_utils_1.TrUtils.SetValueToZeroIfNull(NetAmt) +
                     tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST)
                     + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
                 if (Consolidate) {
-                    let AfterDiscForEach = (0, aggregation_1.division)(Item.AfterItemDisc, Item.Qty);
-                    let CTaxAmtPerItem = (0, aggregation_1.division)(Item.CGST, Item.Qty);
-                    let STaxAmtPerItem = (0, aggregation_1.division)(Item.SGST, Item.Qty);
-                    let ITaxAmtPerItem = (0, aggregation_1.division)(Item.IGST, Item.Qty);
-                    Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
+                    let AfterDiscForEach = (0, math_operations_1.Divide)(Item.AfterItemDisc, Item.Qty);
+                    let CTaxAmtPerItem = (0, math_operations_1.Divide)(Item.CGST, Item.Qty);
+                    let STaxAmtPerItem = (0, math_operations_1.Divide)(Item.SGST, Item.Qty);
+                    let ITaxAmtPerItem = (0, math_operations_1.Divide)(Item.IGST, Item.Qty);
+                    Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
                 }
                 else {
                     Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
@@ -135,7 +135,7 @@ class SalesPrintService {
                     Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterItemTax, DecimalsNumber);
                 }
                 else {
-                    Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc), DecimalsNumber);
+                    Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc), DecimalsNumber);
                 }
                 if (!tr_utils_1.TrUtils.IsZero(Item.Qty) && !tr_utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
                     Item.QtyAndUoM = Item.Qty + ' ' + Item.UoM;
@@ -293,7 +293,7 @@ class SalesPrintService {
             Data.Due = 0;
         }
         else {
-            Data.Due = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Total, PaidTotal), DecimalsNumber);
+            Data.Due = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Subtract)(Total, PaidTotal), DecimalsNumber);
         }
         if (Data.Due < 0) {
             Data.Due = 0;

package/dist/sales/sales/sales-totals.service.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesTotalsService = void 0;
-const aggregation_1 = require("../../aggregation/aggregation");
+const math_operations_1 = require("../../shared/math-operations");
 const tr_utils_1 = require("../../utils/tr-utils");
 class SalesTotalsService {
     static GetTotalsValue(ItemsList, IsIndependentTax, DetailedInfo, PDisc, PPerc, Disc, Perc, TaxCodes, WithItems, Settings, isRoundable, EntitySettings) {
@@ -32,11 +32,11 @@ class SalesTotalsService {
     static ResetLaborItemValues(ItemsList, IsIndependentTax) {
         ItemsList.forEach((Item) => {
             Item = this.ResetLaborItemValueIfInvalid(Item);
-            Item.DiscountedPrice = (0, aggregation_1.addition)(Item.Disc, Item.RecDisc);
-            let NetAmt = (0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc, Item.RecDisc);
+            Item.DiscountedPrice = (0, math_operations_1.Add)(Item.Disc, Item.RecDisc);
+            let NetAmt = (0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc, Item.RecDisc);
             Item.AfterItemDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(NetAmt);
             if (IsIndependentTax) {
-                Item.AfterItemTax = (0, aggregation_1.addition)(Item.AfterItemDisc, Item.CGST, Item.SGST, Item.IGST);
+                Item.AfterItemTax = (0, math_operations_1.Add)(Item.AfterItemDisc, Item.CGST, Item.SGST, Item.IGST);
             }
             else {
                 Item.AfterItemTax = Item.AfterItemDisc;
@@ -76,10 +76,10 @@ class SalesTotalsService {
         // let CustLaborTaxTotal = this.GetLaborTaxTotalFor(IsIndependentTax);
         let CustItemTaxTotal = this.GetItemsTaxTotalFor(ItemsList, IsIndependentTax);
         let CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList);
-        finalTotalsData.SubTotal = (0, aggregation_1.addition)(CustomerAfterDiscTotals, CustItemsDiscTotal);
+        finalTotalsData.SubTotal = (0, math_operations_1.Add)(CustomerAfterDiscTotals, CustItemsDiscTotal);
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(CustItemTaxTotal, ItemsList, IsIndependentTax);
         if (isRoundable) {
-            finalTotalsData.Round = (0, aggregation_1.subtraction)(Math.round(CustTotal), CustTotal);
+            finalTotalsData.Round = (0, math_operations_1.Subtract)(Math.round(CustTotal), CustTotal);
             finalTotalsData.Total = Math.round(CustTotal);
         }
         else {
@@ -99,7 +99,7 @@ class SalesTotalsService {
     static GetItemsTotalAfterDiscount(ItemsList) {
         let ItemsTotalAfterDisc = 0;
         ItemsList.forEach((Item) => {
-            ItemsTotalAfterDisc = (0, aggregation_1.addition)(ItemsTotalAfterDisc, Item.AfterItemDisc);
+            ItemsTotalAfterDisc = (0, math_operations_1.Add)(ItemsTotalAfterDisc, Item.AfterItemDisc);
         });
         return ItemsTotalAfterDisc;
     }
@@ -108,8 +108,8 @@ class SalesTotalsService {
         finalTotalsData.CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList);
         // finalTotalsData.CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(opCodesList);
         finalTotalsData.CustItemsTotalAfterDisc = this.GetItemsTotalAfterDiscount(ItemsList);
-        finalTotalsData.CustLaborTotalBeforeDisc = (0, aggregation_1.addition)(finalTotalsData.CustLaborTotalAfterDisc, finalTotalsData.CustLaborDiscTotal);
-        finalTotalsData.CustItemsTotalBeforeDisc = (0, aggregation_1.addition)(finalTotalsData.CustItemsTotalAfterDisc, finalTotalsData.CustItemsDiscTotal);
+        finalTotalsData.CustLaborTotalBeforeDisc = (0, math_operations_1.Add)(finalTotalsData.CustLaborTotalAfterDisc, finalTotalsData.CustLaborDiscTotal);
+        finalTotalsData.CustItemsTotalBeforeDisc = (0, math_operations_1.Add)(finalTotalsData.CustItemsTotalAfterDisc, finalTotalsData.CustItemsDiscTotal);
         // finalTotalsData.CustLaborITax = this.GetLaborTaxTotalFor(opCodesList, IsIndependentTax);
         // finalTotalsData.CustLaborSGST = this.GetLaborSGSTTaxTotal(opCodesList, IsIndependentTax);
         // finalTotalsData.CustLaborCGST = this.GetLaborCGSTTaxTotal(opCodesList, IsIndependentTax);
@@ -120,7 +120,7 @@ class SalesTotalsService {
         finalTotalsData.CustItemIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[2]);
         finalTotalsData.CustItemSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[1]);
         // finalTotalsData.CustLaborAfterTax = TrUtils.FixedTo(finalTotalsData.CustLaborITax + finalTotalsData.CustLaborTotalAfterDisc);
-        finalTotalsData.CustItemAfterTax = (0, aggregation_1.addition)(finalTotalsData.CustItemITax, finalTotalsData.CustItemsTotalAfterDisc);
+        finalTotalsData.CustItemAfterTax = (0, math_operations_1.Add)(finalTotalsData.CustItemITax, finalTotalsData.CustItemsTotalAfterDisc);
         finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForItemsByHSN(ItemsList, TaxCodes, DecimalsNumber);
         finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round, DecimalsNumber);
         finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total, DecimalsNumber);
@@ -137,14 +137,14 @@ class SalesTotalsService {
     static GetLaborDiscountedTotal(LaborList) {
         let LaborDiscountedTotal = 0;
         LaborList.forEach((Labor) => {
-            LaborDiscountedTotal = (0, aggregation_1.addition)(LaborDiscountedTotal, Labor.DiscountedPrice);
+            LaborDiscountedTotal = (0, math_operations_1.Add)(LaborDiscountedTotal, Labor.DiscountedPrice);
         });
         return LaborDiscountedTotal;
     }
     static GetItemDiscountedTotal(ItemsList) {
         let ItemsDiscountedTotal = 0;
         ItemsList.forEach((Item) => {
-            ItemsDiscountedTotal = (0, aggregation_1.addition)(ItemsDiscountedTotal, Item.DiscountedPrice);
+            ItemsDiscountedTotal = (0, math_operations_1.Add)(ItemsDiscountedTotal, Item.DiscountedPrice);
         });
         return ItemsDiscountedTotal;
     }
@@ -152,7 +152,7 @@ class SalesTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             ItemsList.forEach((Item) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Item.CGST, Item.SGST, Item.IGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Item.CGST, Item.SGST, Item.IGST);
             });
         }
         return TotalTaxAmt;
@@ -161,32 +161,32 @@ class SalesTotalsService {
         // let LaborTotalAfterDisc: any = this.GetLaborTotalAfterDiscount(LaborList);
         let ItemsTotalAfterDisc = this.GetItemsTotalAfterDiscount(ItemsList);
         if (IsIndependentTax) {
-            return (0, aggregation_1.addition)(ItemsTotalAfterDisc, ItemsTaxAmount);
+            return (0, math_operations_1.Add)(ItemsTotalAfterDisc, ItemsTaxAmount);
         }
         else {
             return ItemsTotalAfterDisc;
         }
     }
     static LaborTotalAfterDiscount(LaborTotalAfterDisc, LaborTaxAmount, MainLDisc, LDiscInPerc) {
-        let LaborTotal = (0, aggregation_1.addition)(LaborTotalAfterDisc, LaborTaxAmount);
+        let LaborTotal = (0, math_operations_1.Add)(LaborTotalAfterDisc, LaborTaxAmount);
         if (!tr_utils_1.TrUtils.IsZero(MainLDisc)) {
             if (!tr_utils_1.TrUtils.IsEmpty(LDiscInPerc)) {
-                LaborTotal = (0, aggregation_1.subtraction)(LaborTotal, (0, aggregation_1.division)((0, aggregation_1.multiply)(LaborTotal, Number(LDiscInPerc)), 100));
+                LaborTotal = (0, math_operations_1.Subtract)(LaborTotal, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(LaborTotal, Number(LDiscInPerc)), 100));
             }
             else {
-                LaborTotal = (0, aggregation_1.subtraction)(LaborTotal, MainLDisc);
+                LaborTotal = (0, math_operations_1.Subtract)(LaborTotal, MainLDisc);
             }
         }
         return LaborTotal;
     }
     static ItemsTotalAfterDiscount(ItemsTotalAfterDisc, ItemsTaxAmount, MainPDisc, PDiscInPerc) {
-        let ItemsTotal = (0, aggregation_1.addition)(ItemsTotalAfterDisc, ItemsTaxAmount);
+        let ItemsTotal = (0, math_operations_1.Add)(ItemsTotalAfterDisc, ItemsTaxAmount);
         if (!tr_utils_1.TrUtils.IsZero(MainPDisc)) {
             if (!tr_utils_1.TrUtils.IsEmpty(PDiscInPerc)) {
-                ItemsTotal = (0, aggregation_1.subtraction)(ItemsTotal, (0, aggregation_1.division)((0, aggregation_1.multiply)(ItemsTotal, Number(PDiscInPerc)), 100));
+                ItemsTotal = (0, math_operations_1.Subtract)(ItemsTotal, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(ItemsTotal, Number(PDiscInPerc)), 100));
             }
             else {
-                ItemsTotal = (0, aggregation_1.subtraction)(ItemsTotal, MainPDisc);
+                ItemsTotal = (0, math_operations_1.Subtract)(ItemsTotal, MainPDisc);
             }
         }
         return ItemsTotal;
@@ -195,7 +195,7 @@ class SalesTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             opCodesList.forEach((Labor) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Labor.CGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Labor.CGST);
             });
         }
         return TotalTaxAmt;
@@ -204,7 +204,7 @@ class SalesTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             opCodesList.forEach((Labor) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Labor.IGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Labor.IGST);
             });
         }
         return TotalTaxAmt;
@@ -213,7 +213,7 @@ class SalesTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             opCodesList.forEach((Labor) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Labor.SGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Labor.SGST);
             });
         }
         return TotalTaxAmt;
@@ -225,10 +225,10 @@ class SalesTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             ItemsList.forEach((Item) => {
-                TotalCGSTAmt = (0, aggregation_1.addition)(TotalCGSTAmt, Item.CGST);
-                TotalSGSTAmt = (0, aggregation_1.addition)(TotalSGSTAmt, Item.SGST);
-                TotalIGSTAmt = (0, aggregation_1.addition)(TotalIGSTAmt, Item.IGST);
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Item.CGST, Item.SGST, Item.IGST);
+                TotalCGSTAmt = (0, math_operations_1.Add)(TotalCGSTAmt, Item.CGST);
+                TotalSGSTAmt = (0, math_operations_1.Add)(TotalSGSTAmt, Item.SGST);
+                TotalIGSTAmt = (0, math_operations_1.Add)(TotalIGSTAmt, Item.IGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Item.CGST, Item.SGST, Item.IGST);
             });
         }
         return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalTaxAmt];
@@ -248,7 +248,7 @@ class SalesTotalsService {
             Item.CGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[0]);
             Item.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[1]);
             Item.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[2]);
-            Item.CombinedTaxPercentage = (0, aggregation_1.addition)(Item.CGSTAmt, Item.SGSTAmt, Item.IGSTAmt);
+            Item.CombinedTaxPercentage = (0, math_operations_1.Add)(Item.CGSTAmt, Item.SGSTAmt, Item.IGSTAmt);
         });
         return Items;
     }
@@ -292,10 +292,10 @@ class SalesTotalsService {
             let HSN = MatchedItem[0].HSN;
             TaxInfo.CombinedTaxPercentage = MatchedItem[0].CombinedTaxPercentage;
             MatchedItem.forEach((argMatchedGSTItem) => {
-                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, argMatchedGSTItem.AfterItemDisc);
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, argMatchedGSTItem.CGST);
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, argMatchedGSTItem.IGST);
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, argMatchedGSTItem.SGST);
+                TaxOnAmount = (0, math_operations_1.Add)(TaxOnAmount, argMatchedGSTItem.AfterItemDisc);
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, argMatchedGSTItem.CGST);
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, argMatchedGSTItem.IGST);
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, argMatchedGSTItem.SGST);
             });
             TaxInfo.HSN = HSN;
             TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);

package/dist/sales-receive/sales-receive-print.service.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesReceivePrintService = void 0;
-const aggregation_1 = require("../aggregation/aggregation");
 const code_enums_1 = require("../enums/code-enums");
 const enums_1 = require("../enums/enums");
+const math_operations_1 = require("../shared/math-operations");
 const shared_print_service_1 = require("../shared/shared-print.service");
 const my_date_1 = require("../utils/my-date");
 const tr_utils_1 = require("../utils/tr-utils");
@@ -34,7 +34,7 @@ class SalesReceivePrintService {
         if (ConsolidateGST) {
             // finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             // finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
-            finalTotalsData.CustPartsTotalBeforeDisc = (0, aggregation_1.addition)(finalTotalsData.totalTaxOnItems, (0, aggregation_1.subtraction)(finalTotalsData.subtotalOnItems, finalTotalsData.totalDiscountOnItems));
+            finalTotalsData.CustPartsTotalBeforeDisc = (0, math_operations_1.Add)(finalTotalsData.totalTaxOnItems, (0, math_operations_1.Subtract)(finalTotalsData.subtotalOnItems, finalTotalsData.totalDiscountOnItems));
         }
         SalesReceivePrintData = tr_utils_1.TrUtils.ConcatObjects(SalesReceivePrintData, finalTotalsData);
         SalesReceivePrintData.Items = this.GetItemsPrintInfo(SalesReceivePrintData.Items, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot, IsTaxable, SalesReceivePrintData.Entity.DecimalsNumber);
@@ -72,12 +72,12 @@ class SalesReceivePrintService {
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, IsTaxable, DecimalsNumber) {
         Items.forEach((Item) => {
             if (Consolidate) {
-                let AfterPartDisc = (0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc, Item.RecDisc);
-                let AfterDiscForEach = (0, aggregation_1.division)(AfterPartDisc, Item.Qty);
-                let CTaxAmtPerItem = (0, aggregation_1.division)(Item.CGST, Item.Qty);
-                let STaxAmtPerItem = (0, aggregation_1.division)(Item.SGST, Item.Qty);
-                let ITaxAmtPerItem = (0, aggregation_1.division)(Item.IGST, Item.Qty);
-                Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
+                let AfterPartDisc = (0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc, Item.RecDisc);
+                let AfterDiscForEach = (0, math_operations_1.Divide)(AfterPartDisc, Item.Qty);
+                let CTaxAmtPerItem = (0, math_operations_1.Divide)(Item.CGST, Item.Qty);
+                let STaxAmtPerItem = (0, math_operations_1.Divide)(Item.SGST, Item.Qty);
+                let ITaxAmtPerItem = (0, math_operations_1.Divide)(Item.IGST, Item.Qty);
+                Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
             }
             else {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
@@ -90,7 +90,7 @@ class SalesReceivePrintService {
             Item.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             // Calculate amount after tax based on tax type
             if (IsTaxable) {
-                Item.AfterPartTax = (0, aggregation_1.addition)(Item.AfterPartDisc, Item.CGST, Item.SGST, Item.IGST);
+                Item.AfterPartTax = (0, math_operations_1.Add)(Item.AfterPartDisc, Item.CGST, Item.SGST, Item.IGST);
             }
             else {
                 Item.AfterPartTax = Item.AfterPartDisc;
@@ -99,7 +99,7 @@ class SalesReceivePrintService {
                 Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
             }
             else {
-                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc), DecimalsNumber);
+                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Subtract)(Item.UnAmt, Item.Disc), DecimalsNumber);
             }
             if (!tr_utils_1.TrUtils.IsZero(Item.Qty) && !tr_utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
                 Item.QtyAndUoM = Item.Qty + ' ' + Item.UoM;

package/dist/sales-receive/sales-receive-totals.service.d.ts

@@ -116,7 +116,7 @@ export declare class SalesReceiveTotalsService {
      * @param finalTotalsData - Existing totals data
      * @returns Total discounted amount including overall part discount
      */
-    static GetPartDiscountedTotal(PartsList: any, isTaxable: boolean, finalTotalsData: any): any;
+    static GetPartDiscountedTotal(PartsList: any, isTaxable: boolean, finalTotalsData: any): number;
     /**
      * Calculates total tax amount for all parts
      * @param PartsList - Array of parts
@@ -134,7 +134,7 @@ export declare class SalesReceiveTotalsService {
      * @param IsIndependentTax - Whether tax is calculated independently
      * @returns Final customer total based on tax type
      */
-    static GetCustomerTotalBasedOnTaxType(finalTotalsData: any, LaborTaxAmount: number, PartsTaxAmount: number, LaborList: any, PartsList: any, IsIndependentTax: boolean): any;
+    static GetCustomerTotalBasedOnTaxType(finalTotalsData: any, LaborTaxAmount: number, PartsTaxAmount: number, LaborList: any, PartsList: any, IsIndependentTax: boolean): number;
     /**
      * Calculates items total after applying discounts (percentage or fixed)
      * @param PartsTotalAfterDisc - Parts total after discount

package/dist/sales-receive/sales-receive-totals.service.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesReceiveTotalsService = void 0;
+const math_operations_1 = require("../shared/math-operations");
 const tr_utils_1 = require("../utils/tr-utils");
-const aggregation_1 = require("../aggregation/aggregation");
 /**
  * Service class for calculating sales receive totals including taxes, discounts and final amounts
  */
@@ -64,12 +64,12 @@ class SalesReceiveTotalsService {
                 Part.Qty = 1;
             }
             // Calculate total discounted price
-            Part.DiscountedPrice = (0, aggregation_1.addition)(Part.Disc, Part.RecDisc);
+            Part.DiscountedPrice = (0, math_operations_1.Add)(Part.Disc, Part.RecDisc);
             // Calculate amount after discount
-            Part.AfterPartDisc = (0, aggregation_1.subtraction)(Part.UnAmt, Part.Disc, Part.RecDisc);
+            Part.AfterPartDisc = (0, math_operations_1.Subtract)(Part.UnAmt, Part.Disc, Part.RecDisc);
             // Calculate amount after tax based on tax type
             if (IsIndependentTax) {
-                Part.AfterPartTax = (0, aggregation_1.addition)(Part.AfterPartDisc, Part.CGST, Part.SGST, Part.IGST);
+                Part.AfterPartTax = (0, math_operations_1.Add)(Part.AfterPartDisc, Part.CGST, Part.SGST, Part.IGST);
             }
             else {
                 Part.AfterPartTax = Part.AfterPartDisc;
@@ -150,11 +150,11 @@ class SalesReceiveTotalsService {
         let CustPartsDiscTotal = this.GetPartDiscountedTotal(PartsList, IsIndependentTax, finalTotalsData);
         let CustPartsTotalAfterDisc = this.GetPartsTotalAfterDiscount(PartsList);
         // Calculate sum total
-        finalTotalsData.STotal = (0, aggregation_1.addition)(CustPartsDiscTotal, CustPartsTotalAfterDisc);
+        finalTotalsData.STotal = (0, math_operations_1.Add)(CustPartsDiscTotal, CustPartsTotalAfterDisc);
         // Calculate final customer total
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, 0, CustPartTaxTotal, [], PartsList, IsIndependentTax);
         // Calculate rounding difference and final total
-        finalTotalsData.Round = (0, aggregation_1.subtraction)(Math.round(CustTotal), CustTotal);
+        finalTotalsData.Round = (0, math_operations_1.Subtract)(Math.round(CustTotal), CustTotal);
         finalTotalsData.Total = Math.round(CustTotal);
         // Add detailed information if requested
         if (DetailedInfo) {
@@ -181,7 +181,7 @@ class SalesReceiveTotalsService {
     static GetPartsTotalAfterDiscount(PartsList) {
         let PartsTotalAfterDisc = 0;
         PartsList.forEach((Part) => {
-            PartsTotalAfterDisc = (0, aggregation_1.addition)(PartsTotalAfterDisc, Part.AfterPartDisc);
+            PartsTotalAfterDisc = (0, math_operations_1.Add)(PartsTotalAfterDisc, Part.AfterPartDisc);
         });
         return PartsTotalAfterDisc;
     }
@@ -199,7 +199,7 @@ class SalesReceiveTotalsService {
         // Add parts discount and total information
         finalTotalsData.CustPartsDiscTotal = this.GetPartDiscountedTotal(PartsList, IsIndependentTax, finalTotalsData);
         finalTotalsData.CustPartsTotalAfterDisc = this.GetPartsTotalAfterDiscount(PartsList);
-        finalTotalsData.CustPartsTotalBeforeDisc = (0, aggregation_1.addition)(finalTotalsData.CustPartsTotalAfterDisc, finalTotalsData.CustPartsDiscTotal);
+        finalTotalsData.CustPartsTotalBeforeDisc = (0, math_operations_1.Add)(finalTotalsData.CustPartsTotalAfterDisc, finalTotalsData.CustPartsDiscTotal);
         // Get GST tax breakdown
         let TaxInfo = this.GetPartGSTTaxTotal(PartsList, IsIndependentTax);
         finalTotalsData.CustPartITax = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[3]);
@@ -207,7 +207,7 @@ class SalesReceiveTotalsService {
         finalTotalsData.CustPartIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[2]);
         finalTotalsData.CustPartSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[1]);
         // Calculate after tax amount
-        finalTotalsData.CustPartAfterTax = (0, aggregation_1.addition)(finalTotalsData.CustPartITax, finalTotalsData.CustPartsTotalAfterDisc);
+        finalTotalsData.CustPartAfterTax = (0, math_operations_1.Add)(finalTotalsData.CustPartITax, finalTotalsData.CustPartsTotalAfterDisc);
         // Add tax grouping information
         finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForPartsByHSN(tr_utils_1.TrUtils.Stringify(PartsList), TaxCodes, DecimalsNumber);
         finalTotalsData.CustTaxGroupDataByPerc = this.GetTaxGroupingForPartsByPerc(PartsList, TaxCodes, DecimalsNumber);
@@ -289,9 +289,9 @@ class SalesReceiveTotalsService {
         }
         // Sum up individual part discounts
         PartsList.forEach((Part) => {
-            PartsDiscountedTotal = (0, aggregation_1.addition)(PartsDiscountedTotal, Part.DiscountedPrice);
+            PartsDiscountedTotal = (0, math_operations_1.Add)(PartsDiscountedTotal, Part.DiscountedPrice);
         });
-        return (0, aggregation_1.addition)(PartsDiscountedTotal, overallPartDisc);
+        return (0, math_operations_1.Add)(PartsDiscountedTotal, overallPartDisc);
     }
     /**
      * Calculates total tax amount for all parts
@@ -303,7 +303,7 @@ class SalesReceiveTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
             });
         }
         return TotalTaxAmt;
@@ -322,11 +322,11 @@ class SalesReceiveTotalsService {
         let PartsTotalAfterDisc = this.GetPartsTotalAfterDiscount(PartsList);
         if (IsIndependentTax) {
             // Add tax amounts to the total
-            return (0, aggregation_1.addition)(PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
+            return (0, math_operations_1.Add)(PartsTotalAfterDisc, LaborTaxAmount, PartsTaxAmount);
         }
         else {
             // Subtract discount from the total
-            return (0, aggregation_1.subtraction)(PartsTotalAfterDisc, finalTotalsData.Disc);
+            return (0, math_operations_1.Subtract)(PartsTotalAfterDisc, finalTotalsData.Disc);
         }
     }
     /**
@@ -338,16 +338,16 @@ class SalesReceiveTotalsService {
      * @returns Final items total after all discounts
      */
     static ItemsTotalAfterDiscount(PartsTotalAfterDisc, PartsTaxAmount, MainPDisc, PDiscInPerc) {
-        let ItemsTotal = (0, aggregation_1.addition)(PartsTotalAfterDisc, PartsTaxAmount);
+        let ItemsTotal = (0, math_operations_1.Add)(PartsTotalAfterDisc, PartsTaxAmount);
         // Apply discount if present
         if (!tr_utils_1.TrUtils.IsZero(MainPDisc)) {
             if (!tr_utils_1.TrUtils.IsEmpty(PDiscInPerc)) {
                 // Apply percentage discount
-                ItemsTotal = (0, aggregation_1.subtraction)(ItemsTotal, (0, aggregation_1.division)((0, aggregation_1.multiply)(ItemsTotal, Number(PDiscInPerc)), 100));
+                ItemsTotal = (0, math_operations_1.Subtract)(ItemsTotal, (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(ItemsTotal, Number(PDiscInPerc)), 100));
             }
             else {
                 // Apply fixed discount
-                ItemsTotal = (0, aggregation_1.subtraction)(ItemsTotal, MainPDisc);
+                ItemsTotal = (0, math_operations_1.Subtract)(ItemsTotal, MainPDisc);
             }
         }
         return ItemsTotal;
@@ -362,7 +362,7 @@ class SalesReceiveTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             opCodesList.forEach((Labor) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Labor.CGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Labor.CGST);
             });
         }
         return TotalTaxAmt;
@@ -377,7 +377,7 @@ class SalesReceiveTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             opCodesList.forEach((Labor) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Labor.IGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Labor.IGST);
             });
         }
         return TotalTaxAmt;
@@ -392,7 +392,7 @@ class SalesReceiveTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             opCodesList.forEach((Labor) => {
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Labor.SGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Labor.SGST);
             });
         }
         return TotalTaxAmt;
@@ -410,10 +410,10 @@ class SalesReceiveTotalsService {
         let TotalTaxAmt = 0;
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
-                TotalCGSTAmt = (0, aggregation_1.addition)(TotalCGSTAmt, Part.CGST);
-                TotalIGSTAmt = (0, aggregation_1.addition)(TotalIGSTAmt, Part.IGST);
-                TotalSGSTAmt = (0, aggregation_1.addition)(TotalSGSTAmt, Part.SGST);
-                TotalTaxAmt = (0, aggregation_1.addition)(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                TotalCGSTAmt = (0, math_operations_1.Add)(TotalCGSTAmt, Part.CGST);
+                TotalIGSTAmt = (0, math_operations_1.Add)(TotalIGSTAmt, Part.IGST);
+                TotalSGSTAmt = (0, math_operations_1.Add)(TotalSGSTAmt, Part.SGST);
+                TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
             });
         }
         return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalTaxAmt];
@@ -451,7 +451,7 @@ class SalesReceiveTotalsService {
             Part.SGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[1]);
             Part.IGSTAmt = tr_utils_1.TrUtils.SetValueToZeroIfNull(GSTValues[2]);
             // Calculate combined tax percentage
-            Part.CombinedTaxPercentage = (0, aggregation_1.addition)(Part.CGSTAmt, Part.SGSTAmt, Part.IGSTAmt);
+            Part.CombinedTaxPercentage = (0, math_operations_1.Add)(Part.CGSTAmt, Part.SGSTAmt, Part.IGSTAmt);
         });
         return Parts;
     }
@@ -509,13 +509,13 @@ class SalesReceiveTotalsService {
             TaxInfo.CombinedTaxPercentage = MatchedPart[0].CombinedTaxPercentage;
             // Calculate totals for all parts in this HSN group
             MatchedPart.forEach((argMatchedGSTPart) => {
-                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.AfterPartDisc, DecimalsNumber));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST, DecimalsNumber));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST, DecimalsNumber));
-                TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST, DecimalsNumber));
-                CGSTAmt = (0, aggregation_1.addition)(CGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST, DecimalsNumber));
-                SGSTAmt = (0, aggregation_1.addition)(SGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST, DecimalsNumber));
-                IGSTAmt = (0, aggregation_1.addition)(IGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST, DecimalsNumber));
+                TaxOnAmount = (0, math_operations_1.Add)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.AfterPartDisc, DecimalsNumber));
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST, DecimalsNumber));
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST, DecimalsNumber));
+                TaxAmount = (0, math_operations_1.Add)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST, DecimalsNumber));
+                CGSTAmt = (0, math_operations_1.Add)(CGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CGST, DecimalsNumber));
+                SGSTAmt = (0, math_operations_1.Add)(SGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.SGST, DecimalsNumber));
+                IGSTAmt = (0, math_operations_1.Add)(IGSTAmt, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.IGST, DecimalsNumber));
             });
             // Build tax information object
             TaxInfo.HSN = HSN;

package/dist/sales-receive/sales-total-calculation.js

@@ -181,7 +181,7 @@ function CalculateTaxSummary(items, taxCodes) {
         const tax = taxMap[item.TCode];
         if (!tax)
             return acc;
-        const percent = (tax.IGST || (tax.CGST || 0) + (tax.SGST || 0)) + "%";
+        const percent = (((tax.IGST || 0) + (tax.CGST || 0) + (tax.SGST || 0)) + "%");
         // taxable value after discounts
         const taxable = (0, math_operations_1.Subtract)((0, util_1.GetNumber)(item.UnAmt), (0, math_operations_1.Add)((0, util_1.GetNumber)(item.Disc), (0, util_1.GetNumber)(item.RecDisc)));
         if (!acc[percent]) {

package/dist/services/est.print-service.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EstPrintService = void 0;
-const aggregation_1 = require("../aggregation/aggregation");
 const code_enums_1 = require("../enums/code-enums");
 const enums_1 = require("../enums/enums");
+const math_operations_1 = require("../shared/math-operations");
 const shared_print_service_1 = require("../shared/shared-print.service");
 const my_date_1 = require("../utils/my-date");
 const tr_utils_1 = require("../utils/tr-utils");
@@ -913,7 +913,7 @@ class EstPrintService {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.EstPr, DecimalsNumber);
             }
             else {
-                Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.division)(Item.NetAmt, Item.Qty), DecimalsNumber);
+                Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Divide)(Item.NetAmt, Item.Qty), DecimalsNumber);
             }
         });
         return Items;
@@ -931,19 +931,19 @@ class EstPrintService {
     }
     static GetLaborCombinedPrintInfo(LaborList, DecimalsNumber) {
         LaborList.forEach((Labor) => {
-            Labor.AssPr = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(Labor.AssPr, Labor.NetAmt), DecimalsNumber);
+            Labor.AssPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Add)(Labor.AssPr, Labor.NetAmt), DecimalsNumber);
         });
         return LaborList;
     }
     static GetItemsCombinedPrintInfo(Items, DecimalsNumber) {
         Items.forEach((Item) => {
-            Item.AssPr = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.division)((0, aggregation_1.addition)(Item.AssAmt, Item.NetAmt), Item.Qty), DecimalsNumber);
+            Item.AssPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Divide)((0, math_operations_1.Add)(Item.AssAmt, Item.NetAmt), Item.Qty), DecimalsNumber);
         });
         return Items;
     }
     static GetSplitInfoForParts(Items, DecimalsNumber) {
         Items.forEach((Item) => {
-            Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.division)(Item.NetAmt, Item.Qty), DecimalsNumber);
+            Item.UnPr = tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Divide)(Item.NetAmt, Item.Qty), DecimalsNumber);
         });
         return Items;
     }