shareneus 1.4.49 → 1.4.51

package/dist/purchases/payment-made/reports/excel/ven-balance-excel.service.js

@@ -27,7 +27,7 @@ exports.VenBalanceXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));
 const tr_utils_1 = require("../../../../utils/tr-utils");
 class VenBalanceXlsxFileService {
-    static GetInvoiceWiseExcelData(MainData) {
+    static GetInvoiceWiseExcelData(MainData, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -40,7 +40,7 @@ class VenBalanceXlsxFileService {
         this.wb.SheetNames = [];
         // MainData = this.GetTotals(MainData, WOTypes);
         // this.setHeadingInCell();
-        this.setInvoiceDetailsInCell(MainData);
+        this.setInvoiceDetailsInCell(MainData, EntitySettings.DecimalsNumber);
         this.ws['!ref'] = XLSX.utils.encode_range(this.range);
         this.ws['!merges'] = this.MergeArray;
         this.wb.SheetNames.push(ws_name);
@@ -128,7 +128,7 @@ class VenBalanceXlsxFileService {
         });
         this.Row += 1;
     }
-    static setHeading1InCell(Name) {
+    static setHeading1InCell(Name, DecimalsNumber) {
         let InvoiceData = [
             {
                 text: Name,
@@ -138,7 +138,7 @@ class VenBalanceXlsxFileService {
         ];
         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 },
@@ -148,7 +148,7 @@ class VenBalanceXlsxFileService {
         });
         this.Row += 1;
     }
-    static setInvoiceFinalRowInCell(Due) {
+    static setInvoiceFinalRowInCell(Due, DecimalsNumber) {
         let InvoiceData = [
             {
                 text: 'Total Due',
@@ -163,7 +163,7 @@ class VenBalanceXlsxFileService {
         ];
         let ColStart = 3;
         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 },
@@ -173,9 +173,9 @@ class VenBalanceXlsxFileService {
         });
         this.Row += 1;
     }
-    static setInvoiceDetailsInCell(MainData) {
+    static setInvoiceDetailsInCell(MainData, DecimalsNumber) {
         MainData.forEach((Record) => {
-            this.setHeading1InCell(Record.Name);
+            this.setHeading1InCell(Record.Name, DecimalsNumber);
             // this.MergeArray.push({
             //     s: { r: this.Row, c: ColStart },
             //     e: { r: this.Row, c: ColStart + InvData.ColRange - 1 },
@@ -183,15 +183,15 @@ class VenBalanceXlsxFileService {
             //   ColStart += InvData.ColRange;
             this.setHeadingInCell();
             Record.Bills.forEach((Invoice, index) => {
-                this.SetInvoiceDataInExcel(Invoice, index);
+                this.SetInvoiceDataInExcel(Invoice, index, DecimalsNumber);
                 if (Record.Bills.length === (index + 1)) {
-                    this.setInvoiceFinalRowInCell(Record.Balance);
+                    this.setInvoiceFinalRowInCell(Record.Balance, DecimalsNumber);
                 }
             });
             this.Row += 1;
         });
     }
-    static SetInvoiceDataInExcel(BillInfo, index) {
+    static SetInvoiceDataInExcel(BillInfo, index, DecimalsNumber) {
         // BillInfo.CrDate = this.ConvertDateToReadableFormat(BillInfo.CrDate);
         BillInfo.CrDate = this.ConvertDateToReadableFormat(BillInfo.CrDate);
         let InvoiceData = [
@@ -203,7 +203,7 @@ class VenBalanceXlsxFileService {
         ];
         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 },
@@ -213,7 +213,7 @@ class VenBalanceXlsxFileService {
         });
         this.Row += 1;
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -225,7 +225,7 @@ class VenBalanceXlsxFileService {
             }
         }
         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/purchases/payment-made/reports/pdf/vendor-balances-pdf.service.d.ts

@@ -205,8 +205,8 @@ export declare class VendorBalancesService {
             };
         };
     };
-    static GetBillDataTable(BillData: any): any;
-    static GetItemsTable(billData: any): {
+    static GetBillDataTable(BillData: any, DecimalsNumber: number): any;
+    static GetItemsTable(billData: any, DecimalsNumber: number): {
         style: string;
         marginTop: number;
         marginBottom: number;
@@ -222,6 +222,6 @@ export declare class VendorBalancesService {
             vLineColor: (i: any, node: any) => string;
         };
     };
-    static BuildTableBodyForLaborAndParts(billData: any): any;
+    static BuildTableBodyForLaborAndParts(billData: any, DecimalsNumber: number): any;
     static GetHeaderNames(): any;
 }

package/dist/purchases/payment-made/reports/pdf/vendor-balances-pdf.service.js

@@ -20,18 +20,18 @@ class VendorBalancesService {
                 { text: 'As of ' + my_date_1.MyDate.ConvertUTCDateToReadable(my_date_1.MyDate.GetDateTimeNowInUTC(EntityData.Entity.User.TZ)),
                     alignment: 'center', fontSize: 10 },
                 // SharedPDFService.HeaderAfterLine(),
-                this.GetBillDataTable(BillData),
+                this.GetBillDataTable(BillData, EntityData.Entity.Settings.DecimalsNumber),
             ],
             styles: shared_pdf_service_1.SharedPDFService.GetStyles()
         };
         return dd;
     }
-    static GetBillDataTable(BillData) {
+    static GetBillDataTable(BillData, DecimalsNumber) {
         let Data = [];
         let OveralDue = 0;
         BillData.forEach((bill) => {
             OveralDue = OveralDue + bill.Balance;
-            Data.push(this.GetItemsTable(bill));
+            Data.push(this.GetItemsTable(bill, DecimalsNumber));
         });
         Data.push({
             style: 'tableExample',
@@ -43,7 +43,7 @@ class VendorBalancesService {
         });
         return Data;
     }
-    static GetItemsTable(billData) {
+    static GetItemsTable(billData, DecimalsNumber) {
         return {
             style: 'tableExample',
             marginTop: 3,
@@ -51,7 +51,7 @@ class VendorBalancesService {
             table: {
                 widths: [50, '*', 150, 100, 100],
                 headerRows: 2,
-                body: this.BuildTableBodyForLaborAndParts(billData)
+                body: this.BuildTableBodyForLaborAndParts(billData, DecimalsNumber)
             },
             layout: {
                 hLineWidth: function (i, node) {
@@ -69,7 +69,7 @@ class VendorBalancesService {
             }
         };
     }
-    static BuildTableBodyForLaborAndParts(billData) {
+    static BuildTableBodyForLaborAndParts(billData, DecimalsNumber) {
         let body = this.GetHeaderNames();
         let Row = [{ text: billData.Name, alignment: 'left', colSpan: 5, bold: true, fontSize: 12 }, {}, {}, {}, {}];
         body.unshift(Row);
@@ -78,8 +78,8 @@ class VendorBalancesService {
             dataRow.push({ text: index + 1 });
             dataRow.push({ text: bill.BNo });
             dataRow.push({ text: my_date_1.MyDate.ConvertUTCDateToReadable(bill.CrDate), alignment: 'center', style: ['headerstyle'], });
-            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(bill.Total), alignment: 'right', style: ['headerstyle'], });
-            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(bill.Due), alignment: 'right', style: ['headerstyle'], });
+            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(bill.Total, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
+            dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(bill.Due, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
             body.push(dataRow);
             if (billData.Bills.length === (index + 1)) {
                 let Row = [{ text: 'Total Due ', alignment: 'right', colSpan: 4, bold: true, fontSize: 12 }, {}, {}, {}, { text: tr_utils_1.TrUtils.FixPriceValue(billData.Balance), fontSize: 12, alignment: 'right', bold: true }];

package/dist/purchases/purchase-order/purchase-order-pdf.service.js

@@ -735,7 +735,7 @@ class PurchaseOrderPDFService {
         ];
         let total = {
             name: 'Total',
-            value: tr_utils_1.TrUtils.FixPriceValue(OverAllRecordTotal)
+            value: tr_utils_1.TrUtils.FixPriceValue(OverAllRecordTotal, RecordData.Entity.DecimalsNumber)
         };
         let Rounding = { name: 'Rounding', value: Rounded };
         let FinalTotal = { name: 'Total', value: GrandTotal };
@@ -743,22 +743,22 @@ class PurchaseOrderPDFService {
             Rounding.value = '+' + Rounding.value;
         }
         if (!tr_utils_1.TrUtils.IsFixedZero(SubTotal)) {
-            AccountFields.push({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(SubTotal) });
+            AccountFields.push({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue(SubTotal, RecordData.Entity.DecimalsNumber) });
         }
         if (!tr_utils_1.TrUtils.IsEmpty(PartsDiscTotal) && !moreDiscDetails) {
             AccountFields.push({ name: 'Discount', value: '-' + PartsDiscTotal });
         }
         else {
-            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) });
         }
         if (!tr_utils_1.TrUtils.IsEmpty(TaxTotal)) {
             AccountFields.push({ name: 'Total Tax', value: TaxTotal });
         }
         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: tr_utils_1.TrUtils.FixPriceValue(Adj) });
+            AccountFields.push({ name: 'Adjust', value: tr_utils_1.TrUtils.FixPriceValue(Adj, RecordData.Entity.DecimalsNumber) });
         }
         AccountFields.push(total);
         AccountFields.push(Rounding);

package/dist/purchases/purchase-order/purchase-order-print.service.d.ts

@@ -1,8 +1,8 @@
 export declare class PurchaseOrderPrintService {
     static GetDataForPurchaseOrderPrint(argPurchaseOrderData: any, EntityData: any, image: any, VendorData: any, TaxCodes: any, IsFormPO: boolean): any;
-    static GetLaborPrintInfo(LaborList: any, TaxCodes: any, LineTotal: string): any;
+    static GetLaborPrintInfo(LaborList: any, TaxCodes: any, LineTotal: string, DecimalsNumber: number): any;
     static GetVendorDataForPrint(argVendorData: any): any;
     static GetQtyWithUoM(Items: any): any;
     static ConcatTotalsInfo(PurchaseOrderPDFData: any, DetailedTotalsInfo: any): any;
-    static FixPriceValuesForPrint(PrintData: any, TaxCodes: any): any;
+    static FixPriceValuesForPrint(PrintData: any, TaxCodes: any, DecimalsNumber: number): any;
 }

package/dist/purchases/purchase-order/purchase-order-print.service.js

@@ -40,13 +40,13 @@ class PurchaseOrderPrintService {
             PurchaseOrderPDFData.CrDate = my_date_1.MyDate.ConvertUTCDateToReadable(PurchaseOrderData.CrDate);
             PurchaseOrderPDFData.DeDate = my_date_1.MyDate.ConvertUTCDateToReadable(PurchaseOrderData.DeDate);
         }
+        PurchaseOrderPDFData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(EntityData, code_enums_1.PrintTypesEnum.PurOrder, PurchaseOrderData);
         PurchaseOrderPDFData.Items = tr_utils_1.TrUtils.Stringify(PurchaseOrderData.Items);
         PurchaseOrderPDFData.Ops = tr_utils_1.TrUtils.Stringify(PurchaseOrderData.Ops);
         if (!tr_utils_1.TrUtils.IsNull(PurchaseOrderPDFData.Ops)) {
-            PurchaseOrderPDFData.Ops = this.GetLaborPrintInfo(PurchaseOrderPDFData.Ops, TaxCodes, 'AT');
+            PurchaseOrderPDFData.Ops = this.GetLaborPrintInfo(PurchaseOrderPDFData.Ops, TaxCodes, 'AT', PurchaseOrderPDFData.Entity.DecimalsNumber);
         }
         // PurchaseOrderPDFData.Items = this.GetPartsDescription(PurchaseOrderPDFData.Items);
-        PurchaseOrderPDFData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(EntityData, code_enums_1.PrintTypesEnum.PurOrder, PurchaseOrderData);
         PurchaseOrderPDFData.Items = this.GetQtyWithUoM(PurchaseOrderPDFData.Items);
         let DetailedTotalsInfo;
         if (IsFormPO) {
@@ -69,16 +69,16 @@ class PurchaseOrderPrintService {
             }
         }
         PurchaseOrderPDFData.Vendor = this.GetVendorDataForPrint(tr_utils_1.TrUtils.Stringify(VendorData));
-        PurchaseOrderPDFData = this.FixPriceValuesForPrint(PurchaseOrderPDFData, TaxCodes);
+        PurchaseOrderPDFData = this.FixPriceValuesForPrint(PurchaseOrderPDFData, TaxCodes, PurchaseOrderPDFData.Entity.DecimalsNumber);
         return PurchaseOrderPDFData;
     }
-    static GetLaborPrintInfo(LaborList, TaxCodes, LineTotal) {
+    static GetLaborPrintInfo(LaborList, TaxCodes, LineTotal, DecimalsNumber) {
         LaborList.forEach((Labor) => {
             Labor.HSN = Labor.SAC;
             if (tr_utils_1.TrUtils.IsNull(Labor.Qty)) {
                 Labor.Qty = 1;
             }
-            Labor.UnCo = tr_utils_1.TrUtils.FixPriceValue(Labor.UnCo);
+            Labor.UnCo = tr_utils_1.TrUtils.FixPriceValue(Labor.UnCo, DecimalsNumber);
             // Labor.TaxName = this.getTaxName(Labor.TCode, TaxCodes);
             if (!tr_utils_1.TrUtils.IsEmpty(Labor.Perc)) {
                 Labor.DiscPerc = Labor.Perc;
@@ -87,9 +87,9 @@ class PurchaseOrderPrintService {
                 Labor.DiscPerc = Labor.Perc;
                 Labor.DiscPerc = (0, aggregation_1.division)((0, aggregation_1.multiply)(100, Labor.Disc), Labor.UnCo);
             }
-            Labor.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.CGST);
-            Labor.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.SGST);
-            Labor.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.IGST);
+            Labor.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.CGST, DecimalsNumber);
+            Labor.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.SGST, DecimalsNumber);
+            Labor.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Labor.IGST, DecimalsNumber);
             Labor.QtyAndUoM = Labor.Qty.toString();
             Labor.CGSTPerc = shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
             Labor.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
@@ -152,18 +152,18 @@ class PurchaseOrderPrintService {
         PurchaseOrderPDFData = tr_utils_1.TrUtils.ConcatObjects(PurchaseOrderPDFData, DetailedTotalsInfo);
         return PurchaseOrderPDFData;
     }
-    static FixPriceValuesForPrint(PrintData, TaxCodes) {
+    static FixPriceValuesForPrint(PrintData, TaxCodes, DecimalsNumber) {
         PrintData.ShowDetailedPartTaxInfo = false;
         PrintData.Items.forEach((Part) => {
             if (tr_utils_1.TrUtils.IsNull(Part.UnCo)) {
                 Part.UnCo = Part.UnPr;
             }
-            Part.UnCo = tr_utils_1.TrUtils.FixPriceValue(Part.UnCo);
-            Part.DiscountedPrice = tr_utils_1.TrUtils.FixPriceValue(Part.DiscountedPrice);
-            Part.AfterTax = tr_utils_1.TrUtils.FixPriceValue(Part.AfterTax);
-            Part.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.CGST);
-            Part.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.IGST);
-            Part.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.SGST);
+            Part.UnCo = tr_utils_1.TrUtils.FixPriceValue(Part.UnCo, DecimalsNumber);
+            Part.DiscountedPrice = tr_utils_1.TrUtils.FixPriceValue(Part.DiscountedPrice, DecimalsNumber);
+            Part.AfterTax = tr_utils_1.TrUtils.FixPriceValue(Part.AfterTax, DecimalsNumber);
+            Part.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.CGST, DecimalsNumber);
+            Part.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.IGST, DecimalsNumber);
+            Part.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.SGST, DecimalsNumber);
             if (!tr_utils_1.TrUtils.CheckInvalidSelect(Part.TCode)) {
                 PrintData.ShowDetailedPartTaxInfo = true;
             }
