shareneus 1.4.49 → 1.4.51

package/dist/services/ro-totals.service.js

@@ -5,12 +5,12 @@ const aggregation_1 = require("../aggregation/aggregation");
 const enums_1 = require("../enums/enums");
 const tr_utils_1 = require("../utils/tr-utils");
 class ROTotalsService {
-    static GetTotalsValue(OriRecordData, TaxCodes, isWorkOrder, detailedInfo, withItems, isRoundable) {
+    static GetTotalsValue(OriRecordData, TaxCodes, isWorkOrder, detailedInfo, withItems, isRoundable, EntitySettings) {
         let dupRecordData = tr_utils_1.TrUtils.Stringify(OriRecordData);
         let argRecordData = {};
         dupRecordData.Ops = this.CalculateLaborValues(dupRecordData.Ops, isWorkOrder, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax));
         dupRecordData.Parts = this.CalculatePartValues(dupRecordData.Parts, dupRecordData.Ops, isWorkOrder, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax));
-        argRecordData = this.GetROTotalsData(argRecordData, dupRecordData, TaxCodes, withItems, detailedInfo, isWorkOrder, isRoundable);
+        argRecordData = this.GetROTotalsData(argRecordData, dupRecordData, TaxCodes, withItems, detailedInfo, isWorkOrder, isRoundable, EntitySettings.DecimalsNumber);
         return argRecordData;
     }
     static CalculateLaborValues(opCodesList, isWorkOrder, isTaxable) {
@@ -375,13 +375,13 @@ class ROTotalsService {
         });
         return PartsList;
     }
-    static GetROTotalsData(argRecordData, dupRecordData, TaxCodes, withItems, detailedInfo, isWorkOrder, isRoundable) {
+    static GetROTotalsData(argRecordData, dupRecordData, TaxCodes, withItems, detailedInfo, isWorkOrder, isRoundable, DecimalsNumber) {
         dupRecordData = this.ResetDiscountValuesIfInvalid(dupRecordData);
         argRecordData = this.SetMainDiscountValues(argRecordData, dupRecordData, detailedInfo);
-        argRecordData = this.GetFinalCustomerTotalsData(argRecordData, dupRecordData, isWorkOrder, detailedInfo, isRoundable);
-        argRecordData = this.GetFinalInsuranceTotalsData(argRecordData, dupRecordData, detailedInfo, isWorkOrder);
+        argRecordData = this.GetFinalCustomerTotalsData(argRecordData, dupRecordData, isWorkOrder, detailedInfo, isRoundable, DecimalsNumber);
+        argRecordData = this.GetFinalInsuranceTotalsData(argRecordData, dupRecordData, detailedInfo, isWorkOrder, DecimalsNumber);
         if (detailedInfo) {
-            argRecordData = this.GetDetailedTotalsData(argRecordData, dupRecordData, TaxCodes, isWorkOrder);
+            argRecordData = this.GetDetailedTotalsData(argRecordData, dupRecordData, TaxCodes, isWorkOrder, DecimalsNumber);
         }
         if (withItems) {
             argRecordData.Ops = dupRecordData.Ops;
@@ -413,7 +413,7 @@ class ROTotalsService {
         }
         return argRecordData;
     }
-    static GetFinalCustomerTotalsData(argRecordData, dupRecordData, isWorkOrder, detailedInfo, isRoundable) {
+    static GetFinalCustomerTotalsData(argRecordData, dupRecordData, isWorkOrder, detailedInfo, isRoundable, DecimalsNumber) {
         let CustomerAfterDiscTotals = this.GetCustSubTotal(dupRecordData.Ops, dupRecordData.Parts);
         let CustLaborTaxTotal = this.GetCustLaborTaxTotal(dupRecordData.Ops, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax), isWorkOrder);
         let CustPartTaxTotal = this.GetCustPartsTaxTotal(dupRecordData.Ops, dupRecordData.Parts, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax), isWorkOrder);
@@ -424,18 +424,18 @@ class ROTotalsService {
         argRecordData.STotal = (0, aggregation_1.addition)(CustLaborDiscTotal, CustPartsDiscTotal, CustLaborTotalAfterDisc, CustPartsTotalAfterDisc);
         argRecordData.CustLaborTotalBeforeDisc = (0, aggregation_1.addition)(argRecordData.CustLaborTotalAfterDisc, argRecordData.CustLaborDiscTotal);
         argRecordData.CustPartsTotalBeforeDisc = (0, aggregation_1.addition)(argRecordData.CustPartsTotalAfterDisc, argRecordData.CustPartsDiscTotal);
-        argRecordData.SubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
+        argRecordData.SubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(dupRecordData, CustLaborTaxTotal, CustPartTaxTotal, dupRecordData.Ops, dupRecordData.Parts, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax));
         if (detailedInfo) {
-            argRecordData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals);
-            argRecordData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            argRecordData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
+            argRecordData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         if (isRoundable) {
             argRecordData.Round = (0, aggregation_1.subtraction)(Math.round(CustTotal), CustTotal);
             argRecordData.Total = Math.round(CustTotal);
         }
         else {
-            argRecordData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal);
+            argRecordData.Total = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
         }
         return argRecordData;
     }
