shareneus 1.4.49 → 1.4.50

package/dist/purchases/vendor-debit-note/vendor-debit-note-totals.service.js

@@ -4,7 +4,7 @@ exports.VendorDebitNoteTotalsService = void 0;
 const aggregation_1 = require("../../aggregation/aggregation");
 const tr_utils_1 = require("../../utils/tr-utils");
 class VendorDebitNoteTotalsService {
-    static GetTotalsValue(ItemsList, IsIndependentTax, DetailedInfo, Disc, Perc, TaxCodes, WithItems, Settings) {
+    static GetTotalsValue(ItemsList, IsIndependentTax, DetailedInfo, Disc, Perc, TaxCodes, WithItems, Settings, EntitySettings) {
         // LPerc = TrUtils.SetPercToStringIfNull(LPerc);
         // PPerc = TrUtils.SetPercToStringIfNull(PPerc);
         Perc = tr_utils_1.TrUtils.SetPercToStringIfNull(Perc);
@@ -13,9 +13,9 @@ class VendorDebitNoteTotalsService {
         Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Disc);
         // opCodesList = this.CalculateLaborValues(opCodesList, IsIndependentTax);
         ItemsList = this.CalculateLaborItemValues(ItemsList, IsIndependentTax);
-        let finalTotalsData = this.GetFinalRODataForSave(ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings);
+        let finalTotalsData = this.GetFinalRODataForSave(ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, EntitySettings.DecimalsNumber);
         if (DetailedInfo) {
-            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes);
+            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes, EntitySettings.DecimalsNumber);
         }
         if (WithItems) {
             // finalTotalsData.Ops = opCodesList;
@@ -56,11 +56,11 @@ class VendorDebitNoteTotalsService {
         Item.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
         return Item;
     }
-    static GetFinalRODataForSave(ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings) {
+    static GetFinalRODataForSave(ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, DecimalsNumber) {
         let finalTotalsData = {};
         finalTotalsData = this.SetMainDiscountValues(Disc, Perc, finalTotalsData, DetailedInfo);
         finalTotalsData.Settings = Settings;
-        finalTotalsData = this.GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo);
+        finalTotalsData = this.GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo, DecimalsNumber);
         return finalTotalsData;
     }
     static SetMainDiscountValues(Disc, Perc, finalTotalsData, DetailedInfo) {
@@ -77,11 +77,11 @@ class VendorDebitNoteTotalsService {
         }
         return finalTotalsData;
     }
-    static GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo) {
+    static GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo, DecimalsNumber) {
         let CustomerAfterDiscTotals = this.GetSubTotalFor(ItemsList);
         // let CustLaborTaxTotal = this.GetLaborTaxTotalFor(IsIndependentTax);
         let CustItemTaxTotal = this.GetItemsTaxTotalFor(ItemsList, IsIndependentTax);
-        finalTotalsData.SubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
+        finalTotalsData.SubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
         // let CustLaborDiscTotal = this.GetLaborDiscountedTotal(LaborList, IsIndependentTax, finalTotalsData);
         let CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList, IsIndependentTax, finalTotalsData);
         // let CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(LaborList);
@@ -91,8 +91,8 @@ class VendorDebitNoteTotalsService {
         finalTotalsData.Round = (0, aggregation_1.subtraction)(Math.round(CustTotal), CustTotal);
         finalTotalsData.Total = Math.round(CustTotal);
         if (DetailedInfo) {
-            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
-            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
+            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         return finalTotalsData;
     }
@@ -108,7 +108,7 @@ class VendorDebitNoteTotalsService {
         });
         return ItemsTotalAfterDisc;
     }
-    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes) {
+    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes, DecimalsNumber) {
         // finalTotalsData.CustLaborDiscTotal = this.GetLaborDiscountedTotal(opCodesList, IsIndependentTax, finalTotalsData);
         finalTotalsData.CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList, IsIndependentTax, finalTotalsData);
         // finalTotalsData.CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(opCodesList);
@@ -131,15 +131,15 @@ class VendorDebitNoteTotalsService {
         // finalTotalsData.CustItemSGST = this.GetItemSGSTTaxTotal(ItemsList, IsIndependentTax);
         // finalTotalsData.CustLaborAfterTax = addition(finalTotalsData.CustLaborITax , finalTotalsData.CustLaborTotalAfterDisc);
         finalTotalsData.CustItemAfterTax = (0, aggregation_1.addition)(finalTotalsData.CustItemITax, finalTotalsData.CustItemsTotalAfterDisc);
-        finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForItemsByHSN(ItemsList, TaxCodes);
-        finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round);
-        finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total);
+        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);
         for (var key in finalTotalsData) {
             if (key !== 'Total' && key !== 'SubTotal' &&
                 key !== 'LDisc' && key !== 'LPerc' && key !== 'PDisc' &&
                 key !== 'PPerc' && key !== 'Disc' && key !== 'Perc' && key !== 'Tax'
                 && typeof finalTotalsData[key] === 'number') {
-                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key]);
+                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key], DecimalsNumber);
             }
         }
         return finalTotalsData;