@@ -171,16 +171,16 @@ class PurchaseOrderPrintService {
             Part.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
             Part.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
         });
-        PrintData.PartsDiscTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartsDiscTotal);
-        PrintData.PartsTotalAfterDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartsTotalAfterDisc);
-        PrintData.PartsTotalBeforeDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartsTotalBeforeDisc);
-        PrintData.TaxTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.TaxTotal);
-        PrintData.PartCGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartCGST);
-        PrintData.PartIGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartIGST);
-        PrintData.PartSGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartSGST);
-        PrintData.PartAfterTax = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartAfterTax);
-        PrintData.TotalRoundedBy = tr_utils_1.TrUtils.FixPriceValue(PrintData.TotalRoundedBy);
-        PrintData.RoundedTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.RoundedTotal);
+        PrintData.PartsDiscTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartsDiscTotal, DecimalsNumber);
+        PrintData.PartsTotalAfterDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartsTotalAfterDisc, DecimalsNumber);
+        PrintData.PartsTotalBeforeDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartsTotalBeforeDisc, DecimalsNumber);
+        PrintData.TaxTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.TaxTotal, DecimalsNumber);
+        PrintData.PartCGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartCGST, DecimalsNumber);
+        PrintData.PartIGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartIGST, DecimalsNumber);
+        PrintData.PartSGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartSGST, DecimalsNumber);
+        PrintData.PartAfterTax = tr_utils_1.TrUtils.FixPriceValue(PrintData.PartAfterTax, DecimalsNumber);
+        PrintData.TotalRoundedBy = tr_utils_1.TrUtils.FixPriceValue(PrintData.TotalRoundedBy, DecimalsNumber);
+        PrintData.RoundedTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.RoundedTotal, DecimalsNumber);
         return PrintData;
     }
 }