@@ -549,14 +549,14 @@ class ROTotalsService {
         }
         return SubTotalWithTax;
     }
-    static GetFinalInsuranceTotalsData(argRecordData, dupRecordData, detailedInfo, isWorkOrder) {
+    static GetFinalInsuranceTotalsData(argRecordData, dupRecordData, detailedInfo, isWorkOrder, DecimalsNumber) {
         let InsuranceAfterDiscTotals = this.GetInsSubTotal(dupRecordData.Ops, dupRecordData.Parts);
         let InsLaborTaxTotal = this.GetInsLaborTaxTotal(dupRecordData.Ops, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax), isWorkOrder);
         let InsPartTaxTotal = this.GetInsPartsTaxTotal(dupRecordData.Parts, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax), isWorkOrder);
         let InsTotal = this.GetInsuranceTotalBasedOnTaxType(InsuranceAfterDiscTotals, InsLaborTaxTotal, InsPartTaxTotal, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax));
-        argRecordData.InsTotal = tr_utils_1.TrUtils.FixedTo(InsTotal);
+        argRecordData.InsTotal = tr_utils_1.TrUtils.FixedTo(InsTotal, DecimalsNumber);
         if (detailedInfo) {
-            argRecordData.FixedInsTotal = tr_utils_1.TrUtils.FixedTo(InsTotal);
+            argRecordData.FixedInsTotal = tr_utils_1.TrUtils.FixedTo(InsTotal, DecimalsNumber);
         }
         return argRecordData;
     }
@@ -637,7 +637,7 @@ class ROTotalsService {
         }
         return InsTotal;
     }