@@ -201,11 +201,11 @@ class VendorDebitNoteTotalsService {
         }
         return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalTaxAmt];
     }
-    static GetTaxGroupingForItemsByHSN(Items, TaxCodes) {
+    static GetTaxGroupingForItemsByHSN(Items, TaxCodes, DecimalsNumber) {
         Items = this.GetCombinedTaxPercentage(Items, TaxCodes);
         // Items = this.ResetItemsHSNIfInvalid(Items);
         let FinalMatchedItems = this.CompareItemsByHSN(Items, TaxCodes);
-        return this.GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes);
+        return this.GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes, DecimalsNumber);
     }
     static GetCombinedTaxPercentage(Items, TaxCodes) {
         Items.forEach((Item) => {
@@ -251,7 +251,7 @@ class VendorDebitNoteTotalsService {
         });
         return FinalMatchedItems;
     }
-    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes) {
+    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes, DecimalsNumber) {
         let HSNTaxInfo = [];
         FinalMatchedItems.forEach((MatchedItem) => {
             let TaxInfo = {};
@@ -266,8 +266,8 @@ class VendorDebitNoteTotalsService {
                 TaxAmount = (0, aggregation_1.addition)(TaxAmount, argMatchedGSTItem.SGST);
             });
             TaxInfo.HSN = HSN;
-            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount);
-            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount);
+            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
+            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.ItemsCount = MatchedItem.length;
             // let GSTValues: any[] = this.GetGSTValueBasedOnTaxCode(MatchedItem[0].TCode, TaxCodes);
             // TaxInfo.CGST = GSTValues[0];

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

@@ -27,7 +27,7 @@ class DeliveryChallanPrintService {
         InvoicePrintData = shared_print_service_1.PrintSharedService.GetEntityHeaderStyles(InvoicePrintData, OriginalEntityData, image);
         InvoicePrintData = this.GetInvoiceOtherDetailsForPrint(InvoicePrintData, argInvoiceData);
         let IsTaxable = (IncludeGST && tr_utils_1.TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
-        let finalTotalsData = delivery_challan_totals_1.DeliveryChallanTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable, true, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity.Round);
+        let finalTotalsData = delivery_challan_totals_1.DeliveryChallanTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable, true, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity.Round, InvoicePrintData.Entity);
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
@@ -83,7 +83,7 @@ class DeliveryChallanPrintService {
                 let CTaxAmtPerItem = Item.CGST / Item.Qty;
                 let STaxAmtPerItem = Item.SGST / Item.Qty;
                 let ITaxAmtPerItem = Item.IGST / Item.Qty;
-                Item.UnPr = tr_utils_1.TrUtils.FixPriceValue((AfterDiscForEach + CTaxAmtPerItem + STaxAmtPerItem + ITaxAmtPerItem), DecimalsNumber);
+                Item.UnPr = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
             }
             else {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);

package/dist/sales/delivery-challan/delivery-challan-totals.d.ts

@@ -1,14 +1,14 @@
 export declare class DeliveryChallanTotalsService {
-    static GetTotalsValue(PartsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any, isRoundable: boolean): any;
+    static GetTotalsValue(PartsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any, isRoundable: boolean, EntitySettings: any): any;
     static CalculateLaborPartValues(PartsList: any, IsIndependentTax: boolean): any;
     static ResetLaborPartValues(PartsList: any, IsIndependentTax: boolean): any;
     static ResetLaborPartValueIfInvalid(Part: any): any;
-    static GetFinalChallanDataForSave(PartsList: any, IsIndependentTax: boolean, Disc: any, Perc: string, DetailedInfo: boolean, Settings: any, isRoundable: boolean): any;
+    static GetFinalChallanDataForSave(PartsList: any, IsIndependentTax: boolean, Disc: any, Perc: string, DetailedInfo: boolean, Settings: any, isRoundable: boolean, DecimalsNumber: number): any;
     static SetMainDiscountValues(Disc: any, Perc: string, finalTotalsData: any, DetailedInfo: boolean): any;
-    static GetFinalCustomerTotalsData(finalTotalsData: any, PartsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, isRoundable: boolean): any;
+    static GetFinalCustomerTotalsData(finalTotalsData: any, PartsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, isRoundable: boolean, DecimalsNumber: number): any;
     static GetSubTotalFor(PartsList: any): any;
     static GetPartsTotalAfterDiscount(PartsList: any): any;
-    static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, PartsList: any, TaxCodes: any): any;
+    static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, PartsList: any, TaxCodes: any, DecimalsNumber: number): any;
     static GetLaborDiscountedTotal(LaborList: any): any;
     static GetPartDiscountedTotal(PartsList: any): any;
     static GetPartsTaxTotalFor(PartsList: any, IsIndependentTax: boolean): any;