package/dist/purchases/vendor-credit-note/vendor-credit-note-pdf.service.js

@@ -792,7 +792,7 @@ class VendorCreditNotePDFService {
             AccountFields.push({ name: 'SubTotal', value: SubTotal });
         }
         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, RecordData.Entity.DecimalsNumber) });
         }
         else {
             AccountFields.push({ name: 'Discount', value: RecordData.Disc });

package/dist/purchases/vendor-credit-note/vendor-credit-note-print.service.d.ts

@@ -2,5 +2,5 @@ export declare class VendorCreditNotePrintService {
     static GetDataForVendorCreditNotesPrint(argCNData: any, EntityData: any, image: any, IncludeGST: any, ConsolidateGST: any, TaxCodes: any): any;
     static GetVendorDataForPrint(argVendorData: any): any;
     static ConcatTotalsInfo(creditNotePDFData: any, DetailedTotalsInfo: any): any;
-    static FixPriceValuesForPrint(PrintData: any, TaxCodes: any): any;
+    static FixPriceValuesForPrint(PrintData: any, TaxCodes: any, DecimalsNumber: number): any;
 }

package/dist/purchases/vendor-credit-note/vendor-credit-note-print.service.js

@@ -35,13 +35,13 @@ class VendorCreditNotePrintService {
         creditNotePDFData.Items = tr_utils_1.TrUtils.Stringify(CNData.Items);
         // creditNotePDFData.Items = this.GetPartsDescription(creditNotePDFData.Items);
         let DetailedTotalsInfo;
-        DetailedTotalsInfo = vendor_credit_note_totals_service_1.VendorCreditNoteTotalsService.GetTotalsValue([], creditNotePDFData.Items, IsTaxable, true, creditNotePDFData.Disc, creditNotePDFData.Perc, TaxCodes, true, creditNotePDFData.Settings);
-        creditNotePDFData = this.ConcatTotalsInfo(creditNotePDFData, DetailedTotalsInfo);
         creditNotePDFData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(EntityData, code_enums_1.PrintTypesEnum.PurOrder, CNData);
+        DetailedTotalsInfo = vendor_credit_note_totals_service_1.VendorCreditNoteTotalsService.GetTotalsValue([], creditNotePDFData.Items, IsTaxable, true, creditNotePDFData.Disc, creditNotePDFData.Perc, TaxCodes, true, creditNotePDFData.Settings, creditNotePDFData.Entity);
+        creditNotePDFData = this.ConcatTotalsInfo(creditNotePDFData, DetailedTotalsInfo);
         creditNotePDFData = shared_print_service_1.PrintSharedService.GetEntityHeaderStyles(creditNotePDFData, EntityData, image);
         creditNotePDFData.HeaderName = 'Vendor Credit Note';
         creditNotePDFData.Vendor = this.GetVendorDataForPrint(tr_utils_1.TrUtils.Stringify(CNData.BFrom));
-        creditNotePDFData = this.FixPriceValuesForPrint(creditNotePDFData, TaxCodes);
+        creditNotePDFData = this.FixPriceValuesForPrint(creditNotePDFData, TaxCodes, creditNotePDFData.Entity);
         return creditNotePDFData;
     }
     static GetVendorDataForPrint(argVendorData) {
@@ -73,15 +73,15 @@ class VendorCreditNotePrintService {
         creditNotePDFData = tr_utils_1.TrUtils.ConcatObjects(creditNotePDFData, DetailedTotalsInfo);
         return creditNotePDFData;
     }
-    static FixPriceValuesForPrint(PrintData, TaxCodes) {
+    static FixPriceValuesForPrint(PrintData, TaxCodes, DecimalsNumber) {
         PrintData.ShowDetailedPartTaxInfo = false;
         PrintData.Items.forEach((Part) => {
-            Part.UnPr = tr_utils_1.TrUtils.FixPriceValue(Part.Pr);
-            Part.DiscountedPrice = tr_utils_1.TrUtils.FixPriceValue(Part.DiscountedPrice);
-            Part.AfterTax = tr_utils_1.TrUtils.FixPriceValue(Part.AfterTax);
-            Part.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.CGST);
-            Part.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.IGST);
-            Part.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.SGST);
+            Part.UnPr = tr_utils_1.TrUtils.FixPriceValue(Part.Pr, DecimalsNumber);
+            Part.DiscountedPrice = tr_utils_1.TrUtils.FixPriceValue(Part.DiscountedPrice, DecimalsNumber);
+            Part.AfterTax = tr_utils_1.TrUtils.FixPriceValue(Part.AfterTax, DecimalsNumber);
+            Part.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.CGST, DecimalsNumber);
+            Part.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.IGST, DecimalsNumber);
+            Part.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Part.SGST, DecimalsNumber);
             if (!tr_utils_1.TrUtils.CheckInvalidSelect(Part.TCode)) {
                 PrintData.ShowDetailedPartTaxInfo = true;
             }