-    static GetDetailedTotalsData(argRecordData, dupRecordData, TaxCodes, isWorkOrder) {
+    static GetDetailedTotalsData(argRecordData, dupRecordData, TaxCodes, isWorkOrder, DecimalsNumber) {
         argRecordData.InsLaborDiscTotal = 0;
         argRecordData.InsPartsDiscTotal = 0;
         argRecordData.InsLaborTotalAfterDisc = this.GetInsLaborTotalAfterDiscount(dupRecordData.Ops);
@@ -674,10 +674,10 @@ class ROTotalsService {
         argRecordData.CustPartsAfterPDisc = argRecordData.CustPartsTotalAfterDisc;
         argRecordData.CustLaborAfterTax = (0, aggregation_1.addition)(argRecordData.CustLaborITax, argRecordData.CustLaborAfterLDisc);
         argRecordData.CustPartAfterTax = (0, aggregation_1.addition)(argRecordData.CustPartITax, argRecordData.CustPartsAfterPDisc);
-        argRecordData.CustTaxGroupData = this.GetCustPartsTaxGrouping(dupRecordData.Parts, TaxCodes, isWorkOrder);
-        argRecordData.InsTaxGroupData = this.GetInsPartsTaxGrouping(dupRecordData.Parts, TaxCodes);
+        argRecordData.CustTaxGroupData = this.GetCustPartsTaxGrouping(dupRecordData.Parts, TaxCodes, isWorkOrder, DecimalsNumber);
+        argRecordData.InsTaxGroupData = this.GetInsPartsTaxGrouping(dupRecordData.Parts, TaxCodes, DecimalsNumber);
         argRecordData.CustTotalRoundedBy = argRecordData.Round;
-        argRecordData.InsTotalRoundedBy = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Math.round(argRecordData.InsTotal), argRecordData.InsTotal));
+        argRecordData.InsTotalRoundedBy = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Math.round(argRecordData.InsTotal), argRecordData.InsTotal), DecimalsNumber);
         argRecordData.CustRoundedTotal = argRecordData.Total;
         argRecordData.InsRoundedTotal = Math.round(argRecordData.InsTotal);
         for (var key in argRecordData) {
@@ -685,7 +685,7 @@ class ROTotalsService {
                 key !== 'LDisc' && key !== 'LPerc' && key !== 'PDisc' &&
                 key !== 'PPerc' && key !== 'Disc' && key !== 'Perc' && key !== 'Tax'
                 && typeof argRecordData[key] === 'number') {
-                argRecordData[key] = tr_utils_1.TrUtils.FixPriceValue(argRecordData[key]);
+                argRecordData[key] = tr_utils_1.TrUtils.FixPriceValue(argRecordData[key], DecimalsNumber);
             }
         }
         return argRecordData;
@@ -1053,9 +1053,9 @@ class ROTotalsService {
         }
         return PartsPDiscAmt;
     }
-    static GetCustPartsTaxGrouping(PartsList, TaxCodes, isWorkOrder) {
+    static GetCustPartsTaxGrouping(PartsList, TaxCodes, isWorkOrder, DecimalsNumber) {
         let FilteredPartsList = this.GetCustParts(PartsList);
-        return this.GetCustTaxGroupingForPartsByHSN(FilteredPartsList, TaxCodes, isWorkOrder);
+        return this.GetCustTaxGroupingForPartsByHSN(FilteredPartsList, TaxCodes, isWorkOrder, DecimalsNumber);
     }
     static GetCustParts(PartsList) {
         let FilteredPartsList = PartsList.filter((Part) => {
@@ -1063,13 +1063,13 @@ class ROTotalsService {
         });
         return FilteredPartsList;
     }
-    static GetCustTaxGroupingForPartsByHSN(Parts, TaxCodes, isWorkOrder) {
+    static GetCustTaxGroupingForPartsByHSN(Parts, TaxCodes, isWorkOrder, DecimalsNumber) {
         Parts = this.GetCombinedTaxPercentage(Parts, TaxCodes);
         Parts = this.ResetPartsHSNIfInvalid(Parts);
         let FinalMatchedParts = this.ComparePartsByHSN(Parts, TaxCodes);
-        return this.GetCustTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, isWorkOrder);
+        return this.GetCustTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, isWorkOrder, DecimalsNumber);
     }
-    static GetCustTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, isWorkOrder) {
+    static GetCustTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, isWorkOrder, DecimalsNumber) {
         let HSNTaxInfo = [];
         FinalMatchedParts.forEach((MatchedPart) => {
             let TaxInfo = {};
@@ -1078,30 +1078,30 @@ class ROTotalsService {
             let HSN = MatchedPart[0].HSN;
             TaxInfo.CombinedTaxPercentage = MatchedPart[0].CombinedTaxPercentage;
             MatchedPart.forEach((argMatchedGSTPart) => {
-                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CustAfterPartDisc));
+                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CustAfterPartDisc, DecimalsNumber));
                 if (isWorkOrder) {
-                    TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CCGST));
-                    TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CIGST));
-                    TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CSGST));
+                    TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CCGST, DecimalsNumber));
+                    TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CIGST, DecimalsNumber));
+                    TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CSGST, DecimalsNumber));
                 }
                 else {
                     if (argMatchedGSTPart.Sts !== enums_1.LaborStatusEnum.New && argMatchedGSTPart.Sts !== enums_1.LaborStatusEnum.WtngForAppr) {
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CCGST));
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CIGST));
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CSGST));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CCGST, DecimalsNumber));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CIGST, DecimalsNumber));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.CSGST, DecimalsNumber));
                     }
                     else {
                         if (argMatchedGSTPart.PBy === enums_1.PayTypeEnum.Customer) {
-                            TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ECGST));
-                            TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.EIGST));
-                            TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ESGST));
+                            TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ECGST, DecimalsNumber));
+                            TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.EIGST, DecimalsNumber));
+                            TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ESGST, DecimalsNumber));
                         }
                     }
                 }
             });
             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.PartsCount = MatchedPart.length;
             let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
             TaxInfo.CGST = GSTValues[0];
