shareneus 1.4.49 → 1.4.51

package/dist/accounting/payment-receive/reports/excel/cust-balance-excel.service.d.ts

@@ -13,13 +13,13 @@ export declare class CustBalanceXlsxFileService {
         };
     };
     static ws: any;
-    static GetInvoiceWiseExcelData(MainData: any, isPhar: boolean, WOTypes: any): any;
+    static GetInvoiceWiseExcelData(MainData: any, isPhar: boolean, WOTypes: any, EntitySettings: any): any;
     static GetTotals(MainData: any, WOTypes: any): any;
     static GetWOTypeName(Type: any, WOTypes: any): any;
     static setHeadingInCell(isPhar: boolean): void;
-    static setInvoiceDetailsInCell(MainData: any, isPhar: boolean): void;
-    static SetInvoiceDataInExcel(InvoiceInfo: any, index: any, isPhar: boolean): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setInvoiceDetailsInCell(MainData: any, isPhar: boolean, DecimalsNumber: number): void;
+    static SetInvoiceDataInExcel(InvoiceInfo: any, index: any, isPhar: boolean, 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;
     static ConvertDateToReadableFormat(DateObject: any): any;

package/dist/accounting/payment-receive/reports/excel/cust-balance-excel.service.js

@@ -27,7 +27,7 @@ exports.CustBalanceXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));
 const tr_utils_1 = require("../../../../utils/tr-utils");
 class CustBalanceXlsxFileService {
-    static GetInvoiceWiseExcelData(MainData, isPhar, WOTypes) {
+    static GetInvoiceWiseExcelData(MainData, isPhar, WOTypes, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -42,7 +42,7 @@ class CustBalanceXlsxFileService {
             MainData = this.GetTotals(MainData, WOTypes);
         }
         this.setHeadingInCell(isPhar);
-        this.setInvoiceDetailsInCell(MainData, isPhar);
+        this.setInvoiceDetailsInCell(MainData, isPhar, EntitySettings.DecimalsNumber);
         this.ws['!ref'] = XLSX.utils.encode_range(this.range);
         this.ws['!merges'] = this.MergeArray;
         this.ws["!cols"] = [{ wch: 10 }, { wch: 15 }, { wch: 15 }, { wch: 35 }, { wch: 15 }, { wch: 15 }, { wch: 20 }, { wch: 15 }, { wch: 15 }, { wch: 20 }];
@@ -166,11 +166,11 @@ class CustBalanceXlsxFileService {
         });
         this.Row += 1;
     }
-    static setInvoiceDetailsInCell(MainData, isPhar) {
+    static setInvoiceDetailsInCell(MainData, isPhar, DecimalsNumber) {
         MainData.forEach((Record, index) => {
             // this.setHeading1InCell(Record.Name);
             // this.setHeadingInCell();
-            this.SetInvoiceDataInExcel(Record, index, isPhar);
+            this.SetInvoiceDataInExcel(Record, index, isPhar, DecimalsNumber);
             //         Record.Invoices.forEach((Invoice:any, index:any)=>{
             //             this.SetInvoiceDataInExcel(Invoice, index);
             //             if (Record.Invoices.length === (index + 1)) {
@@ -180,7 +180,7 @@ class CustBalanceXlsxFileService {
             // this.Row += 1;
         });
     }
-    static SetInvoiceDataInExcel(InvoiceInfo, index, isPhar) {
+    static SetInvoiceDataInExcel(InvoiceInfo, index, isPhar, DecimalsNumber) {
         var _a, _b, _c;
         // InvoiceInfo.CrDate = this.ConvertDateToReadableFormat(InvoiceInfo.CrDate);
         InvoiceInfo.CrDate = this.ConvertDateToReadableFormat(InvoiceInfo.CrDate);
@@ -189,7 +189,7 @@ class CustBalanceXlsxFileService {
             { text: InvoiceInfo.CrDate, ColRange: 1, IsString: true },
             { text: InvoiceInfo.Code, ColRange: 1, IsString: true },
             { text: (_a = InvoiceInfo.BillTo) === null || _a === void 0 ? void 0 : _a.Name, ColRange: 1, IsString: true },
-            { text: tr_utils_1.TrUtils.FixPriceValue(InvoiceInfo.Total), ColRange: 1, IsString: false },
+            { text: tr_utils_1.TrUtils.FixPriceValue(InvoiceInfo.Total, DecimalsNumber), ColRange: 1, IsString: false },
             // { text: InvoiceInfo.Due, ColRange: 1, IsString: false },
         ];
         if (!isPhar) {
@@ -197,7 +197,7 @@ class CustBalanceXlsxFileService {
         }
         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 },
@@ -207,7 +207,7 @@ class CustBalanceXlsxFileService {
         });
         this.Row += 1;
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -219,7 +219,7 @@ class CustBalanceXlsxFileService {
             }
         }
         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/payment-receive/reports/excel/payment-receive-excel.service.d.ts

@@ -13,13 +13,13 @@ export declare class PaymentReceiveXlsxFileService {
         };
     };
     static ws: any;
-    static GetRepairOrdersExcelData(MainData: any): any;
-    static GetTotals(MainData: any): any;
+    static GetRepairOrdersExcelData(MainData: any, EntitySettings: any): any;
+    static GetTotals(MainData: any, DecimalsNumber: number): any;
     static setHeadingInCell(): void;
-    static setWorkOrderDetailsInCell(MainData: any): void;
-    static SetWorkOrderDataInExcel(WorkOrder: any, index: any): void;
+    static setWorkOrderDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetWorkOrderDataInExcel(WorkOrder: any, index: any, DecimalsNumber: number): void;
     static GetInvoiceCodes(PaymentData: any): string;
-    static ConvertToString(Text: any, IsString: any): any;
+    static ConvertToString(Text: any, IsString: any, DecimalsNumber: number): any;
     static SetDataInCell(Data: any, ColRange: number, RowNum: any): void;
     static getcelltype(cell: any): any;
 }

package/dist/accounting/payment-receive/reports/excel/payment-receive-excel.service.js

@@ -28,7 +28,7 @@ const XLSX = __importStar(require("xlsx"));
 const my_date_1 = require("../../../../utils/my-date");
 const tr_utils_1 = require("../../../../utils/tr-utils");
 class PaymentReceiveXlsxFileService {
-    static GetRepairOrdersExcelData(MainData) {
+    static GetRepairOrdersExcelData(MainData, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -39,16 +39,16 @@ class PaymentReceiveXlsxFileService {
         this.wb.Props = {};
         this.wb.SSF = {};
         this.wb.SheetNames = [];
-        MainData = this.GetTotals(MainData);
+        MainData = this.GetTotals(MainData, EntitySettings.DecimalsNumber);
         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.wb.SheetNames.push(ws_name);
         this.wb.Sheets[ws_name] = this.ws;
         return this.wb;
     }
-    static GetTotals(MainData) {
+    static GetTotals(MainData, DecimalsNumber) {
         MainData.forEach((WorkOrder) => {
             // if (TrUtils.IsNull(WorkOrder.Prod?.VIN)) {
             //     WorkOrder.Prod.VIN = '';
@@ -65,7 +65,7 @@ class PaymentReceiveXlsxFileService {
             //     WorkOrder.TypeName = WorkOrder.WOType.Name;
             // }
             if (!tr_utils_1.TrUtils.IsNull(WorkOrder.Amt)) {
-                WorkOrder.Total = tr_utils_1.TrUtils.FixPriceValue(WorkOrder.Amt);
+                WorkOrder.Total = tr_utils_1.TrUtils.FixPriceValue(WorkOrder.Amt, DecimalsNumber);
             }
             else {
                 WorkOrder.Total = '0.00';
@@ -127,12 +127,12 @@ class PaymentReceiveXlsxFileService {
         });
         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) {
         WorkOrder.Date = my_date_1.MyDate.ConvertUTCDateToReadable(WorkOrder.Date);
         WorkOrder.InvCodes = this.GetInvoiceCodes(WorkOrder);
         let InvoiceData = [
@@ -155,7 +155,7 @@ class PaymentReceiveXlsxFileService {
         ];
         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 },
@@ -177,7 +177,7 @@ class PaymentReceiveXlsxFileService {
         }
         return InvoiceCodes;
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -189,7 +189,7 @@ class PaymentReceiveXlsxFileService {
             }
         }
         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/payment-receive/reports/pdf/customer-balances-pdf.service.d.ts

@@ -205,9 +205,9 @@ export declare class CustomerBalancesService {
             };
         };
     };
-    static GetInvoiceDataTable(InvoicesData: any, isPhar: boolean, isHC: boolean): any;
+    static GetInvoiceDataTable(InvoicesData: any, isPhar: boolean, isHC: boolean, DecimalsNumber: number): any;
     static getTableWidths(isHC: any): (string | number)[];
-    static GetItemsTable(InvoiceData: any, isPhar: boolean, isHC: boolean): {
+    static GetItemsTable(InvoiceData: any, isPhar: boolean, isHC: boolean, DecimalsNumber: number): {
         style: string;
         marginTop: number;
         marginBottom: number;
@@ -223,6 +223,6 @@ export declare class CustomerBalancesService {
             vLineColor: (i: any, node: any) => string;
         };
     };
-    static BuildTableBodyForLaborAndParts(InvoiceData: any, isPhar: boolean, isHC: boolean): any;
+    static BuildTableBodyForLaborAndParts(InvoiceData: any, isPhar: boolean, isHC: boolean, DecimalsNumber: number): any;
     static GetHeaderNames(isPhar: boolean, isHC: boolean): any;
 }

package/dist/accounting/payment-receive/reports/pdf/customer-balances-pdf.service.js

@@ -19,16 +19,16 @@ class CustomerBalancesService {
                 { text: 'Customer Balances', alignment: 'center', fontSize: 15, bold: true },
                 { text: 'As of ' + my_date_1.MyDate.ConvertUTCDateToReadable(my_date_1.MyDate.GetDateTimeNowInUTC(EntityData.User.TZ)), alignment: 'center', fontSize: 10 },
                 // SharedPDFService.HeaderAfterLine(),
-                this.GetInvoiceDataTable(InvoicesData, isPhar, isHC),
+                this.GetInvoiceDataTable(InvoicesData, isPhar, isHC, EntityData.Entity.Settings.DecimalsNumber),
             ],
             styles: shared_pdf_service_1.SharedPDFService.GetStyles()
         };
         return dd;
     }
-    static GetInvoiceDataTable(InvoicesData, isPhar, isHC) {
+    static GetInvoiceDataTable(InvoicesData, isPhar, isHC, DecimalsNumber) {
         let Data = [];
         InvoicesData.forEach((invoice) => {
-            Data.push(this.GetItemsTable(invoice, isPhar, isHC));
+            Data.push(this.GetItemsTable(invoice, isPhar, isHC, DecimalsNumber));
         });
         return Data;
     }
@@ -40,7 +40,7 @@ class CustomerBalancesService {
             return [25, 60, 70, '*', 70, 80, 50, 50];
         }
     }
-    static GetItemsTable(InvoiceData, isPhar, isHC) {
+    static GetItemsTable(InvoiceData, isPhar, isHC, DecimalsNumber) {
         // InvoicesData.forEach((InvoiceData: any) => {
         return {
             style: 'tableExample',
@@ -49,7 +49,7 @@ class CustomerBalancesService {
             table: {
                 widths: this.getTableWidths(isHC),
                 headerRows: 2,
-                body: this.BuildTableBodyForLaborAndParts(InvoiceData, isPhar, isHC)
+                body: this.BuildTableBodyForLaborAndParts(InvoiceData, isPhar, isHC, DecimalsNumber)
                 // body:[['fsdfsdf','asfafdas','asdasdas','asdasdasd','asddass']]
             },
             layout: {
@@ -72,7 +72,7 @@ class CustomerBalancesService {
         };
         // });
     }
-    static BuildTableBodyForLaborAndParts(InvoiceData, isPhar, isHC) {
+    static BuildTableBodyForLaborAndParts(InvoiceData, isPhar, isHC, DecimalsNumber) {
         let body = this.GetHeaderNames(isPhar, isHC);
         let Row = [{ text: InvoiceData.Name, alignment: 'left', colSpan: isHC ? 5 : 8, bold: true, fontSize: 12 }, {}, {}, {}, {}];
         if (!isHC) {
@@ -94,11 +94,11 @@ class CustomerBalancesService {
                 }
                 // dataRow.push({ text: invoice.BFrom.Name, alignment: 'left', style: ['headerstyle'], });
                 dataRow.push({ text: my_date_1.MyDate.ConvertUTCDateToReadable(invoice.CrDate), alignment: 'center', style: ['headerstyle'], });
-                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(invoice.Total), alignment: 'right', style: ['headerstyle'], });
-                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(invoice.Due), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(invoice.Total, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(invoice.Due, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                 body.push(dataRow);
                 if (InvoiceData.Invoices.length === (index + 1)) {
-                    let Row = [{ text: 'Total Due ', alignment: 'right', colSpan: isHC ? 4 : 6, bold: true, fontSize: 9 }, {}, {}, {}, { text: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.Balance), fontSize: 9, alignment: 'right', bold: true }];
+                    let Row = [{ text: 'Total Due ', alignment: 'right', colSpan: isHC ? 4 : 6, bold: true, fontSize: 9 }, {}, {}, {}, { text: tr_utils_1.TrUtils.FixPriceValue(InvoiceData.Balance, DecimalsNumber), fontSize: 9, alignment: 'right', bold: true }];
                     if (!isHC) {
                         Row.splice(2, 0, {}, {});
                         // Row.push({});
@@ -118,7 +118,7 @@ class CustomerBalancesService {
                 // dataRow.push({ text: TrUtils.IsNull(invoice.Prod) ? '' : invoice.Prod?.Model + ' ' + invoice.Prod?.Var });
                 // }
                 // dataRow.push({ text: invoice.BFrom.Name, alignment: 'left', style: ['headerstyle'], });
-                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(invoice.Total), alignment: 'right', style: ['headerstyle'], });
+                dataRow.push({ text: tr_utils_1.TrUtils.FixPriceValue(invoice.Total, DecimalsNumber), alignment: 'right', style: ['headerstyle'], });
                 // dataRow.push({ text: TrUtils.FixPriceValue(invoice.Due), alignment: 'right', style: ['headerstyle'], });
                 body.push(dataRow);
                 // if (InvoiceData.Invoices.length === (index + 1)) {

package/dist/accounting/payment-receive/reports/pdf/payment-report-pdf.service.d.ts

@@ -205,9 +205,9 @@ export declare class PaymentsReportPDFService {
             };
         };
     };
-    static GetInvoiceDataTable(InvoicesData: any, ispur: boolean, isSale: boolean, UserTimeZone: any): any;
+    static GetInvoiceDataTable(InvoicesData: any, ispur: boolean, isSale: boolean, UserTimeZone: any, DecimalsNumber: number): any;
     static getTableWidths(): (string | number)[];
-    static GetItemsTable(InvoiceData: any, ispur: boolean, isSale: boolean, UserTimeZone: any): {
+    static GetItemsTable(InvoiceData: any, ispur: boolean, isSale: boolean, UserTimeZone: any, DecimalsNumber: number): {
         style: string;
         marginTop: number;
         marginBottom: number;
@@ -223,6 +223,6 @@ export declare class PaymentsReportPDFService {
             vLineColor: (i: any, node: any) => string;
         };
     };
-    static BuildTableBodyForLaborAndParts(InvoiceData: any, ispur: boolean, isSale: boolean, UserTimeZone: any): any;
+    static BuildTableBodyForLaborAndParts(InvoiceData: any, ispur: boolean, isSale: boolean, UserTimeZone: any, DecimalsNumber: number): any;
     static GetHeaderNames(ispur: boolean): any;
 }

package/dist/accounting/payment-receive/reports/pdf/payment-report-pdf.service.js

@@ -18,16 +18,16 @@ class PaymentsReportPDFService {
                 { text: '' + EntityData.Entity.DName + '', style: ['header'] },
                 { text: HeaerName, alignment: 'center', fontSize: 15, bold: true },
                 shared_pdf_service_1.SharedPDFService.GetSearchValueDetails(searchValue),
-                this.GetInvoiceDataTable(InvoicesData, ispur, isSale, EntityData.User.TZ),
+                this.GetInvoiceDataTable(InvoicesData, ispur, isSale, EntityData.User.TZ, EntityData.Entity.Settings.DecimalsNumber),
             ],
             styles: shared_pdf_service_1.SharedPDFService.GetStyles()
         };
         return dd;
     }
-    static GetInvoiceDataTable(InvoicesData, ispur, isSale, UserTimeZone) {
+    static GetInvoiceDataTable(InvoicesData, ispur, isSale, UserTimeZone, DecimalsNumber) {
         let Data = [];
         // InvoicesData.forEach((invoice: any) => {
-        Data.push(this.GetItemsTable(InvoicesData, ispur, isSale, UserTimeZone));
+        Data.push(this.GetItemsTable(InvoicesData, ispur, isSale, UserTimeZone, DecimalsNumber));
         // });
         return Data;
     }
@@ -38,7 +38,7 @@ class PaymentsReportPDFService {
         // return [25, '*', 40, 40,  80];
         // }
     }
-    static GetItemsTable(InvoiceData, ispur, isSale, UserTimeZone) {
+    static GetItemsTable(InvoiceData, ispur, isSale, UserTimeZone, DecimalsNumber) {
         // InvoicesData.forEach((InvoiceData: any) => {
         return {
             style: 'tableExample',
@@ -47,7 +47,7 @@ class PaymentsReportPDFService {
             table: {
                 widths: this.getTableWidths(),
                 headerRows: 1,
-                body: this.BuildTableBodyForLaborAndParts(InvoiceData, ispur, isSale, UserTimeZone)
+                body: this.BuildTableBodyForLaborAndParts(InvoiceData, ispur, isSale, UserTimeZone, DecimalsNumber)
                 // body:[['fsdfsdf','asfafdas','asdasdas','asdasdasd','asddass']]
             },
             layout: {
@@ -70,7 +70,7 @@ class PaymentsReportPDFService {
         };
         // });
     }
-    static BuildTableBodyForLaborAndParts(InvoiceData, ispur, isSale, UserTimeZone) {
+    static BuildTableBodyForLaborAndParts(InvoiceData, ispur, isSale, UserTimeZone, DecimalsNumber) {
         let body = this.GetHeaderNames(ispur);
         InvoiceData.forEach((invoice, index) => {
             var _a;
@@ -80,7 +80,7 @@ class PaymentsReportPDFService {
             dataRow.push({ text: isSale ? invoice.CustName : invoice.Name });
             dataRow.push({ text: isSale ? my_date_1.MyDate.ConvertUTCDateTimeToReadable(invoice.Pay.Dt, UserTimeZone) : my_date_1.MyDate.ConvertUTCDateTimeToReadable(invoice.Date, UserTimeZone) });
             dataRow.push({ text: isSale ? invoice.Pay.Type : invoice.PType });
-            dataRow.push({ text: isSale ? tr_utils_1.TrUtils.FixPriceValue((_a = invoice.Pay) === null || _a === void 0 ? void 0 : _a.Amt) : tr_utils_1.TrUtils.FixPriceValue(invoice.Amt), alignment: 'right' });
+            dataRow.push({ text: isSale ? tr_utils_1.TrUtils.FixPriceValue((_a = invoice.Pay) === null || _a === void 0 ? void 0 : _a.Amt, DecimalsNumber) : tr_utils_1.TrUtils.FixPriceValue(invoice.Amt, DecimalsNumber), alignment: 'right' });
             body.push(dataRow);
         });
         return body;

package/dist/appointments/consultations/consultation-fee-receipt.service.d.ts

@@ -244,7 +244,7 @@ export declare class ConsultationFeeReceiptPrintService {
         fontSize: number;
         width: string;
     };
-    static GetDiscountOverall(consultationData: any): string;
+    static GetDiscountOverall(consultationData: any, DecimalsNumber: number): string;
     static CustomerAndVehicleDetailsAfterLine(size: any): {
         canvas: {
             type: string;

package/dist/appointments/consultations/consultation-fee-receipt.service.js

@@ -5,6 +5,7 @@ const date_fns_1 = require("date-fns");
 const tr_utils_1 = require("../../utils/tr-utils");
 const shared_pdf_service_1 = require("../../shared/shared-pdf.service");
 const my_date_1 = require("../../utils/my-date");
+const aggregation_1 = require("../../aggregation/aggregation");
 class ConsultationFeeReceiptPrintService {
     static GetPrint(consultationData) {
         if (tr_utils_1.TrUtils.IsNull(consultationData.Name)) {
@@ -225,10 +226,9 @@ class ConsultationFeeReceiptPrintService {
     static GetBillofSupplyName(Settings) {
         return { text: (Settings === null || Settings === void 0 ? void 0 : Settings.Tax) === 'BS' ? 'Bill of Supply' : null, alignment: 'right', marginRight: 5, marginTop: 2, marginBottom: 3, fontSize: 9, width: 'auto' };
     }
-    static GetDiscountOverall(consultationData) {
-        let OveralDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(consultationData.Disc)) +
-            tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(consultationData.CustPartsDiscTotal));
-        return tr_utils_1.TrUtils.FixPriceValue(OveralDisc);
+    static GetDiscountOverall(consultationData, DecimalsNumber) {
+        let OveralDisc = (0, aggregation_1.addition)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(consultationData.Disc)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(consultationData.CustPartsDiscTotal)));
+        return tr_utils_1.TrUtils.FixPriceValue(OveralDisc, DecimalsNumber);
     }
     static CustomerAndVehicleDetailsAfterLine(size) {
         let length = 575;

package/dist/gst/excel/GSTR-RO-excel.service.d.ts

@@ -14,13 +14,13 @@ export declare class GSTROXlsxFileService {
     };
     static ws: any;
     static MainHeadings: any[];
-    static GetGSTROExcelData(MainData: any, WOTypes: any): any;
+    static GetGSTROExcelData(MainData: any, WOTypes: any, EntitySettings: any): any;
     static GetTotals(MainData: any, WOTypes: any): any;
     static GetWOTypeName(Type: any, WOTypes: any): any;
     static setHeadingInCell(MainData: any): void;
-    static setInvoiceDetailsInCell(MainData: any): void;
-    static SetInvoiceDataInExcel(InvoiceInfo: any, Index: any): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setInvoiceDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetInvoiceDataInExcel(InvoiceInfo: 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;
     static ConvertDateToReadableFormat(DateObject: any): any;

package/dist/gst/excel/GSTR-RO-excel.service.js

@@ -27,7 +27,7 @@ exports.GSTROXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));
 const tr_utils_1 = require("../../utils/tr-utils");
 class GSTROXlsxFileService {
-    static GetGSTROExcelData(MainData, WOTypes) {
+    static GetGSTROExcelData(MainData, WOTypes, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -40,7 +40,7 @@ class GSTROXlsxFileService {
         this.wb.SheetNames = [];
         MainData = this.GetTotals(MainData, WOTypes);
         this.setHeadingInCell(MainData);
-        this.setInvoiceDetailsInCell(MainData);
+        this.setInvoiceDetailsInCell(MainData, EntitySettings);
         this.ws['!ref'] = XLSX.utils.encode_range(this.range);
         this.ws['!merges'] = this.MergeArray;
         this.ws["!cols"] = [{ wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 50 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 }, { wch: 15 },
@@ -767,16 +767,16 @@ class GSTROXlsxFileService {
         });
         this.Row += 2;
     }
-    static setInvoiceDetailsInCell(MainData) {
+    static setInvoiceDetailsInCell(MainData, DecimalsNumber) {
         let SNO = 0;
         MainData.forEach((InvoiceList) => {
             InvoiceList.Invoices.forEach((invoice, Index) => {
                 SNO = SNO + 1;
-                this.SetInvoiceDataInExcel(invoice, SNO);
+                this.SetInvoiceDataInExcel(invoice, SNO, DecimalsNumber);
             });
         });
     }
-    static SetInvoiceDataInExcel(InvoiceInfo, Index) {
+    static SetInvoiceDataInExcel(InvoiceInfo, Index, DecimalsNumber) {
         // console.log(InvoiceInfo);
         InvoiceInfo.CrDate = this.ConvertDateToReadableFormat(InvoiceInfo.CrDate);
         let InvoiceData = [];
@@ -844,7 +844,7 @@ class GSTROXlsxFileService {
         });
         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 },
@@ -854,7 +854,7 @@ class GSTROXlsxFileService {
         });
         this.Row += 1;
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (Text == null) {
                 Text = '';
@@ -866,7 +866,7 @@ class GSTROXlsxFileService {
             }
         }
         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/gst/excel/GSTR1-excel.service.d.ts

@@ -4,12 +4,12 @@ export declare class GSTR1ExcelService {
     static MergeArray: any[];
     static range: any;
     static ws: any;
-    static GetGSTR1ExcelData(MainData: any): any;
+    static GetGSTR1ExcelData(MainData: any, EntitySettings: any): any;
     static GetTotals(MainData: any): any;
     static setHeadingInCell(): void;
-    static setInvoiceDetailsInCell(MainData: any): void;
-    static SetInvoiceDataInExcel(InvoiceList: any): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setInvoiceDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetInvoiceDataInExcel(InvoiceList: 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;
     static ConvertDateToReadableFormat(DateObject: any): any;

package/dist/gst/excel/GSTR1-excel.service.js

@@ -27,7 +27,7 @@ exports.GSTR1ExcelService = void 0;
 const XLSX = __importStar(require("xlsx"));
 const tr_utils_1 = require("../../utils/tr-utils");
 class GSTR1ExcelService {
-    static GetGSTR1ExcelData(MainData) {
+    static GetGSTR1ExcelData(MainData, EntitySettings) {
         this.wb = {};
         this.ws = {};
         this.Row = 0;
@@ -40,7 +40,7 @@ class GSTR1ExcelService {
         this.wb.SheetNames = [];
         MainData = this.GetTotals(MainData);
         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);
@@ -124,12 +124,12 @@ class GSTR1ExcelService {
         });
         this.Row += 2;
     }
-    static setInvoiceDetailsInCell(MainData) {
+    static setInvoiceDetailsInCell(MainData, DecimalsNumber) {
         MainData.forEach((InvoiceList) => {
-            this.SetInvoiceDataInExcel(InvoiceList);
+            this.SetInvoiceDataInExcel(InvoiceList, DecimalsNumber);
         });
     }
-    static SetInvoiceDataInExcel(InvoiceList) {
+    static SetInvoiceDataInExcel(InvoiceList, DecimalsNumber) {
         InvoiceList.Invoices.forEach((InvoiceInfo, index) => {
             // let InvoiceInfo = InvoiceInfoData.Inv;
             InvoiceInfo.CrDate = this.ConvertDateToReadableFormat(InvoiceInfo.CrDate);
@@ -160,7 +160,7 @@ class GSTR1ExcelService {
             ];
             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 }, e: { r: this.Row, c: ColStart + InvData.ColRange - 1 } });
                 ColStart += InvData.ColRange;
@@ -180,7 +180,7 @@ class GSTR1ExcelService {
                     ];
                     let PartColStart = TotalsColStart + 1;
                     PartData.forEach((PartInfo) => {
-                        PartInfo.text = this.ConvertToString(PartInfo.text, PartInfo.IsString);
+                        PartInfo.text = this.ConvertToString(PartInfo.text, PartInfo.IsString, DecimalsNumber);
                         this.SetDataInCell(PartInfo.text, PartColStart, this.Row);
                         this.MergeArray.push({ s: { r: this.Row, c: PartColStart }, e: { r: this.Row, c: PartColStart + PartInfo.ColRange - 1 } });
                         PartColStart += PartInfo.ColRange;
@@ -203,7 +203,7 @@ class GSTR1ExcelService {
                     ];
                     let LaborColStart = TotalsColStart + 1;
                     ServiceData.forEach((ServiceInfo) => {
-                        ServiceInfo.text = this.ConvertToString(ServiceInfo.text, ServiceInfo.IsString);
+                        ServiceInfo.text = this.ConvertToString(ServiceInfo.text, ServiceInfo.IsString, DecimalsNumber);
                         this.SetDataInCell(ServiceInfo.text, LaborColStart, this.Row);
                         this.MergeArray.push({ s: { r: this.Row, c: LaborColStart }, e: { r: this.Row, c: LaborColStart + ServiceInfo.ColRange - 1 } });
                         LaborColStart += ServiceInfo.ColRange;
@@ -215,7 +215,7 @@ class GSTR1ExcelService {
             this.Row += 1;
         });
     }
-    static ConvertToString(Text, IsString) {
+    static ConvertToString(Text, IsString, DecimalsNumber) {
         if (IsString) {
             if (tr_utils_1.TrUtils.IsNull(Text)) {
                 Text = '';
@@ -227,7 +227,7 @@ class GSTR1ExcelService {
             }
         }
         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/gst/excel/GSTR2-excel.service.d.ts

@@ -4,12 +4,12 @@ export declare class GSTR2ExcelService {
     static MergeArray: any[];
     static range: any;
     static ws: any;
-    static GetGSTR1ExcelData(MainData: any): any;
+    static GetGSTR1ExcelData(MainData: any, EntitySettings: any): any;
     static GetTotals(MainData: any): any;
     static setHeadingInCell(): void;
-    static setInvoiceDetailsInCell(MainData: any): void;
-    static SetInvoiceDataInExcel(InvoiceList: any): void;
-    static ConvertToString(Text: any, IsString: any): any;
+    static setInvoiceDetailsInCell(MainData: any, DecimalsNumber: number): void;
+    static SetInvoiceDataInExcel(InvoiceList: 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;
     static ConvertDateToReadableFormat(DateObject: any): any;