@@ -89,16 +89,16 @@ class VendorCreditNotePrintService {
             Part.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
             Part.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Part.TCode, TaxCodes);
         });
-        PrintData.PartsDiscTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemsDiscTotal);
-        PrintData.PartsTotalAfterDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemsTotalAfterDisc);
-        PrintData.PartsTotalBeforeDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemsTotalBeforeDisc);
-        PrintData.TaxTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.TaxTotal);
-        PrintData.PartCGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemCGST);
-        PrintData.PartIGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemIGST);
-        PrintData.PartSGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemSGST);
-        PrintData.PartAfterTax = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemAfterTax);
-        PrintData.TotalRoundedBy = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustTotalRoundedBy);
-        PrintData.RoundedTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustRoundedTotal);
+        PrintData.PartsDiscTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemsDiscTotal, DecimalsNumber);
+        PrintData.PartsTotalAfterDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemsTotalAfterDisc, DecimalsNumber);
+        PrintData.PartsTotalBeforeDisc = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemsTotalBeforeDisc, DecimalsNumber);
+        PrintData.TaxTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.TaxTotal, DecimalsNumber);
+        PrintData.PartCGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemCGST, DecimalsNumber);
+        PrintData.PartIGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemIGST, DecimalsNumber);
+        PrintData.PartSGST = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemSGST, DecimalsNumber);
+        PrintData.PartAfterTax = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustItemAfterTax, DecimalsNumber);
+        PrintData.TotalRoundedBy = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustTotalRoundedBy, DecimalsNumber);
+        PrintData.RoundedTotal = tr_utils_1.TrUtils.FixPriceValue(PrintData.CustRoundedTotal, DecimalsNumber);
         return PrintData;
     }
 }