@@ -1113,9 +1113,9 @@ class ROTotalsService {
         });
         return HSNTaxInfo;
     }
-    static GetInsPartsTaxGrouping(PartsList, TaxCodes) {
+    static GetInsPartsTaxGrouping(PartsList, TaxCodes, DecimalsNumber) {
         let FilteredPartsList = this.GetInsParts(PartsList);
-        return this.GetInsTaxGroupingForPartsByHSN(FilteredPartsList, TaxCodes);
+        return this.GetInsTaxGroupingForPartsByHSN(FilteredPartsList, TaxCodes, DecimalsNumber);
     }
     static GetInsParts(PartsList) {
         let FilteredPartsList = PartsList.filter((Part) => {
@@ -1123,13 +1123,13 @@ class ROTotalsService {
         });
         return FilteredPartsList;
     }
-    static GetInsTaxGroupingForPartsByHSN(Parts, TaxCodes) {
+    static GetInsTaxGroupingForPartsByHSN(Parts, TaxCodes, DecimalsNumber) {
         Parts = this.GetCombinedTaxPercentage(Parts, TaxCodes);
         Parts = this.ResetPartsHSNIfInvalid(Parts);
         let FinalMatchedParts = this.ComparePartsByHSN(Parts, TaxCodes);
-        return this.GetInsTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes);
+        return this.GetInsTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber);
     }
-    static GetInsTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes) {
+    static GetInsTaxGroupingInfoByHSN(FinalMatchedParts, TaxCodes, DecimalsNumber) {
         let HSNTaxInfo = [];
         FinalMatchedParts.forEach((MatchedPart) => {
             let TaxInfo = {};
@@ -1138,23 +1138,23 @@ class ROTotalsService {
             let HSN = MatchedPart[0].HSN;
             TaxInfo.CombinedTaxPercentage = MatchedPart[0].CombinedTaxPercentage;
             MatchedPart.forEach((argMatchedGSTPart) => {
-                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.InsAfterPartDisc));
+                TaxOnAmount = (0, aggregation_1.addition)(TaxOnAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.InsAfterPartDisc, DecimalsNumber));
                 if (argMatchedGSTPart.PBy === enums_1.PayTypeEnum.Insurance || argMatchedGSTPart.PBy === enums_1.PayTypeEnum.Shared) {
                     if (argMatchedGSTPart.Sts !== enums_1.LaborStatusEnum.New && argMatchedGSTPart.Sts !== enums_1.LaborStatusEnum.WtngForAppr) {
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ACGST));
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.AIGST));
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ASGST));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ACGST, DecimalsNumber));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.AIGST, DecimalsNumber));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ASGST, DecimalsNumber));
                     }
                     else {
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ECGST));
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.EIGST));
-                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ESGST));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ECGST, DecimalsNumber));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.EIGST, DecimalsNumber));
+                        TaxAmount = (0, aggregation_1.addition)(TaxAmount, tr_utils_1.TrUtils.FixedTo(argMatchedGSTPart.ESGST, DecimalsNumber));
                     }
                 }
             });
             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.PartsCount = MatchedPart.length;
             let GSTValues = this.GetGSTValueBasedOnTaxCode(MatchedPart[0].TCode, TaxCodes);
             TaxInfo.CGST = GSTValues[0];