@@ -19,9 +19,9 @@ export declare class DeliveryChallanTotalsService {
     static GetLaborIGSTTaxTotal(opCodesList: any, IsIndependentTax: boolean): any;
     static GetLaborSGSTTaxTotal(opCodesList: any, IsIndependentTax: boolean): any;
     static GetPartGSTTaxTotal(PartsList: any, IsIndependentTax: boolean): number[];
-    static GetTaxGroupingForPartsByHSN(Parts: any, TaxCodes: any): any[];
+    static GetTaxGroupingForPartsByHSN(Parts: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetCombinedTaxPercentage(Parts: any, TaxCodes: any): any;
     static ComparePartsByHSN(Parts: any, TaxCodes: any): any[];
-    static GetTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any): any[];
+    static GetTaxGroupingInfoByHSN(FinalMatchedParts: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
 }

package/dist/sales/delivery-challan/delivery-challan-totals.js

@@ -4,15 +4,15 @@ exports.DeliveryChallanTotalsService = void 0;
 const aggregation_1 = require("../../aggregation/aggregation");
 const tr_utils_1 = require("../../utils/tr-utils");
 class DeliveryChallanTotalsService {
-    static GetTotalsValue(PartsList, IsIndependentTax, DetailedInfo, Disc, Perc, TaxCodes, WithItems, Settings, isRoundable) {
+    static GetTotalsValue(PartsList, IsIndependentTax, DetailedInfo, Disc, Perc, TaxCodes, WithItems, Settings, isRoundable, EntitySettings) {
         // LPerc = TrUtils.SetPercToStringIfNull(LPerc);
         Perc = tr_utils_1.TrUtils.SetPercToStringIfNull(Perc);
         // LDisc = TrUtils.SetValueToZeroIfNull(LDisc);
         Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Disc);
         PartsList = this.CalculateLaborPartValues(PartsList, IsIndependentTax);
-        let finalTotalsData = this.GetFinalChallanDataForSave(PartsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, isRoundable);
+        let finalTotalsData = this.GetFinalChallanDataForSave(PartsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, isRoundable, EntitySettings.DecimalsNumber);
         if (DetailedInfo) {
-            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, PartsList, TaxCodes);
+            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, PartsList, TaxCodes, EntitySettings.DecimalsNumber);
         }
         if (WithItems) {
             finalTotalsData.Items = PartsList;
@@ -50,11 +50,11 @@ class DeliveryChallanTotalsService {
         Part.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Part.IGST);
         return Part;
     }
-    static GetFinalChallanDataForSave(PartsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, isRoundable) {
+    static GetFinalChallanDataForSave(PartsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, isRoundable, DecimalsNumber) {
         let finalTotalsData = {};
         finalTotalsData = this.SetMainDiscountValues(Disc, Perc, finalTotalsData, DetailedInfo);
         finalTotalsData.Settings = Settings;
-        finalTotalsData = this.GetFinalCustomerTotalsData(finalTotalsData, PartsList, IsIndependentTax, DetailedInfo, isRoundable);
+        finalTotalsData = this.GetFinalCustomerTotalsData(finalTotalsData, PartsList, IsIndependentTax, DetailedInfo, isRoundable, DecimalsNumber);
         return finalTotalsData;
     }
     static SetMainDiscountValues(Disc, Perc, finalTotalsData, DetailedInfo) {
@@ -65,7 +65,7 @@ class DeliveryChallanTotalsService {
         }
         return finalTotalsData;
     }
-    static GetFinalCustomerTotalsData(finalTotalsData, PartsList, IsIndependentTax, DetailedInfo, isRoundable) {
+    static GetFinalCustomerTotalsData(finalTotalsData, PartsList, IsIndependentTax, DetailedInfo, isRoundable, DecimalsNumber) {
         let CustomerAfterDiscTotals = this.GetSubTotalFor(PartsList);
         // let CustLaborTaxTotal = this.GetLaborTaxTotalFor(IsIndependentTax);
         let CustPartTaxTotal = this.GetPartsTaxTotalFor(PartsList, IsIndependentTax);
@@ -75,15 +75,15 @@ class DeliveryChallanTotalsService {
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(CustPartTaxTotal, PartsList, IsIndependentTax);
         // console.log('CustTotal', CustTotal);
         if (isRoundable) {
-            finalTotalsData.Round = tr_utils_1.TrUtils.FixedTo(Math.round(CustTotal) - CustTotal);
+            finalTotalsData.Round = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Math.round(CustTotal), CustTotal), DecimalsNumber);
             finalTotalsData.Total = Math.round(CustTotal);
         }
         else {
-            finalTotalsData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         if (DetailedInfo) {
-            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
-            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
+            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         return finalTotalsData;
     }
@@ -100,7 +100,7 @@ class DeliveryChallanTotalsService {
         });
         return PartsTotalAfterDisc;
     }
-    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, PartsList, TaxCodes) {
+    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, PartsList, TaxCodes, DecimalsNumber) {
         // finalTotalsData.CustLaborDiscTotal = this.GetLaborDiscountedTotal(opCodesList);
         finalTotalsData.CustPartsDiscTotal = this.GetPartDiscountedTotal(PartsList);
         // finalTotalsData.CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(opCodesList);
@@ -122,15 +122,15 @@ class DeliveryChallanTotalsService {
         finalTotalsData.CustPartSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(TaxInfo[1]);
         // finalTotalsData.CustLaborAfterTax = TrUtils.FixedTo(finalTotalsData.CustLaborITax + finalTotalsData.CustLaborTotalAfterDisc);
         finalTotalsData.CustPartAfterTax = (0, aggregation_1.addition)(finalTotalsData.CustPartITax, finalTotalsData.CustPartsTotalAfterDisc);
-        finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForPartsByHSN(PartsList, TaxCodes);
-        finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round);
-        finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total);
+        finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForPartsByHSN(PartsList, TaxCodes, DecimalsNumber);
+        finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round, DecimalsNumber);
+        finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total, DecimalsNumber);
         for (var key in finalTotalsData) {
             if (key !== 'Total' && key !== 'SubTotal' &&
                 key !== 'LDisc' && key !== 'LPerc' && key !== 'PDisc' &&
                 key !== 'PPerc' && key !== 'Disc' && key !== 'Perc' && key !== 'Tax'
                 && typeof finalTotalsData[key] === 'number') {
-                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key]);
+                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key], DecimalsNumber);
             }
         }
         return finalTotalsData;