package/dist/purchases/vendor-credit-note/vendor-credit-note-totals.service.d.ts

@@ -1,24 +1,24 @@
 export declare class VendorCreditNoteTotalsService {
-    static GetTotalsValue(opCodesList: any, ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any): any;
+    static GetTotalsValue(opCodesList: any, ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, Disc: any, Perc: string, TaxCodes: any, WithItems: boolean, Settings: any, EntitySettings: any): any;
     static CalculateLaborItemValues(ItemsList: any, IsIndependentTax: boolean): any;
     static ResetLaborItemValues(ItemsList: any, IsIndependentTax: boolean): any;
     static ResetLaborItemValueIfInvalid(Item: any): any;
-    static GetFinalCNDataForSave(LaborList: any, ItemsList: any, IsIndependentTax: boolean, Disc: any, Perc: string, DetailedInfo: boolean, Settings: any): any;
+    static GetFinalCNDataForSave(LaborList: any, ItemsList: any, IsIndependentTax: boolean, Disc: any, Perc: string, DetailedInfo: boolean, Settings: any, DecimalsNumber: number): any;
     static SetMainDiscountValues(Disc: string, Perc: string, finalTotalsData: any, DetailedInfo: boolean): any;
-    static GetFinalCustomerTotalsData(finalTotalsData: any, LaborList: any, ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean): any;
+    static GetFinalCustomerTotalsData(finalTotalsData: any, LaborList: any, ItemsList: any, IsIndependentTax: boolean, DetailedInfo: boolean, DecimalsNumber: number): any;
     static GetSubTotalFor(LaborList: any, ItemsList: any): any;
     static GetItemsTotalAfterDiscount(ItemsList: any): any;
-    static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, opCodesList: any, ItemsList: any, TaxCodes: any): any;
-    static GetItemDiscountedTotal(ItemsList: any, isTaxable: boolean, finalTotalsData: any): number;
+    static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, opCodesList: any, ItemsList: any, TaxCodes: any, DecimalsNumber: number): any;
+    static GetItemDiscountedTotal(ItemsList: any, isTaxable: boolean, finalTotalsData: any, DecimalsNumber: number): number;
     static GetLaborTaxTotalFor(opCodesList: any, IsIndependentTax: boolean): any;
     static GetItemsTaxTotalFor(ItemsList: any, IsIndependentTax: boolean): any;