package/dist/services/separate-wo-print.service.js

@@ -333,7 +333,7 @@ class WOPrintService {
     static CommonTotalDetails(ROPrintData, index, numberofCopies) {
         let CommonDetails = [
             shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, ROPrintData.CustLaborTotalBeforeDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalBeforeDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupData, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.Payee, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowDetailedLaborTaxInfo, ROPrintData.ShowDetailedPartTaxInfo, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, null, null, false),
-            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, false),
+            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, false, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),
             shared_pdf_service_1.SharedPDFService.GetSignatures(ROPrintData.Entity.CName, ROPrintData.Type, ROPrintData.Payee),

package/dist/shared/shared-pdf.service.d.ts

@@ -533,7 +533,7 @@ export declare class SharedPDFService {
         })[];
         marginLeft: number;
     };
-    static DebitGrandTotal(RecordData: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, totalTax: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, moreDiscDetails: boolean): {
+    static DebitGrandTotal(RecordData: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, totalTax: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, moreDiscDetails: boolean, DecimalsNumber: number): {
         style: string[];
         lineHeight: number;
         marginBottom: number;
@@ -566,7 +566,7 @@ export declare class SharedPDFService {
     };
     static GetTaxOnParts(BasicPartsTotal: any, OverAllMainPartsDiscount: any, PCGST: any, PSGST: any, ShowAccParts: any, PIGST: any, ShowIGST: any, ShowTaxColumn: any, ShowDetailedPartTaxInfo: any, From: string, Consolidate: boolean): any;
     static GetTaxOnLabor(BasicLaborTotal: any, OverAllMainLaborDiscount: any, LCGST: any, LSGST: any, LIGST: any, ShowIGST: any, ShowTaxColumn: any, ShowDetailedLaborTaxInfo: any, Consolidate: boolean): any;
-    static GrandTotal(RecordData: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, totalTax: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, Adj: any, Consolidate: any, subTotal: any, moreDiscDetails: boolean): {
+    static GrandTotal(RecordData: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, totalTax: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, Adj: any, Consolidate: any, subTotal: any, moreDiscDetails: boolean, DecimalsNumber: number): {
         style: string[];
         lineHeight: number;
         marginBottom: number;
@@ -586,7 +586,7 @@ export declare class SharedPDFService {
         layout: string;
     };
     static GrandTotalTable(data: any): any;
-    static InvoiceDueStatus(Type: any, Paid: any, Due: any, Status: any, isCounter: boolean): any;
+    static InvoiceDueStatus(Type: any, Paid: any, Due: any, Status: any, isCounter: boolean, DecimalsNumber: number): any;
     static DebitDueStatus(Type: any, Paid: any, Due: any, Status: any): {
         fontSize: number;
         marginTop: number;

package/dist/shared/shared-pdf.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharedPDFService = void 0;
+const aggregation_1 = require("../aggregation/aggregation");
 const enums_1 = require("../enums/enums");
 const my_date_1 = require("../utils/my-date");
 const tr_utils_1 = require("../utils/tr-utils");
@@ -1576,12 +1577,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
         let serviceName;
@@ -1626,27 +1627,27 @@ class SharedPDFService {
         ];
         if (moreDiscDetails) {
             if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
-                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc) });
+                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc, RecordData.Entity.DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.LDisc)) {
-                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc) });
+                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc, RecordData.Entity.DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.Disc)) {
-                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
+                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc, RecordData.Entity.DecimalsNumber) });
             }
         }
         else {
             AccountFields.push({ name: 'Discount', value: OverAllRecordDiscount });
         }
         if (!Consolidate) {
-            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(STotal) });
+            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(STotal, RecordData.Entity.DecimalsNumber) });
         }
         if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
             AccountFields.push({ name: 'Total Tax', value: totalTax });
         }
         if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
             if (Adj > 0) {
-                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj);
+                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj, RecordData.Entity.DecimalsNumber);
             }
             AccountFields.push({ name: 'Adjust', value: Adj });
         }