@@ -234,11 +234,11 @@ class DeliveryChallanTotalsService {
         }
         return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalTaxAmt];
     }
-    static GetTaxGroupingForPartsByHSN(Parts, TaxCodes) {
+    static GetTaxGroupingForPartsByHSN(Parts, TaxCodes, DecimalsNumber) {
         Parts = this.GetCombinedTaxPercentage(Parts, TaxCodes);
         // Parts = this.ResetPartsHSNIfInvalid(Parts);
         let FinalMatchedParts = this.ComparePartsByHSN(Parts, TaxCodes);
-        return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes);
+        return this.GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber);
     }
     static GetCombinedTaxPercentage(Parts, TaxCodes) {
         Parts.forEach((Part) => {
@@ -284,7 +284,7 @@ class DeliveryChallanTotalsService {
         });
         return FinalMatchedParts;
     }
-    static GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes) {
+    static GetTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber) {
         let HSNTaxInfo = [];
         FinalMatchedParts.forEach((MatchedPart) => {
             let TaxInfo = {};
@@ -299,8 +299,8 @@ class DeliveryChallanTotalsService {
                 TaxAmount = (0, aggregation_1.addition)(TaxAmount, argMatchedGSTPart.SGST);
             });
             TaxInfo.HSN = HSN;
-            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount);
-            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount);
+            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
+            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.ItemsCount = MatchedPart.length;
             // let GSTValues: any[] = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
             // TaxInfo.CGST = GSTValues[0];

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

@@ -34,7 +34,7 @@ class SalesPrintService {
         // argInvoiceData.Items = argInvoiceData.Items.filter((item: any) => {
         //     return TrUtils.IsNull(item.Type);
         // });
-        let finalTotalsData = sales_totals_service_1.SalesTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable, true, argInvoiceData.PDisc, argInvoiceData.PPerc, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity.Round);
+        let finalTotalsData = sales_totals_service_1.SalesTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable, true, argInvoiceData.PDisc, argInvoiceData.PPerc, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity.Round, InvoicePrintData.Entity);
         if (ConsolidateGST) {
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustItemAfterTax;
         }

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