-    static GetCustomerTotalBasedOnTaxType(finalTotalsData: any, LaborTaxAmount: number, ItemsTaxAmount: number, LaborList: any, ItemsList: any, IsIndependentTax: boolean): any;
+    static GetCustomerTotalBasedOnTaxType(finalTotalsData: any, LaborTaxAmount: number, ItemsTaxAmount: number, LaborList: any, ItemsList: any, IsIndependentTax: boolean, DecimalsNumber: number): any;
     static LaborTotalAfterDiscount(LaborTotalAfterDisc: number, LaborTaxAmount: number, MainLDisc: number, LDiscInPerc: string): number;
     static ItemsTotalAfterDiscount(ItemsTotalAfterDisc: number, ItemsTaxAmount: number, MainPDisc: number, PDiscInPerc: string): number;
     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/purchases/vendor-credit-note/vendor-credit-note-totals.service.js

@@ -4,7 +4,7 @@ exports.VendorCreditNoteTotalsService = void 0;
 const aggregation_1 = require("../../aggregation/aggregation");
 const tr_utils_1 = require("../../utils/tr-utils");
 class VendorCreditNoteTotalsService {
-    static GetTotalsValue(opCodesList, ItemsList, IsIndependentTax, DetailedInfo, Disc, Perc, TaxCodes, WithItems, Settings) {
+    static GetTotalsValue(opCodesList, 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 VendorCreditNoteTotalsService {
         Disc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Disc);
         // opCodesList = this.CalculateLaborValues(opCodesList, IsIndependentTax);
         ItemsList = this.CalculateLaborItemValues(ItemsList, IsIndependentTax);
-        let finalTotalsData = this.GetFinalCNDataForSave(opCodesList, ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings);
+        let finalTotalsData = this.GetFinalCNDataForSave(opCodesList, ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings, EntitySettings.DecimalsNumber);
         if (DetailedInfo) {
-            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, opCodesList, ItemsList, TaxCodes);
+            finalTotalsData = this.GetDetailedTotalsData(finalTotalsData, IsIndependentTax, opCodesList, ItemsList, TaxCodes, EntitySettings.DecimalsNumber);
         }
         if (WithItems) {
             // finalTotalsData.Ops = opCodesList;
@@ -53,11 +53,11 @@ class VendorCreditNoteTotalsService {
         Item.IGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
         return Item;
     }
-    static GetFinalCNDataForSave(LaborList, ItemsList, IsIndependentTax, Disc, Perc, DetailedInfo, Settings) {
+    static GetFinalCNDataForSave(LaborList, 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) {
@@ -74,22 +74,22 @@ class VendorCreditNoteTotalsService {
         }
         return finalTotalsData;
     }
-    static GetFinalCustomerTotalsData(finalTotalsData, LaborList, ItemsList, IsIndependentTax, DetailedInfo) {
+    static GetFinalCustomerTotalsData(finalTotalsData, LaborList, 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 CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList, IsIndependentTax, finalTotalsData, DecimalsNumber);
         // let CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(LaborList);
         let CustItemsTotalAfterDisc = this.GetItemsTotalAfterDiscount(ItemsList);
-        finalTotalsData.STotal = tr_utils_1.TrUtils.FixedTo(CustItemsDiscTotal + CustItemsTotalAfterDisc);
-        let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustItemTaxTotal, [], ItemsList, IsIndependentTax);
-        finalTotalsData.Round = tr_utils_1.TrUtils.FixedTo(Math.round(CustTotal) - CustTotal);
+        finalTotalsData.STotal = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(CustItemsDiscTotal, CustItemsTotalAfterDisc), DecimalsNumber);
+        let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustItemTaxTotal, [], ItemsList, IsIndependentTax, DecimalsNumber);
+        finalTotalsData.Round = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(Math.round(CustTotal), CustTotal), DecimalsNumber);
         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;
     }