@@ -1705,12 +1706,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(LaborTotalTax) + Number(PartTotalTax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(LaborTotalTax), Number(PartTotalTax)), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainLaborDiscount) + Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
         return {
@@ -1725,7 +1726,7 @@ class SharedPDFService {
                 },
                 { text: '', width: moreDiscDetails ? 40 : 60 },
                 // this.GrandTotal(LaborAfterGST, PartsAfterGST, totalDisc, For, OverAllRecordTotal, Rounded, GrandTotal)
-                this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails)
+                this.GrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails, RecordData)
             ]
             // columnGap: 40
             ,
@@ -1736,12 +1737,12 @@ class SharedPDFService {
         let totalDisc;
         let totalTax;
         if (!Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(PartTotalTax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(PartTotalTax), RecordData.Entity.DecimalsNumber);
             if (istaxable) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount), RecordData.Entity.DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(OverAllMainPartsDiscount), RecordData.Entity.DecimalsNumber);
             }
         }
         return {
@@ -1757,21 +1758,21 @@ class SharedPDFService {
                 },
                 { text: '', width: 100 },
                 { text: '', width: 80 },
-                this.DebitGrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails)
+                this.DebitGrandTotal(RecordData, BasicLaborTotal, BasicPartsTotal, totalDisc, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails, RecordData.Entity.DecimalsNumber)
             ]
             // columnGap: 40
             ,
             marginLeft: 10
         };
     }
-    static DebitGrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails) {
+    static DebitGrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, moreDiscDetails, DecimalsNumber) {
         let AccountFields = [
             //   { name: 'Labor Total', value: LaborAfterGST },
             // { name: 'Part Total', value: PartsAfterGST },
-            { name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))) },
+            { name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), DecimalsNumber) },
         ];
         if (moreDiscDetails) {
-            AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
+            AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc, DecimalsNumber) });
         }
         else {
             AccountFields.push({ name: 'Discount', value: OverAllRecordDiscount });
@@ -1838,7 +1839,7 @@ class SharedPDFService {
                         this.GetTaxOnParts(ROPrintData.BasicPartsTotal, ROPrintData.OverAllMainPartsDiscount, ROPrintData.PCGST, ROPrintData.PSGST, ROPrintData.PIGST, ROPrintData.ShowIGST, ROPrintData.ShowAccParts, ROPrintData.ShowTaxColumn, ROPrintData.ShowDetailedPartTaxInfo, ROPrintData.Type, ROPrintData.Consolidate),
                         this.PartsTaxAmounts(ROPrintData.PartsTaxInfo, ROPrintData.ShowAccParts, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn)
                     ]
-                }, { text: '', width: 200 }, this.GrandTotal(ROPrintData, ROPrintData.LaborAfterGST, ROPrintData.PartsAfterGST, ROPrintData.OverAllRecordDiscount, null, ROPrintData.For, ROPrintData.OverAllRecordTotal, ROPrintData.Rounded, ROPrintData.GrandTotal, ROPrintData.Adj, ROPrintData.Consolidate, null, moreDiscDetails)
+                }, { text: '', width: 200 }, this.GrandTotal(ROPrintData, ROPrintData.LaborAfterGST, ROPrintData.PartsAfterGST, ROPrintData.OverAllRecordDiscount, null, ROPrintData.For, ROPrintData.OverAllRecordTotal, ROPrintData.Rounded, ROPrintData.GrandTotal, ROPrintData.Adj, ROPrintData.Consolidate, null, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)
             ]
             // columnGap: 40
             ,