@@ -1,14 +1,14 @@
 export declare class SalesTotalsService {
-    static GetTotalsValue(ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, PDisc: any, PPerc: string, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any, isRoundable: boolean): any;
+    static GetTotalsValue(ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, PDisc: any, PPerc: string, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any, isRoundable: boolean, EntitySettings: any): any;
     static CalculateLaborItemValues(ItemsList: any, IsIndependentTax: boolean): any;
     static ResetLaborItemValues(ItemsList: any, IsIndependentTax: boolean): any;
     static ResetLaborItemValueIfInvalid(Item: any): any;
-    static GetFinalRODataForSave(ItemsList: any, IsIndependentTax: boolean, PDisc: string, PPerc: string, Disc: any, Perc: string, DetailedInfo: boolean, Settings: any, isRoundable: boolean): any;
+    static GetFinalRODataForSave(ItemsList: any, IsIndependentTax: boolean, PDisc: string, PPerc: string, Disc: any, Perc: string, DetailedInfo: boolean, Settings: any, isRoundable: boolean, DecimalsNumber: number): any;
     static SetMainDiscountValues(PPerc: string, PDisc: any, Disc: any, Perc: string, finalTotalsData: any, DetailedInfo: boolean): any;
-    static GetFinalCustomerTotalsData(finalTotalsData: any, ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, isRoundable: boolean): any;
+    static GetFinalCustomerTotalsData(finalTotalsData: any, ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, isRoundable: boolean, DecimalsNumber: number): any;
     static GetSubTotalFor(ItemsList: any): any;
     static GetItemsTotalAfterDiscount(ItemsList: any): any;
-    static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, ItemsList: any, TaxCodes: any): any;
+    static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, ItemsList: any, TaxCodes: any, DecimalsNumber: any): any;
     static GetLaborDiscountedTotal(LaborList: any): any;
     static GetItemDiscountedTotal(ItemsList: any): any;
     static GetItemsTaxTotalFor(ItemsList: any, IsIndependentTax: boolean): any;
@@ -19,9 +19,9 @@ export declare class SalesTotalsService {
     static GetLaborIGSTTaxTotal(opCodesList: any, IsIndependentTax: boolean): any;
     static GetLaborSGSTTaxTotal(opCodesList: any, IsIndependentTax: boolean): any;
     static GetItemGSTTaxTotal(ItemsList: any, IsIndependentTax: boolean): number[];
-    static GetTaxGroupingForItemsByHSN(Items: any, TaxCodes: any): any[];
+    static GetTaxGroupingForItemsByHSN(Items: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetCombinedTaxPercentage(Items: any, TaxCodes: any): any;
     static CompareItemsByHSN(Items: any, TaxCodes: any): any[];
-    static GetTaxGroupingInfoByHSN(FinalMatchedItems: any, TaxCodes: any): any[];
+    static GetTaxGroupingInfoByHSN(FinalMatchedItems: any, TaxCodes: any, DecimalsNumber: number): any[];
     static GetGSTValueBasedOnTaxCode(TCode: any, TaxCodes: any): any[];
 }

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

@@ -4,7 +4,7 @@ exports.SalesTotalsService = void 0;
 const aggregation_1 = require("../../aggregation/aggregation");
 const tr_utils_1 = require("../../utils/tr-utils");
 class SalesTotalsService {
-    static GetTotalsValue(ItemsList, IsIndependentTax, DetailedInfo, PDisc, PPerc, Disc, Perc, TaxCodes, WithItems, Settings, isRoundable) {
+    static GetTotalsValue(ItemsList, IsIndependentTax, DetailedInfo, PDisc, PPerc, Disc, Perc, TaxCodes, WithItems, Settings, isRoundable, EntitySettings) {
         // LPerc = TrUtils.SetPercToStringIfNull(LPerc);
         PPerc = tr_utils_1.TrUtils.SetPercToStringIfNull(PPerc);
         Perc = tr_utils_1.TrUtils.SetPercToStringIfNull(Perc);
@@ -13,9 +13,9 @@ class SalesTotalsService {
         Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Disc);
         // opCodesList = this.CalculateLaborValues(opCodesList, IsIndependentTax);
         ItemsList = this.CalculateLaborItemValues(ItemsList, IsIndependentTax);
-        let finalTotalsData = this.GetFinalRODataForSave(ItemsList, IsIndependentTax, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, isRoundable);
+        let finalTotalsData = this.GetFinalRODataForSave(ItemsList, IsIndependentTax, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, isRoundable, EntitySettings);
         if (DetailedInfo) {
-            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes);
+            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes, EntitySettings);
         }
         if (WithItems) {
             finalTotalsData.Items = ItemsList;
@@ -53,11 +53,11 @@ class SalesTotalsService {
         Item.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
         return Item;
     }
-    static GetFinalRODataForSave(ItemsList, IsIndependentTax, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, isRoundable) {
+    static GetFinalRODataForSave(ItemsList, IsIndependentTax, PDisc, PPerc, Disc, Perc, DetailedInfo, Settings, isRoundable, DecimalsNumber) {
         let finalTotalsData = {};
         finalTotalsData = this.SetMainDiscountValues(PPerc, PDisc, Disc, Perc, finalTotalsData, DetailedInfo);
         finalTotalsData.Settings = Settings;
-        finalTotalsData = this.GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo, isRoundable);
+        finalTotalsData = this.GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo, isRoundable, DecimalsNumber);
         return finalTotalsData;
     }
     static SetMainDiscountValues(PPerc, PDisc, Disc, Perc, finalTotalsData, DetailedInfo) {
@@ -71,7 +71,7 @@ class SalesTotalsService {
         }
         return finalTotalsData;
     }
-    static GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo, isRoundable) {
+    static GetFinalCustomerTotalsData(finalTotalsData, ItemsList, IsIndependentTax, DetailedInfo, isRoundable, DecimalsNumber) {
         let CustomerAfterDiscTotals = this.GetSubTotalFor(ItemsList);
         // let CustLaborTaxTotal = this.GetLaborTaxTotalFor(IsIndependentTax);
         let CustItemTaxTotal = this.GetItemsTaxTotalFor(ItemsList, IsIndependentTax);
@@ -83,11 +83,11 @@ class SalesTotalsService {
             finalTotalsData.Total = Math.round(CustTotal);
         }
         else {
-            finalTotalsData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         if (DetailedInfo) {
-            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
-            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            finalTotalsData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
+            finalTotalsData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         return finalTotalsData;
     }
@@ -103,7 +103,7 @@ class SalesTotalsService {
         });
         return ItemsTotalAfterDisc;
     }
-    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes) {
+    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, ItemsList, TaxCodes, DecimalsNumber) {
         // finalTotalsData.CustLaborDiscTotal = this.GetLaborDiscountedTotal(opCodesList);
         finalTotalsData.CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList);
         // finalTotalsData.CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(opCodesList);
@@ -121,15 +121,15 @@ class SalesTotalsService {
         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.CustTaxGroupData = this.GetTaxGroupingForItemsByHSN(ItemsList, TaxCodes);
-        finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round);
-        finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total);
+        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);
         for (var key in finalTotalsData) {
             if (key !== 'Total' && key !== 'SubTotal' &&
                 key !== 'LDisc' && key !== 'LPerc' && key !== 'PDisc' &&
                 key !== 'PPerc' && key !== 'Disc' && key !== 'Perc' && key !== 'Tax'
                 && typeof finalTotalsData[key] === 'number') {
-                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key]);
+                finalTotalsData[key] = tr_utils_1.TrUtils.FixPriceValue(finalTotalsData[key], DecimalsNumber);
             }
         }
         return finalTotalsData;