@@ -105,15 +105,14 @@ class VendorCreditNoteTotalsService {
         });
         return ItemsTotalAfterDisc;
     }
-    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, opCodesList, ItemsList, TaxCodes) {
+    static GetDetailedTotalsData(finalTotalsData, IsIndependentTax, opCodesList, ItemsList, TaxCodes, DecimalsNumber) {
         // finalTotalsData.CustLaborDiscTotal = this.GetLaborDiscountedTotal(opCodesList, IsIndependentTax, finalTotalsData);
-        finalTotalsData.CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList, IsIndependentTax, finalTotalsData);
+        finalTotalsData.CustItemsDiscTotal = this.GetItemDiscountedTotal(ItemsList, IsIndependentTax, finalTotalsData, DecimalsNumber);
         // finalTotalsData.CustLaborTotalAfterDisc = this.GetLaborTotalAfterDiscount(opCodesList);
         finalTotalsData.CustItemsTotalAfterDisc = this.GetItemsTotalAfterDiscount(ItemsList);
         // finalTotalsData.CustLaborTotalBeforeDisc = TrUtils.FixedTo(finalTotalsData.CustLaborTotalAfterDisc
         //     + finalTotalsData.CustLaborDiscTotal);
-        finalTotalsData.CustItemsTotalBeforeDisc = tr_utils_1.TrUtils.FixedTo(finalTotalsData.CustItemsTotalAfterDisc
-            + finalTotalsData.CustItemsDiscTotal);
+        finalTotalsData.CustItemsTotalBeforeDisc = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(finalTotalsData.CustItemsTotalAfterDisc, finalTotalsData.CustItemsDiscTotal), DecimalsNumber);
         // finalTotalsData.CustLaborITax = this.GetLaborTaxTotalFor(opCodesList, IsIndependentTax);
         // finalTotalsData.CustLaborSGST = this.GetLaborSGSTTaxTotal(opCodesList, IsIndependentTax);
         // finalTotalsData.CustLaborCGST = this.GetLaborCGSTTaxTotal(opCodesList, IsIndependentTax);