@@ -1930,31 +1931,31 @@ class SharedPDFService {
             return this.emptyObject();
         }
     }
-    static GrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal, moreDiscDetails) {
+    static GrandTotal(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal, moreDiscDetails, DecimalsNumber) {
         let AccountFields = [
         //   { name: 'Labor Total', value: LaborAfterGST },
         // { name: 'Part Total', value: PartsAfterGST },
         ];
         if (moreDiscDetails) {
             if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
-                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc) });
+                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc, DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.LDisc)) {
-                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc) });
+                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.LDisc, DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(RecordData.Disc)) {
-                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc) });
+                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.Disc, DecimalsNumber) });
             }
         }
         else {
             AccountFields.push({ name: 'Discount', value: OverAllRecordDiscount });
         }
         if (!Consolidate && !tr_utils_1.TrUtils.IsNull(subTotal)) {
-            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal))) });
+            AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(subTotal)), DecimalsNumber) });
         }
         else {
             if (!Consolidate) {
-                AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))) });
+                AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
             }
         }
         if (!tr_utils_1.TrUtils.IsEmpty(totalTax)) {
@@ -1962,7 +1963,7 @@ class SharedPDFService {
         }
         if (!tr_utils_1.TrUtils.IsEmpty(Adj)) {
             if (Adj > 0) {
-                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj);
+                Adj = '+' + tr_utils_1.TrUtils.FixPriceValue(Adj, DecimalsNumber);
             }
             AccountFields.push({ name: 'Adjust', value: Adj });
         }
@@ -2083,7 +2084,7 @@ class SharedPDFService {
         });
         return body;
     }
-    static InvoiceDueStatus(Type, Paid, Due, Status, isCounter) {
+    static InvoiceDueStatus(Type, Paid, Due, Status, isCounter, DecimalsNumber) {
         if (Type === 'Invoice' && !isCounter) {
             return {
                 // lineHeight: 0.7,
@@ -2092,8 +2093,8 @@ class SharedPDFService {
                 marginBottom: 5,
                 table: {
                     widths: [200, 174, 174],
-                    body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid) },
-                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due) },
+                    body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid, DecimalsNumber) },
+                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) },
                             { text: 'Status : ' + Status }]]
                 },
                 layout: this.LayOutStyle(),

package/dist/utils/tr-utils.d.ts

@@ -5,7 +5,7 @@ export declare class TrUtils {
     static IsFixedZero(Value: any): boolean;
     static Stringify(RecordData: any): any;
     static ConcatObjects(obj1: any, obj2: any): any;
-    static ConvertPercToVal(Discount: any, Total: any): number | null;
+    static ConvertPercToVal(Discount: any, Total: any, DecimalsNumber?: number): number | null;
     static FixedTo(value: any, DecimalsNumber?: number): number;
     static FixPriceValue(Value: any, DecimalsNumber?: number): string;
     static SetValueToZeroIfNull(Value: any): any;

package/dist/utils/tr-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrUtils = void 0;
+const aggregation_1 = require("../aggregation/aggregation");
 class TrUtils {
     // static DecimalsNumber:number=2;
     static IsNull(Value) {
@@ -29,7 +30,7 @@ class TrUtils {
         }
         return obj1;
     }
-    static ConvertPercToVal(Discount, Total) {
+    static ConvertPercToVal(Discount, Total, DecimalsNumber = 2) {
         if (this.IsNull(Total)) {
             return null;
         }
@@ -40,7 +41,7 @@ class TrUtils {
             if (this.IsNull(Total)) {
                 Total = 0;
             }
-            let value = this.FixedTo(((Total * Discount) / 100));
+            let value = this.FixedTo((0, aggregation_1.division)((0, aggregation_1.multiply)(Total, Discount), 100), DecimalsNumber);
             if (isNaN(value)) {
                 value = 0;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.4.49",
+  "version": "1.4.51",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",