@@ -233,11 +233,11 @@ class SalesTotalsService {
         }
         return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalTaxAmt];
     }
-    static GetTaxGroupingForItemsByHSN(Items, TaxCodes) {
+    static GetTaxGroupingForItemsByHSN(Items, TaxCodes, DecimalsNumber) {
         Items = this.GetCombinedTaxPercentage(Items, TaxCodes);
         // Items = this.ResetItemsHSNIfInvalid(Items);
         let FinalMatchedItems = this.CompareItemsByHSN(Items, TaxCodes);
-        return this.GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes);
+        return this.GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes, DecimalsNumber);
     }
     static GetCombinedTaxPercentage(Items, TaxCodes) {
         Items.forEach((Item) => {
@@ -283,7 +283,7 @@ class SalesTotalsService {
         });
         return FinalMatchedItems;
     }
-    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes) {
+    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes, DecimalsNumber) {
         let HSNTaxInfo = [];
         FinalMatchedItems.forEach((MatchedItem) => {
             let TaxInfo = {};
@@ -298,8 +298,8 @@ class SalesTotalsService {
                 TaxAmount = (0, aggregation_1.addition)(TaxAmount, argMatchedGSTItem.SGST);
             });
             TaxInfo.HSN = HSN;
-            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount);
-            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount);
+            TaxInfo.TotalTaxableAmount = tr_utils_1.TrUtils.FixPriceValue(TaxOnAmount, DecimalsNumber);
+            TaxInfo.TotalTaxAmount = tr_utils_1.TrUtils.FixPriceValue(TaxAmount, DecimalsNumber);
             TaxInfo.ItemsCount = MatchedItem.length;
             // let GSTValues: any[] = this.GetGSTValueBasedOnTaxCode(MatchedItem[0].TCode, TaxCodes);
             // TaxInfo.CGST = GSTValues[0];

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

