shareneus 1.4.50 → 1.4.52

package/dist/accounting/counter-sales/auto-sales-receipt-pdf.service.js

@@ -452,7 +452,7 @@ class SalesReceiptprintService {
         // console.log('ROPrintData', ROPrintData);
         let CommonDetails = [
             shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupData, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, null, moreDiscDetails),
-            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale),
+            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
             shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),

package/dist/accounting/counter-sales/sales-receipt-pdf.service.js

@@ -595,7 +595,7 @@ class SalesReceiptpdfService {
     static CommonTotalDetails(ROPrintData, index, numberofCopies, moreDiscDetails) {
         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.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, null, moreDiscDetails),
-            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.For),

package/dist/accounting/counter-sales/sales-receipt-print.service.js

@@ -409,7 +409,7 @@ class SaleReceiptPrintService {
             Data.Due = 0;
         }
         else {
-            Data.Due = tr_utils_1.TrUtils.FixedTo((Total - PaidTotal), DecimalsNumber);
+            Data.Due = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Total, PaidTotal), DecimalsNumber);
         }
         if (Data.Due < 0) {
             Data.Due = 0;

package/dist/accounting/credit-note/credit-note-pdf.service.js

@@ -564,7 +564,7 @@ class CreditNotePdfService {
     static CommonTotalDetails(ROPrintData, moreDiscDetails) {
         let CommonDetails = [
             shared_pdf_service_1.SharedPDFService.GetDebitTotalDetails(ROPrintData, 0, 0, 0, 0, 0, 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.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, moreDiscDetails),
-            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.For),

package/dist/accounting/debit-note/debit-note-print.service.js

@@ -220,7 +220,7 @@ class DebitNotePrintService {
             Data.Due = 0;
         }
         else {
-            Data.Due = tr_utils_1.TrUtils.FixedTo((Total - PaidTotal), DecimalsNumber);
+            Data.Due = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Total, PaidTotal), DecimalsNumber);
         }
         if (Data.Due < 0) {
             Data.Due = 0;

package/dist/accounting/invoice/inv-pdf.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoiceprintService = void 0;
+const aggregation_1 = require("../../aggregation/aggregation");
 const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const shared_print_service_1 = require("../../shared/shared-print.service");
 const my_date_1 = require("../../utils/my-date");
@@ -193,12 +194,12 @@ class InvoiceprintService {
                 let FinalTotal = 0;
                 Parts.forEach((part) => {
                     // console.log('part', part);
-                    Qty = Qty + tr_utils_1.TrUtils.FixedTo(part.Qty, DecimalsNumber);
-                    CGSTAMT = CGSTAMT + tr_utils_1.TrUtils.FixedTo(part.CGSTAmt, DecimalsNumber);
-                    SGSTAMT = SGSTAMT + tr_utils_1.TrUtils.FixedTo(part.SGSTAmt, DecimalsNumber);
-                    IGSTAMT = IGSTAMT + tr_utils_1.TrUtils.FixedTo(part.IGSTAmt, DecimalsNumber);
-                    Taxable = Taxable + tr_utils_1.TrUtils.FixedTo(part.AfterPartDisc, DecimalsNumber);
-                    FinalTotal = FinalTotal + tr_utils_1.TrUtils.FixedTo(part.AfterPartTax, DecimalsNumber);
+                    Qty = (0, aggregation_1.addition)(Qty, tr_utils_1.TrUtils.FixedTo(part.Qty, DecimalsNumber));
+                    CGSTAMT = (0, aggregation_1.addition)(CGSTAMT, tr_utils_1.TrUtils.FixedTo(part.CGSTAmt, DecimalsNumber));
+                    SGSTAMT = (0, aggregation_1.addition)(SGSTAMT, tr_utils_1.TrUtils.FixedTo(part.SGSTAmt, DecimalsNumber));
+                    IGSTAMT = (0, aggregation_1.addition)(IGSTAMT, tr_utils_1.TrUtils.FixedTo(part.IGSTAmt, DecimalsNumber));
+                    Taxable = (0, aggregation_1.addition)(Taxable, tr_utils_1.TrUtils.FixedTo(part.AfterPartDisc, DecimalsNumber));
+                    FinalTotal = (0, aggregation_1.addition)(FinalTotal, tr_utils_1.TrUtils.FixedTo(part.AfterPartTax, DecimalsNumber));
                 });
                 let dpartadding1 = {};
                 dpartadding1.SNo = '';
@@ -312,11 +313,11 @@ class InvoiceprintService {
                 Labor.forEach((operation) => {
                     // console.log('operation', operation);
                     // Qty = Qty + operation.Qty;
-                    CGSTAMT = CGSTAMT + tr_utils_1.TrUtils.FixedTo(operation.CGSTAmt, DecimalsNumber);
-                    SGSTAMT = SGSTAMT + tr_utils_1.TrUtils.FixedTo(operation.SGSTAmt, DecimalsNumber);
-                    IGSTAMT = IGSTAMT + tr_utils_1.TrUtils.FixedTo(operation.IGSTAmt, DecimalsNumber);
-                    Taxable = Taxable + tr_utils_1.TrUtils.FixedTo(operation.AfterLaborDisc, DecimalsNumber);
-                    FinalTotal = FinalTotal + tr_utils_1.TrUtils.FixedTo(operation.AfterLaborTax, DecimalsNumber);
+                    CGSTAMT = (0, aggregation_1.addition)(CGSTAMT, tr_utils_1.TrUtils.FixedTo(operation.CGSTAmt, DecimalsNumber));
+                    SGSTAMT = (0, aggregation_1.addition)(SGSTAMT, tr_utils_1.TrUtils.FixedTo(operation.SGSTAmt, DecimalsNumber));
+                    IGSTAMT = (0, aggregation_1.addition)(IGSTAMT, tr_utils_1.TrUtils.FixedTo(operation.IGSTAmt, DecimalsNumber));
+                    Taxable = (0, aggregation_1.addition)(Taxable, tr_utils_1.TrUtils.FixedTo(operation.AfterLaborDisc, DecimalsNumber));
+                    FinalTotal = (0, aggregation_1.addition)(FinalTotal, tr_utils_1.TrUtils.FixedTo(operation.AfterLaborTax, DecimalsNumber));
                 });
                 let dpartadding1 = {};
                 dpartadding1.SNo = '';
@@ -689,7 +690,7 @@ class InvoiceprintService {
             //     ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj,ROPrintData.STotal),
             shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupDataByPerc, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, ROPrintData.CustLaborTaxGroupDataByPerc, ROPrintData.STotal, isAuto, moreDiscDetails),
             this.GetNumberInWords(ROPrintData.CustRoundedTotal),
-            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale),
+            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
             this.GetBanckdetailswithQRCode(ROPrintData),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),

package/dist/accounting/invoice/inv-print.service.js

@@ -239,11 +239,11 @@ class InvPrintService {
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
         Items.forEach((Item) => {
             if (Consolidate) {
-                let AfterDiscForEach = Item.AfterPartDisc / Item.Qty;
-                let CTaxAmtPerItem = Item.CGST / Item.Qty;
-                let STaxAmtPerItem = Item.SGST / Item.Qty;
-                let ITaxAmtPerItem = Item.IGST / Item.Qty;
-                Item.UnPr = tr_utils_1.TrUtils.FixedTo((AfterDiscForEach + CTaxAmtPerItem + STaxAmtPerItem + ITaxAmtPerItem), DecimalsNumber);
+                let AfterDiscForEach = (0, aggregation_1.division)(Item.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);
             }
             else {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
@@ -446,7 +446,7 @@ class InvPrintService {
             Data.Due = 0;
         }
         else {
-            Data.Due = tr_utils_1.TrUtils.FixedTo((Total - PaidTotal), DecimalsNumber);
+            Data.Due = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Total, PaidTotal), DecimalsNumber);
         }
         if (Data.Due < 0) {
             Data.Due = 0;

package/dist/accounting/invoice/invoice-landscape-pdf.service.d.ts

@@ -399,7 +399,7 @@ export declare class InvoiceLandscapePdfService {
         text: string[];
         marginLeft: number;
     };
-    static TotalDetails(ROPrintData: any, moreDiscDetails: boolean): {
+    static TotalDetails(ROPrintData: any, moreDiscDetails: boolean, DecimalsNumber: number): {
         style: string;
         marginTop: number;
         table: {

package/dist/accounting/invoice/invoice-landscape-pdf.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoiceLandscapePdfService = void 0;
+const aggregation_1 = require("../../aggregation/aggregation");
 const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const shared_print_service_1 = require("../../shared/shared-print.service");
 const my_date_1 = require("../../utils/my-date");
@@ -833,7 +834,7 @@ class InvoiceLandscapePdfService {
             //     ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn,
             //     TrUtils.isTaxable(ROPrintData.Settings.Tax), '0.00',
             //     ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, null),
-            this.TotalDetails(ROPrintData, moreDiscDetails),
+            this.TotalDetails(ROPrintData, moreDiscDetails, ROPrintData.Entity.DecimalsNumber),
             // SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
             // SharedPDFService.GetUnderLine(),
@@ -875,16 +876,16 @@ class InvoiceLandscapePdfService {
             text: ['Customer Signature'], marginLeft: 90
         };
     }
-    static TotalDetails(ROPrintData, moreDiscDetails) {
+    static TotalDetails(ROPrintData, moreDiscDetails, DecimalsNumber) {
         let totalDisc;
         let totalTax;
         if (!ROPrintData.Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborITax) + Number(ROPrintData.CustPartITax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(ROPrintData.CustLaborITax), Number(ROPrintData.CustPartITax), DecimalsNumber));
             if (tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(ROPrintData.CustLaborDiscTotal), Number(ROPrintData.CustPartsDiscTotal), DecimalsNumber));
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(ROPrintData.CustLaborDiscTotal), Number(ROPrintData.CustPartsDiscTotal), DecimalsNumber));
             }
         }
         return [
@@ -902,7 +903,7 @@ class InvoiceLandscapePdfService {
                             //     ROPrintData.ShowTaxColumn, ROPrintData.From),
                             shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
                             {
-                                columns: [{ text: '', width: moreDiscDetails ? 153 : 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails)]
+                                columns: [{ text: '', width: moreDiscDetails ? 153 : 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)]
                             }
                             // SharedPDFService.GetCustomer(ROPrintData.Customer, ROPrintData.Type, ROPrintData.For,
                             //     ROPrintData.Product, ROPrintData.Settings, 'Customer Name & Address', false)

package/dist/accounting/invoice/invoice-letterhead-pdf.service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoiceLetterheadPdfService = void 0;
+const aggregation_1 = require("../../aggregation/aggregation");
 const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const shared_print_service_1 = require("../../shared/shared-print.service");
 const my_date_1 = require("../../utils/my-date");
@@ -193,12 +194,12 @@ class InvoiceLetterheadPdfService {
                 let FinalTotal = 0;
                 Parts.forEach((part) => {
                     // console.log('part', part);
-                    Qty = Qty + tr_utils_1.TrUtils.FixedTo(part.Qty, DecimalsNumber);
-                    CGSTAMT = CGSTAMT + tr_utils_1.TrUtils.FixedTo(part.CGSTAmt, DecimalsNumber);
-                    SGSTAMT = SGSTAMT + tr_utils_1.TrUtils.FixedTo(part.SGSTAmt, DecimalsNumber);
-                    IGSTAMT = IGSTAMT + tr_utils_1.TrUtils.FixedTo(part.IGSTAmt, DecimalsNumber);
-                    Taxable = Taxable + tr_utils_1.TrUtils.FixedTo(part.AfterPartDisc, DecimalsNumber);
-                    FinalTotal = FinalTotal + tr_utils_1.TrUtils.FixedTo(part.AfterPartTax, DecimalsNumber);
+                    Qty = (0, aggregation_1.addition)(Qty, tr_utils_1.TrUtils.FixedTo(part.Qty, DecimalsNumber));
+                    CGSTAMT = (0, aggregation_1.addition)(CGSTAMT, tr_utils_1.TrUtils.FixedTo(part.CGSTAmt, DecimalsNumber));
+                    SGSTAMT = (0, aggregation_1.addition)(SGSTAMT, tr_utils_1.TrUtils.FixedTo(part.SGSTAmt, DecimalsNumber));
+                    IGSTAMT = (0, aggregation_1.addition)(IGSTAMT, tr_utils_1.TrUtils.FixedTo(part.IGSTAmt, DecimalsNumber));
+                    Taxable = (0, aggregation_1.addition)(Taxable, tr_utils_1.TrUtils.FixedTo(part.AfterPartDisc, DecimalsNumber));
+                    FinalTotal = (0, aggregation_1.addition)(FinalTotal, tr_utils_1.TrUtils.FixedTo(part.AfterPartTax, DecimalsNumber));
                 });
                 let dpartadding1 = {};
                 dpartadding1.SNo = '';
@@ -312,11 +313,11 @@ class InvoiceLetterheadPdfService {
                 Labor.forEach((operation) => {
                     // console.log('operation', operation);
                     // Qty = Qty + operation.Qty;
-                    CGSTAMT = CGSTAMT + tr_utils_1.TrUtils.FixedTo(operation.CGSTAmt, DecimalsNumber);
-                    SGSTAMT = SGSTAMT + tr_utils_1.TrUtils.FixedTo(operation.SGSTAmt, DecimalsNumber);
-                    IGSTAMT = IGSTAMT + tr_utils_1.TrUtils.FixedTo(operation.IGSTAmt, DecimalsNumber);
-                    Taxable = Taxable + tr_utils_1.TrUtils.FixedTo(operation.AfterLaborDisc, DecimalsNumber);
-                    FinalTotal = FinalTotal + tr_utils_1.TrUtils.FixedTo(operation.AfterLaborTax, DecimalsNumber);
+                    CGSTAMT = (0, aggregation_1.addition)(CGSTAMT, tr_utils_1.TrUtils.FixedTo(operation.CGSTAmt, DecimalsNumber));
+                    SGSTAMT = (0, aggregation_1.addition)(SGSTAMT, tr_utils_1.TrUtils.FixedTo(operation.SGSTAmt, DecimalsNumber));
+                    IGSTAMT = (0, aggregation_1.addition)(IGSTAMT, tr_utils_1.TrUtils.FixedTo(operation.IGSTAmt, DecimalsNumber));
+                    Taxable = (0, aggregation_1.addition)(Taxable, tr_utils_1.TrUtils.FixedTo(operation.AfterLaborDisc, DecimalsNumber));
+                    FinalTotal = (0, aggregation_1.addition)(FinalTotal, tr_utils_1.TrUtils.FixedTo(operation.AfterLaborTax, DecimalsNumber));
                 });
                 let dpartadding1 = {};
                 dpartadding1.SNo = '';
@@ -689,7 +690,7 @@ class InvoiceLetterheadPdfService {
             //     ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj,ROPrintData.STotal),
             shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupDataByPerc, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, ROPrintData.CustLaborTaxGroupDataByPerc, ROPrintData.STotal, isAuto, moreDiscDetails),
             this.GetNumberInWords(ROPrintData.CustRoundedTotal),
-            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale),
+            shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
             this.GetBanckdetailswithQRCode(ROPrintData),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),

package/dist/accounting/invoice/invoice-portrait-pdf.d.ts

@@ -5,7 +5,7 @@ export declare class InvoicePortraitPrintService {
         hLineColor: (i: any, node: any) => "gray" | "white";
         vLineColor: (i: any, node: any) => "gray" | "white";
     };
-    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 GetMainHeaderInfo(InvoicePDFData: any): {
         columns: ({
             image: any;
@@ -148,7 +148,7 @@ export declare class InvoicePortraitPrintService {
         text: string[];
         marginLeft: number;
     };
-    static GetItemsTable(Services: any, Items: any, ShowTaxColumn: boolean, SType: any, printOptions: any, size: any): {
+    static GetItemsTable(Services: any, Items: any, ShowTaxColumn: boolean, SType: any, printOptions: any, size: any, DecimalsNumber: number): {
         style: string;
         marginTop: number;
         marginBottom: number;
@@ -166,9 +166,9 @@ export declare class InvoicePortraitPrintService {
     };
     static GetWidths(ShowTaxColumn: any, printOptions: any): (string | number)[];
     static GetAddress(Entity: any): string;
-    static BuildTableBodyForLaborAndParts(Services: any, Items: any, ShowTaxColumn: any, SType: any, printOptions: any, size: any): any;
+    static BuildTableBodyForLaborAndParts(Services: any, Items: any, ShowTaxColumn: any, SType: any, printOptions: any, size: any, DecimalsNumber: number): any;
     static GetHeaderNames(ShowTaxColumn: any, SType: any, printOptions: any): any;
-    static TotalDetails(ROPrintData: any, moreDiscDetails: boolean): {
+    static TotalDetails(ROPrintData: any, moreDiscDetails: boolean, DecimalsNumber: number): {
         style: string;
         marginTop: number;
         table: {
@@ -221,7 +221,7 @@ export declare class InvoicePortraitPrintService {
             };
         }[];
     };
-    static GrandTotal(InvoiceData: 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(InvoiceData: 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;

package/dist/accounting/invoice/invoice-portrait-pdf.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoicePortraitPrintService = void 0;
+const aggregation_1 = require("../../aggregation/aggregation");
 const enums_1 = require("../../enums/enums");
 const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const my_date_1 = require("../../utils/my-date");
@@ -36,9 +37,9 @@ class InvoicePortraitPrintService {
                     },
                     layout: this.HeaderLayOut()
                 },
-                this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.SType, printOptions, size),
-                [this.TotalDetails(InvoicePDFData, moreDiscDetails)],
-                [this.InvoiceDueStatus(InvoicePDFData.Type, InvoicePDFData.Paid, InvoicePDFData.Due, InvoicePDFData.Sts, InvoicePDFData.isCountersale),
+                this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.SType, printOptions, size, InvoicePDFData.Entity.DecimalsNumber),
+                [this.TotalDetails(InvoicePDFData, moreDiscDetails, InvoicePDFData.Entity.DecimalsNumber)],
+                [this.InvoiceDueStatus(InvoicePDFData.Type, InvoicePDFData.Paid, InvoicePDFData.Due, InvoicePDFData.Sts, InvoicePDFData.isCountersale, InvoicePDFData.Entity.DecimalsNumber)
                 ],
                 {
                     style: 'tableExample',
@@ -102,7 +103,7 @@ class InvoicePortraitPrintService {
             }
         };
     }
-    static InvoiceDueStatus(Type, Paid, Due, Status, isCounter) {
+    static InvoiceDueStatus(Type, Paid, Due, Status, isCounter, DecimalsNumber) {
         if (Type === 'Invoice' && !isCounter) {
             return {
                 // lineHeight: 0.7,
@@ -111,8 +112,8 @@ class InvoicePortraitPrintService {
                 marginBottom: 5,
                 table: {
                     widths: ['*', '*', '*'],
-                    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(),
@@ -379,7 +380,7 @@ class InvoicePortraitPrintService {
             text: ['Customer Signature'], marginLeft: 90
         };
     }
-    static GetItemsTable(Services, Items, ShowTaxColumn, SType, printOptions, size) {
+    static GetItemsTable(Services, Items, ShowTaxColumn, SType, printOptions, size, DecimalsNumber) {
         return {
             style: 'tableExample',
             marginTop: 3,
@@ -387,7 +388,7 @@ class InvoicePortraitPrintService {
             table: {
                 widths: this.GetWidths(ShowTaxColumn, printOptions),
                 headerRows: 1,
-                body: this.BuildTableBodyForLaborAndParts(Services, Items, ShowTaxColumn, SType, printOptions, size)
+                body: this.BuildTableBodyForLaborAndParts(Services, Items, ShowTaxColumn, SType, printOptions, size, DecimalsNumber)
             },
             layout: {
                 hLineWidth: function (i, node) {
@@ -426,7 +427,7 @@ class InvoicePortraitPrintService {
     static GetAddress(Entity) {
         return Entity.Adrs1 + ', ' + Entity.Adrs2 + ', ' + Entity.City + '-' + Entity.PIN + ', Cell : ' + Entity.Phone;
     }
-    static BuildTableBodyForLaborAndParts(Services, Items, ShowTaxColumn, SType, printOptions, size) {
+    static BuildTableBodyForLaborAndParts(Services, Items, ShowTaxColumn, SType, printOptions, size, DecimalsNumber) {
         let body = this.GetHeaderNames(ShowTaxColumn, SType, printOptions);
         let j = 1;
         if (!tr_utils_1.TrUtils.IsNull(Services) && Services.length !== 0) {
@@ -443,20 +444,20 @@ class InvoicePortraitPrintService {
                 dataRow.push({ text: item.Qty, alignment: 'right', style: ['headerstyle'], });
                 dataRow.push({ text: '', alignment: 'right', style: ['headerstyle'], });
                 dataRow.push({ text: '', alignment: 'right', style: ['headerstyle'], });
-                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Pr), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Pr, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                 if (printOptions.Disc !== 'NO') {
                     if (printOptions.Disc === 'PERC') {
-                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.DiscPerc), alignment: 'right', style: ['headerstyle'], });
+                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.DiscPerc, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                     }
                     else {
-                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Disc), alignment: 'right', style: ['headerstyle'], });
+                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Disc, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                     }
                 }
                 if (ShowTaxColumn && printOptions.ShowTax !== 'NO') {
                     let Tax = (_a = item.TaxName) === null || _a === void 0 ? void 0 : _a.split('%');
                     dataRow.push({ text: tr_utils_1.TrUtils.IsNull(Tax) ? '' : Tax[0], alignment: 'right', style: ['headerstyle'], });
                 }
-                dataRow.push({ text: item.Ret ? '-' + tr_utils_1.TrUtils.FixPriceValue(item.LineTotal) : tr_utils_1.TrUtils.FixPriceValue(item.LineTotal), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: item.Ret ? '-' + tr_utils_1.TrUtils.FixPriceValue(item.LineTotal, DecimalsNumber) : tr_utils_1.TrUtils.FixPriceValue(item.LineTotal, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                 body.push(dataRow);
                 if (index + 1 === j * 9) {
                     j++;
@@ -511,21 +512,21 @@ class InvoicePortraitPrintService {
                 dataRow.push({ text: my_date_1.MyDate.ConvertUTCDateToReadableExDate((_b = item['Batch']) === null || _b === void 0 ? void 0 : _b.ExDt), alignment: 'center', style: ['headerstyle'], });
                 dataRow.push({ text: item.QtyAndUoM, alignment: 'right', style: ['headerstyle'], });
                 dataRow.push({ text: item.OfQty, alignment: 'right', style: ['headerstyle'], });
-                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.MRP), alignment: 'right', style: ['headerstyle'], });
-                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.UnPr), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.MRP, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.UnPr, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                 if (printOptions.Disc !== 'NO') {
                     if (printOptions.Disc === 'PERC') {
-                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.DiscPerc), alignment: 'right', style: ['headerstyle'], });
+                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.DiscPerc, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                     }
                     else {
-                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Disc), alignment: 'right', style: ['headerstyle'], });
+                        dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(item.Disc, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                     }
                 }
                 if (ShowTaxColumn && printOptions.ShowTax !== 'NO') {
                     let Tax = (_c = item.TaxName) === null || _c === void 0 ? void 0 : _c.split('%');
                     dataRow.push({ text: tr_utils_1.TrUtils.IsNull(Tax) ? '' : Number(Tax[0]), alignment: 'right', style: ['headerstyle'], });
                 }
-                dataRow.push({ text: item.Ret ? '-' + tr_utils_1.TrUtils.FixPriceValue(item.LineTotal) : tr_utils_1.TrUtils.FixPriceValue(item.LineTotal), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: item.Ret ? '-' + tr_utils_1.TrUtils.FixPriceValue(item.LineTotal, DecimalsNumber) : tr_utils_1.TrUtils.FixPriceValue(item.LineTotal, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                 body.push(dataRow);
                 if (index + 1 === j * 9) {
                     j++;
@@ -579,16 +580,16 @@ class InvoicePortraitPrintService {
         }
         return HeadingNames;
     }
-    static TotalDetails(ROPrintData, moreDiscDetails) {
+    static TotalDetails(ROPrintData, moreDiscDetails, DecimalsNumber) {
         let totalDisc;
         let totalTax;
         if (!ROPrintData.Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborITax) + Number(ROPrintData.CustPartITax));
+            totalTax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(ROPrintData.CustLaborITax), Number(ROPrintData.CustPartITax)), DecimalsNumber);
             if (tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(ROPrintData.CustLaborDiscTotal), Number(ROPrintData.CustPartsDiscTotal)), DecimalsNumber);
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
+                totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(ROPrintData.CustLaborDiscTotal), Number(ROPrintData.CustPartsDiscTotal)), DecimalsNumber);
             }
         }
         return [
@@ -601,7 +602,7 @@ class InvoicePortraitPrintService {
                         [
                             this.PartsTaxAmounts(ROPrintData.CustTaxGroupData, true, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn),
                             {
-                                columns: [{ text: '', width: moreDiscDetails ? 120 : 150 }, this.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, ROPrintData.STotal, moreDiscDetails)]
+                                columns: [{ text: '', width: moreDiscDetails ? 120 : 150 }, this.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, ROPrintData.STotal, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)],
                             }
                         ],
                     ]
@@ -620,28 +621,28 @@ class InvoicePortraitPrintService {
             return '';
         }
     }
-    static GrandTotal(InvoiceData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal, moreDiscDetails) {
+    static GrandTotal(InvoiceData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, subTotal, moreDiscDetails, DecimalsNumber) {
         let AccountFields = [];
         if (moreDiscDetails) {
             if (!tr_utils_1.TrUtils.IsZero(InvoiceData.PDisc)) {
-                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.PDisc) });
+                AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.PDisc, DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(InvoiceData.LDisc)) {
-                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.LDisc) });
+                AccountFields.push({ name: 'Services Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.LDisc, DecimalsNumber) });
             }
             if (!tr_utils_1.TrUtils.IsZero(InvoiceData.Disc)) {
-                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.Disc) });
+                AccountFields.push({ name: 'Overall Discount', value: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.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)) {
@@ -649,7 +650,7 @@ class InvoicePortraitPrintService {
         }
         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 });
         }

package/dist/accounting/invoice/invoice-total.service.js

@@ -156,7 +156,7 @@ class InvoiceTotalsService {
         let CustPartsTotalAfterDisc1 = this.GetPartsAfterDiscount1(PartsList);
         let AmtAfterIndvidualItemDisc = (0, aggregation_1.addition)(CustLaborTotalAfterDisc1, CustPartsTotalAfterDisc1);
         finalTotalsData.SIndTotal = AmtAfterIndvidualItemDisc;
-        finalTotalsData.Disc = !tr_utils_1.TrUtils.IsEmpty(finalTotalsData.Perc) ? tr_utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc) : finalTotalsData.Disc;
+        finalTotalsData.Disc = !tr_utils_1.TrUtils.IsEmpty(finalTotalsData.Perc) ? tr_utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustPartTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
         let RetCustTotal = this.GetRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, RetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);
         let NonRetCustTotal = this.GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, NonRetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);

package/dist/accounting/invoice/reports/excel/sa-wise-labor-sales-excel.service.d.ts

@@ -13,11 +13,11 @@ export declare class ServiceAdvisorWiseLaborXlsxFileService {
         };
     };
     static ws: any;
-    static GetServiceAdvisorLaborsExcelData(MainData: any): any;
+    static GetServiceAdvisorLaborsExcelData(MainData: any, EntitySettings: any): any;
     static setHeadingInCell(): void;
-    static setWorkOrderDetailsInCell(MainData: any): void;
-    static SetWorkOrderDataInExcel(WorkOrder: any, index: any): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setWorkOrderDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetWorkOrderDataInExcel(WorkOrder: any, index: 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/accounting/invoice/reports/excel/sa-wise-labor-sales-excel.service.js

@@ -27,8 +27,9 @@ exports.ServiceAdvisorWiseLaborXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));
 const my_date_1 = require("../../../../utils/my-date");
 const tr_utils_1 = require("../../../../utils/tr-utils");
+const aggregation_1 = require("../../../../aggregation/aggregation");
 class ServiceAdvisorWiseLaborXlsxFileService {
-    static GetServiceAdvisorLaborsExcelData(MainData) {
+    static GetServiceAdvisorLaborsExcelData(MainData, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -41,7 +42,7 @@ class ServiceAdvisorWiseLaborXlsxFileService {
         this.wb.SheetNames = [];
         // MainData = this.GetTotals(MainData);
         this.setHeadingInCell();
-        this.setWorkOrderDetailsInCell(MainData);
+        this.setWorkOrderDetailsInCell(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: 40 }, { wch: 15 }, { wch: 15 }, { wch: 40 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }];
@@ -139,17 +140,17 @@ class ServiceAdvisorWiseLaborXlsxFileService {
         });
         this.Row += 2;
     }
-    static setWorkOrderDetailsInCell(MainData) {
+    static setWorkOrderDetailsInCell(MainData, DecimalsNumber) {
         MainData.forEach((InvoiceList, index) => {
-            this.SetWorkOrderDataInExcel(InvoiceList, index);
+            this.SetWorkOrderDataInExcel(InvoiceList, index, DecimalsNumber);
         });
     }
-    static SetWorkOrderDataInExcel(WorkOrder, index) {
+    static SetWorkOrderDataInExcel(WorkOrder, index, DecimalsNumber) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         WorkOrder.CrDate = my_date_1.MyDate.ConvertUTCDateToReadable(WorkOrder.CrDate);
-        WorkOrder.Discount = tr_utils_1.TrUtils.FixPriceValue(tr_utils_1.TrUtils.SetValueToZeroIfNull((_a = WorkOrder.Ops) === null || _a === void 0 ? void 0 : _a.Disc) + tr_utils_1.TrUtils.SetValueToZeroIfNull((_b = WorkOrder.Ops) === null || _b === void 0 ? void 0 : _b.RecDisc));
-        WorkOrder.Tax = tr_utils_1.TrUtils.FixPriceValue(((_c = WorkOrder.Ops) === null || _c === void 0 ? void 0 : _c.CGST) + ((_d = WorkOrder.Ops) === null || _d === void 0 ? void 0 : _d.SGST) + ((_e = WorkOrder.Ops) === null || _e === void 0 ? void 0 : _e.IGST));
-        WorkOrder.Total = tr_utils_1.TrUtils.FixPriceValue(((_f = WorkOrder.Ops) === null || _f === void 0 ? void 0 : _f.NetAmt) + Number(WorkOrder.Tax));
+        WorkOrder.Discount = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(tr_utils_1.TrUtils.SetValueToZeroIfNull((_a = WorkOrder.Ops) === null || _a === void 0 ? void 0 : _a.Disc), tr_utils_1.TrUtils.SetValueToZeroIfNull((_b = WorkOrder.Ops) === null || _b === void 0 ? void 0 : _b.RecDisc)), DecimalsNumber);
+        WorkOrder.Tax = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)((_c = WorkOrder.Ops) === null || _c === void 0 ? void 0 : _c.CGST, (_d = WorkOrder.Ops) === null || _d === void 0 ? void 0 : _d.SGST, (_e = WorkOrder.Ops) === null || _e === void 0 ? void 0 : _e.IGST), DecimalsNumber);
+        WorkOrder.Total = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)((_f = WorkOrder.Ops) === null || _f === void 0 ? void 0 : _f.NetAmt, Number(WorkOrder.Tax)), DecimalsNumber);
         // if(!TrUtils.IsNull(WorkOrder.Prod) && !TrUtils.IsNull(WorkOrder.Prod.DDate)){
         //     WorkOrder.Prod.DDate= TrUtils.ConvertDateToReadableFormat(WorkOrder.Prod.DDate);
         // }else{
@@ -174,7 +175,7 @@ class ServiceAdvisorWiseLaborXlsxFileService {
         ];
         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 },
@@ -184,7 +185,7 @@ class ServiceAdvisorWiseLaborXlsxFileService {
         });
         this.Row += 1;
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -196,7 +197,7 @@ class ServiceAdvisorWiseLaborXlsxFileService {
             }
         }
         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/accounting/invoice/reports/excel/sa-wise-part-sales-excel.service.d.ts

@@ -13,11 +13,11 @@ export declare class ServiceAdvisorWisePartXlsxFileService {
         };
     };
     static ws: any;
-    static GetServiceAdvisorPartsExcelData(MainData: any): any;
+    static GetServiceAdvisorPartsExcelData(MainData: any, EntitySettings: any): any;
     static setHeadingInCell(): void;
-    static setWorkOrderDetailsInCell(MainData: any): void;
-    static SetWorkOrderDataInExcel(WorkOrder: any, index: any): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setWorkOrderDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetWorkOrderDataInExcel(WorkOrder: any, index: 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;
 }