@@ -128,21 +127,21 @@ class VendorCreditNoteTotalsService {
         // finalTotalsData.CustItemIGST = this.GetItemIGSTTaxTotal(ItemsList, IsIndependentTax);
         // finalTotalsData.CustItemSGST = this.GetItemSGSTTaxTotal(ItemsList, IsIndependentTax);
         // finalTotalsData.CustLaborAfterTax = TrUtils.FixedTo(finalTotalsData.CustLaborITax + finalTotalsData.CustLaborTotalAfterDisc);
-        finalTotalsData.CustItemAfterTax = tr_utils_1.TrUtils.FixedTo(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.CustItemAfterTax = tr_utils_1.TrUtils.FixedTo((0, aggregation_1.addition)(finalTotalsData.CustItemITax, finalTotalsData.CustItemsTotalAfterDisc), DecimalsNumber);
+        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;
     }
-    static GetItemDiscountedTotal(ItemsList, isTaxable, finalTotalsData) {
+    static GetItemDiscountedTotal(ItemsList, isTaxable, finalTotalsData, DecimalsNumber) {
         let ItemsDiscountedTotal = 0;
         let overallItemDisc = 0;
         if (!isTaxable) {
@@ -151,7 +150,7 @@ class VendorCreditNoteTotalsService {
         ItemsList.forEach((Item) => {
             ItemsDiscountedTotal += Item.DiscountedPrice;
         });
-        return tr_utils_1.TrUtils.FixedTo(ItemsDiscountedTotal + overallItemDisc);
+        return tr_utils_1.TrUtils.FixedTo(((0, aggregation_1.addition)(ItemsDiscountedTotal, overallItemDisc)), DecimalsNumber);
     }
     static GetLaborTaxTotalFor(opCodesList, IsIndependentTax) {
         let TotalTaxAmt = 0;
@@ -171,14 +170,14 @@ class VendorCreditNoteTotalsService {
         }
         return TotalTaxAmt;
     }
-    static GetCustomerTotalBasedOnTaxType(finalTotalsData, LaborTaxAmount, ItemsTaxAmount, LaborList, ItemsList, IsIndependentTax) {
+    static GetCustomerTotalBasedOnTaxType(finalTotalsData, LaborTaxAmount, ItemsTaxAmount, LaborList, ItemsList, IsIndependentTax, DecimalsNumber) {
         // let LaborTotalAfterDisc: any = this.GetLaborTotalAfterDiscount(LaborList);
         let ItemsTotalAfterDisc = this.GetItemsTotalAfterDiscount(ItemsList);
         if (IsIndependentTax) {
-            return ItemsTotalAfterDisc + LaborTaxAmount + ItemsTaxAmount;
+            return (0, aggregation_1.addition)(ItemsTotalAfterDisc, LaborTaxAmount, ItemsTaxAmount);
         }
         else {
-            return tr_utils_1.TrUtils.FixedTo(ItemsTotalAfterDisc - finalTotalsData.Disc);
+            return tr_utils_1.TrUtils.FixedTo((0, aggregation_1.subtraction)(ItemsTotalAfterDisc, finalTotalsData.Disc), DecimalsNumber);
         }
     }
     static LaborTotalAfterDiscount(LaborTotalAfterDisc, LaborTaxAmount, MainLDisc, LDiscInPerc) {
@@ -220,11 +219,11 @@ class VendorCreditNoteTotalsService {
         }
         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) => {
@@ -270,7 +269,7 @@ class VendorCreditNoteTotalsService {
         });
         return FinalMatchedItems;
     }
-    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes) {
+    static GetTaxGroupingInfoByHSN(FinalMatchedItems, TaxCodes, DecimalsNumber) {
         let HSNTaxInfo = [];
         FinalMatchedItems.forEach((MatchedItem) => {
             let TaxInfo = {};
@@ -285,8 +284,8 @@ class VendorCreditNoteTotalsService {
                 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];