@@ -54,7 +54,7 @@ class EstPrintService {
             ROPrintData.ShowAccParts = this.CheckAndShowItemsAsAR(argROData);
         }
         argROData = this.ReverseItemsForROPrint(argROData, isReverse);
-        let finalTotalsData = ro_totals_service_1.ROTotalsService.GetTotalsValue(argROData, TaxCodes, false, true, true, ROPrintData.Entity.Round);
+        let finalTotalsData = ro_totals_service_1.ROTotalsService.GetTotalsValue(argROData, TaxCodes, false, true, true, ROPrintData.Entity.Round, ROPrintData.Entity);
         finalTotalsData = this.CheckAndGetCombinedTotals(AsCustomerAndInsurance, AsInsuranceOrCustomer, finalTotalsData, ROPrintData.Entity.DecimalsNumber);
         finalTotalsData.Settings = tr_utils_1.TrUtils.Stringify(argROData.Settings);
         if (AsCustomerOnly) {

package/dist/services/reports/excel/insurance-expire-excel.service.d.ts

@@ -13,11 +13,11 @@ export declare class InsuranceExpireXlsxFileService {
         };
     };
     static ws: any;
-    static GetInsuranceExpireExcelData(MainData: any, searchValue: any, HeaderName: any): any;
+    static GetInsuranceExpireExcelData(MainData: any, searchValue: any, HeaderName: any, EntitySettings: any): any;
     static setHeadingInCell(HeaderName: any, searchValue: any): void;
-    static setInvoiceDetailsInCell(MainData: any): void;
-    static SetInvoiceDataInExcel(InvoiceInfo: any): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setInvoiceDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetInvoiceDataInExcel(InvoiceInfo: any, DecimalsNumber: number): void;
+    static ConvertToString(Text: any, IsString: any, DecimalsNumber: number): any;
     static SetDataInCell(Data: any, ColRange: number, RowNum: any): void;
     static getcelltype(cell: any): any;
 }

package/dist/services/reports/excel/insurance-expire-excel.service.js

@@ -28,7 +28,7 @@ const XLSX = __importStar(require("xlsx"));
 const my_date_1 = require("../../../utils/my-date");
 const tr_utils_1 = require("../../../utils/tr-utils");
 class InsuranceExpireXlsxFileService {
-    static GetInsuranceExpireExcelData(MainData, searchValue, HeaderName) {
+    static GetInsuranceExpireExcelData(MainData, searchValue, HeaderName, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -66,7 +66,7 @@ class InsuranceExpireXlsxFileService {
             // console.log(`${key}: ${searchValue[key]}`);
         }
         this.setHeadingInCell(HeaderName, showSearch);
-        this.setInvoiceDetailsInCell(MainData);
+        this.setInvoiceDetailsInCell(MainData, EntitySettings.DecimalsNumber);
         this.ws['!ref'] = XLSX.utils.encode_range(this.range);
         this.ws['!merges'] = this.MergeArray;
         this.ws["!cols"] = [{ wch: 15 }, { wch: 15 }, { wch: 30 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 20 }];
@@ -217,12 +217,12 @@ class InsuranceExpireXlsxFileService {
         });
         this.Row += 2;
     }
-    static setInvoiceDetailsInCell(MainData) {
+    static setInvoiceDetailsInCell(MainData, DecimalsNumber) {
         MainData.forEach((InvoiceList) => {
-            this.SetInvoiceDataInExcel(InvoiceList);
+            this.SetInvoiceDataInExcel(InvoiceList, DecimalsNumber);
         });
     }
-    static SetInvoiceDataInExcel(InvoiceInfo) {
+    static SetInvoiceDataInExcel(InvoiceInfo, DecimalsNumber) {
         var _a, _b, _c, _d, _e, _f;
         // InvoiceInfo.Date = TrUtils.ConvertDateToReadableFormat(InvoiceInfo.CrDate);
         let Vehicle = InvoiceInfo.Make + ' ' + InvoiceInfo.Model + ' ' + InvoiceInfo.Var + ' ' + InvoiceInfo.Year;
@@ -243,7 +243,7 @@ class InsuranceExpireXlsxFileService {
         ];
         let ColStart = 0;
         InvoiceData.forEach((InvData) => {
-            InvData.text = this.ConvertToString(InvData.text, InvData.IsString);
+            InvData.text = this.ConvertToString(InvData.text, InvData.IsString, DecimalsNumber);
             this.SetDataInCell(InvData.text, ColStart, this.Row);
             this.MergeArray.push({
                 s: { r: this.Row, c: ColStart },
@@ -253,7 +253,7 @@ class InsuranceExpireXlsxFileService {
         });
         this.Row += 1;
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -265,7 +265,7 @@ class InsuranceExpireXlsxFileService {
             }
         }
         if (typeof Text === 'number') {
-            return Number(tr_utils_1.TrUtils.FixedTo(Text));
+            return Number(tr_utils_1.TrUtils.FixedTo(Text, DecimalsNumber));
         }
         else {
             return Text;

package/dist/services/reports/excel/next-service-date-excel.service.d.ts

@@ -13,13 +13,13 @@ export declare class NextServiceDateXlsxFileService {
         };
     };
     static ws: any;
-    static GetNextServiceDateExcelData(MainData: any, searchValue: any, HeaderName: any, isDetails: boolean): any;
+    static GetNextServiceDateExcelData(MainData: any, searchValue: any, HeaderName: any, isDetails: boolean, EntitySettings: any): any;
     static GetTotals(MainData: any): any;
     static setHeadingInCell(HeaderName: any, showSearch: any, isDetails: boolean): void;
-    static setInvoiceDetailsInCell(MainData: any, isDetails: boolean): void;
-    static SetInvoiceDataInExcel(InvoiceInfo: any, isDetails: boolean): void;
+    static setInvoiceDetailsInCell(MainData: any, isDetails: boolean, DecimalsNumber: number): void;
+    static SetInvoiceDataInExcel(InvoiceInfo: any, isDetails: boolean, DecimalsNumber: number): void;
     static ConvertDateToReadableFormat(DateObject: any): any;
-    static ConvertToString(Text: any, IsString: any): any;
+    static ConvertToString(Text: any, IsString: any, DecimalsNumber: number): any;
     static SetDataInCell(Data: any, ColRange: number, RowNum: any): void;
     static getcelltype(cell: any): any;
 }

package/dist/services/reports/excel/next-service-date-excel.service.js

@@ -28,7 +28,7 @@ const XLSX = __importStar(require("xlsx"));
 const my_date_1 = require("../../../utils/my-date");
 const tr_utils_1 = require("../../../utils/tr-utils");
 class NextServiceDateXlsxFileService {
-    static GetNextServiceDateExcelData(MainData, searchValue, HeaderName, isDetails) {
+    static GetNextServiceDateExcelData(MainData, searchValue, HeaderName, isDetails, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -66,7 +66,7 @@ class NextServiceDateXlsxFileService {
         }
         MainData = this.GetTotals(MainData);
         this.setHeadingInCell(HeaderName, showSearch, isDetails);
-        this.setInvoiceDetailsInCell(MainData, isDetails);
+        this.setInvoiceDetailsInCell(MainData, isDetails, EntitySettings.DecimalsNumber);
         this.ws['!ref'] = XLSX.utils.encode_range(this.range);
         this.ws['!merges'] = this.MergeArray;
         this.ws["!cols"] = [{ wch: 50 }, { wch: 10 }, { wch: 10 }, { wch: 10 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 20 }];
@@ -189,12 +189,12 @@ class NextServiceDateXlsxFileService {
         });
         this.Row += 2;
     }
-    static setInvoiceDetailsInCell(MainData, isDetails) {
+    static setInvoiceDetailsInCell(MainData, isDetails, DecimalsNumber) {
         MainData.forEach((InvoiceList) => {
-            this.SetInvoiceDataInExcel(InvoiceList, isDetails);
+            this.SetInvoiceDataInExcel(InvoiceList, isDetails, DecimalsNumber);
         });
     }
-    static SetInvoiceDataInExcel(InvoiceInfo, isDetails) {
+    static SetInvoiceDataInExcel(InvoiceInfo, isDetails, DecimalsNumber) {
         var _a;
         InvoiceInfo.LSDate = this.ConvertDateToReadableFormat(InvoiceInfo.LSDate);
         InvoiceInfo.NSDate = this.ConvertDateToReadableFormat(InvoiceInfo.NSDate);
@@ -210,7 +210,7 @@ class NextServiceDateXlsxFileService {
         ];
         let ColStart = 0;
         InvoiceData.forEach((InvData) => {
-            InvData.text = this.ConvertToString(InvData.text, InvData.IsString);
+            InvData.text = this.ConvertToString(InvData.text, InvData.IsString, DecimalsNumber);
             this.SetDataInCell(InvData.text, ColStart, this.Row);
             this.MergeArray.push({
                 s: { r: this.Row, c: ColStart },
@@ -252,7 +252,7 @@ class NextServiceDateXlsxFileService {
             return null;
         }
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -264,7 +264,7 @@ class NextServiceDateXlsxFileService {
             }
         }
         if (typeof Text === 'number') {
-            return Number(tr_utils_1.TrUtils.FixedTo(Text));
+            return Number(tr_utils_1.TrUtils.FixedTo(Text, DecimalsNumber));
         }
         else {
             return Text;