shareneus 1.4.34 → 1.4.35

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

@@ -4,38 +4,38 @@ exports.InvPrintService = void 0;
 const aggregation_1 = require("../aggregation/aggregation");
 const code_enums_1 = require("../enums/code-enums");
 const enums_1 = require("../enums/enums");
-const my_date_1 = require("../utils/my-date");
-const tr_utils_1 = require("../utils/tr-utils");
+const my_date_1 = require("../shared/my-date");
+const utils_1 = require("../shared/utils");
 const invoice_total_service_1 = require("./invoice-total.service");
 const shared_print_service_1 = require("./shared-print.service");
 class InvPrintService {
     static GetInvoicePrintInfo(OriginalInvoiceData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, PartsPrint, LaborPrint) {
         var _a, _b, _c, _d;
-        let ForInsurance = !tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo) && !tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.Ins_Id);
+        let ForInsurance = !utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo) && !utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.Ins_Id);
         let InvoicePrintData = {};
-        let argInvoiceData = tr_utils_1.TrUtils.Stringify(OriginalInvoiceData);
+        let argInvoiceData = utils_1.TrUtils.Stringify(OriginalInvoiceData);
         if (!IncludeGST) {
             if (argInvoiceData.Settings.Tax === 'TI') {
                 argInvoiceData.Settings.Tax = 'NO';
             }
         }
         InvoicePrintData.IsProforma = IsProforma;
-        InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
+        InvoicePrintData.Settings = utils_1.TrUtils.Stringify(argInvoiceData.Settings);
         let SType;
-        if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.SType)) {
+        if (!utils_1.TrUtils.IsNull(argInvoiceData.SType)) {
             SType = argInvoiceData.SType;
         }
         InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argInvoiceData, IsProforma, PartsPrint, LaborPrint);
         InvoicePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, "Invoice", OriginalInvoiceData);
         InvoicePrintData = shared_print_service_1.PrintSharedService.GetEntityHeaderStyles(InvoicePrintData, OriginalEntityData, image);
         InvoicePrintData = this.GetInvoiceOtherDetailsForPrint(InvoicePrintData, argInvoiceData);
-        let IsTaxable = (IncludeGST && tr_utils_1.TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
+        let IsTaxable = (IncludeGST && utils_1.TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
         let finalTotalsData = invoice_total_service_1.InvoiceTotalsService.GetTotalsValue(argInvoiceData.Ops, argInvoiceData.Items, IsTaxable, true, argInvoiceData.LDisc, argInvoiceData.LPerc, argInvoiceData.PDisc, argInvoiceData.PPerc, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, argInvoiceData.Adjust, InvoicePrintData.Entity.Round);
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
         }
-        InvoicePrintData = tr_utils_1.TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
+        InvoicePrintData = utils_1.TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
         InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Ops, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot);
         InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes, (_d = (_c = OriginalEntityData.Entity.Settings) === null || _c === void 0 ? void 0 : _c.Acc) === null || _d === void 0 ? void 0 : _d.LTot);
         argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
@@ -48,7 +48,7 @@ class InvPrintService {
         // }
         InvoicePrintData.Due = PaymentData.Due;
         InvoicePrintData.Paid = argInvoiceData.Receipt ? argInvoiceData.Total : PaymentData.Paid;
-        if (!tr_utils_1.TrUtils.IsNull(PaymentData.Sts)) {
+        if (!utils_1.TrUtils.IsNull(PaymentData.Sts)) {
             InvoicePrintData.Sts = PaymentData.Sts;
         }
         InvoicePrintData.Consolidate = ConsolidateGST;
@@ -65,10 +65,10 @@ class InvPrintService {
         if (OriginalInvoiceData.isCountersale) {
             InvoicePrintData.From = 'Countersale';
         }
-        if (tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BL)) {
+        if (utils_1.TrUtils.IsNull(OriginalInvoiceData.BL)) {
             OriginalInvoiceData.BL = {};
         }
-        InvoicePrintData.BL = tr_utils_1.TrUtils.Stringify(OriginalInvoiceData.BL);
+        InvoicePrintData.BL = utils_1.TrUtils.Stringify(OriginalInvoiceData.BL);
         OriginalInvoiceData.BL.RefNo = OriginalInvoiceData.RefNo;
         // console.log('InvoicePrintData', InvoicePrintData);
         return InvoicePrintData;
@@ -79,11 +79,11 @@ class InvPrintService {
         InvoicePrintData.IncludeGST = IncludeGST;
         InvoicePrintData.ConsolidateGST = ConsolidateGST;
         InvoicePrintData.ShowAccParts = true;
-        InvoicePrintData.ShowIGST = (tr_utils_1.TrUtils.IsNull(SType) || (SType === 'Intra')) ? false : true;
+        InvoicePrintData.ShowIGST = (utils_1.TrUtils.IsNull(SType) || (SType === 'Intra')) ? false : true;
         InvoicePrintData.ShowTaxColumn = (IncludeGST && !ConsolidateGST) ? true : false;
         // InvoicePrintData.ShowDiscountColumn = (!ForInsurance && !ConsolidateGST) ? true : false;
         InvoicePrintData = this.GetInvoiceTypeHeading(InvoicePrintData, OriginalInvoiceData, IncludeGST, ConsolidateGST, IsProforma, PartsPrint, LaborPrint);
-        InvoicePrintData.PrDate = tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.PrDate) ? '' : my_date_1.MyDate.ConvertUTCDateToReadable(OriginalInvoiceData.PrDate);
+        InvoicePrintData.PrDate = utils_1.TrUtils.IsNull(OriginalInvoiceData.PrDate) ? '' : my_date_1.MyDate.ConvertUTCDateToReadable(OriginalInvoiceData.PrDate);
         return InvoicePrintData;
     }
     static GetInvoiceTypeHeading(InvoicePrintData, OriginalInvoiceData, IncludeGST, ConsolidateGST, IsProforma, PartsPrint, LaborPrint) {
@@ -197,40 +197,40 @@ class InvPrintService {
     static GetLaborPrintInfo(LaborList, Consolidate, TaxCodes, LineTotal) {
         LaborList.forEach((Labor) => {
             Labor.HSN = Labor.SAC;
-            if (tr_utils_1.TrUtils.IsNull(Labor.Qty)) {
+            if (utils_1.TrUtils.IsNull(Labor.Qty)) {
                 Labor.Qty = 1;
             }
             if (Consolidate) {
-                Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.AfterLaborTax);
+                Labor.UnPr = utils_1.TrUtils.FixedTo(Labor.AfterLaborTax);
             }
             else {
-                Labor.UnPr = tr_utils_1.TrUtils.FixPriceValue(Labor.Pr);
+                Labor.UnPr = utils_1.TrUtils.FixPriceValue(Labor.Pr);
             }
             Labor.TaxName = this.getTaxName(Labor.TCode, TaxCodes);
-            if (!tr_utils_1.TrUtils.IsEmpty(Labor.Perc)) {
+            if (!utils_1.TrUtils.IsEmpty(Labor.Perc)) {
                 Labor.DiscPerc = Labor.Perc;
             }
             else {
                 Labor.DiscPerc = Labor.Perc;
-                if (!tr_utils_1.TrUtils.IsZero(Number(Labor.UnPr))) {
+                if (!utils_1.TrUtils.IsZero(Number(Labor.UnPr))) {
                     Labor.DiscPerc = (0, aggregation_1.division)((0, aggregation_1.multiply)(100, Labor.Disc), Labor.UnPr);
                 }
                 else {
                     Labor.DiscPerc = 0;
                 }
             }
-            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 = utils_1.TrUtils.FixPriceValue(Labor.CGST);
+            Labor.SGSTAmt = utils_1.TrUtils.FixPriceValue(Labor.SGST);
+            Labor.IGSTAmt = utils_1.TrUtils.FixPriceValue(Labor.IGST);
             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);
             Labor.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Labor.TCode, TaxCodes);
             if (LineTotal === 'AT') {
-                Labor.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Labor.AfterLaborTax);
+                Labor.LineTotal = utils_1.TrUtils.FixPriceValue(Labor.AfterLaborTax);
             }
             else {
-                Labor.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.subtraction)(Labor.Amt, Labor.Disc));
+                Labor.LineTotal = utils_1.TrUtils.FixPriceValue((0, aggregation_1.subtraction)(Labor.Amt, Labor.Disc));
             }
         });
         return LaborList;
@@ -242,10 +242,10 @@ class InvPrintService {
                 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);
+                Item.UnPr = utils_1.TrUtils.FixedTo(AfterDiscForEach + CTaxAmtPerItem + STaxAmtPerItem + ITaxAmtPerItem);
             }
             else {
-                Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr);
+                Item.UnPr = utils_1.TrUtils.FixPriceValue(Item.UnPr);
             }
             // let Index = Item['Desc'].indexOf('#{');
             // if (Index !== -1) {
@@ -253,17 +253,17 @@ class InvPrintService {
             //         Item['Desc'].lastIndexOf('}#'));
             // }
             // Item.Desc = Item['Desc'].split(' #{')[0];
-            Item.MRP = tr_utils_1.TrUtils.FixPriceValue(Item.MRP);
-            Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.CGST);
-            Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.SGST);
-            Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.IGST);
+            Item.MRP = utils_1.TrUtils.FixPriceValue(Item.MRP);
+            Item.CGSTAmt = utils_1.TrUtils.FixPriceValue(Item.CGST);
+            Item.SGSTAmt = utils_1.TrUtils.FixPriceValue(Item.SGST);
+            Item.IGSTAmt = utils_1.TrUtils.FixPriceValue(Item.IGST);
             Item.TaxName = this.getTaxName(Item.TCode, TaxCodes);
-            if (!tr_utils_1.TrUtils.IsEmpty(Item.Perc)) {
+            if (!utils_1.TrUtils.IsEmpty(Item.Perc)) {
                 Item.DiscPerc = Item.Perc;
             }
             else {
                 Item.DiscPerc = Item.Perc;
-                if (!tr_utils_1.TrUtils.IsZero(Number(Item.UnPr))) {
+                if (!utils_1.TrUtils.IsZero(Number(Item.UnPr))) {
                     Item.DiscPerc = (0, aggregation_1.division)((0, aggregation_1.multiply)(100, Item.Disc), Item.UnPr);
                 }
                 else {
@@ -274,18 +274,18 @@ class InvPrintService {
             Item.SGSTPerc = shared_print_service_1.PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             Item.IGSTPerc = shared_print_service_1.PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             if (LineTotal === 'AT') {
-                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax);
+                Item.LineTotal = utils_1.TrUtils.FixPriceValue(Item.AfterPartTax);
             }
             else {
-                Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc));
+                Item.LineTotal = utils_1.TrUtils.FixPriceValue((0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc));
             }
-            if (!tr_utils_1.TrUtils.IsZero(Item.Qty) && !tr_utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
+            if (!utils_1.TrUtils.IsZero(Item.Qty) && !utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
                 Item.QtyAndUoM = Item.Qty + ' ' + Item.UoM;
             }
             else {
                 Item.QtyAndUoM = Item.Qty + '';
             }
-            if (!tr_utils_1.TrUtils.IsZero(Item.OfQty) && !tr_utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
+            if (!utils_1.TrUtils.IsZero(Item.OfQty) && !utils_1.TrUtils.CheckInvalidSelect(Item.UoM)) {
                 Item.OfQtyAndUoM = Item.OfQty + ' ' + Item.UoM;
             }
             else {
@@ -316,15 +316,15 @@ class InvPrintService {
         return PrintInfo;
     }
     static GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData) {
-        if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.Prod)) {
+        if (!utils_1.TrUtils.IsNull(argInvoiceData.Prod)) {
             InvoicePrintData.Product = argInvoiceData.Prod;
-            if (tr_utils_1.TrUtils.IsNull(InvoicePrintData.Product.VIN)) {
+            if (utils_1.TrUtils.IsNull(InvoicePrintData.Product.VIN)) {
                 InvoicePrintData.Product.VIN = '';
             }
-            if (tr_utils_1.TrUtils.IsNull(InvoicePrintData.Product.RegNo)) {
+            if (utils_1.TrUtils.IsNull(InvoicePrintData.Product.RegNo)) {
                 InvoicePrintData.Product.RegNo = '';
             }
-            if (tr_utils_1.TrUtils.IsNull(InvoicePrintData.Product.EngNo)) {
+            if (utils_1.TrUtils.IsNull(InvoicePrintData.Product.EngNo)) {
                 InvoicePrintData.Product.EngNo = '';
             }
             InvoicePrintData.MIn = argInvoiceData.Prod.MIn;
@@ -334,24 +334,24 @@ class InvPrintService {
     }
     static GetBillNameForInvoicePrint(argInvoiceData, InvoicePrintData) {
         let Customer = {};
-        if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo)) {
+        if (!utils_1.TrUtils.IsNull(argInvoiceData.BillTo)) {
             Customer.Name = argInvoiceData.BillTo.Name;
             Customer.Adrs = [];
             Customer.Cons = [];
-            if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo.Adrs)) {
+            if (!utils_1.TrUtils.IsNull(argInvoiceData.BillTo.Adrs)) {
                 Customer.Adrs.push(argInvoiceData.BillTo.Adrs.A1);
-                if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.A2)) {
+                if (!utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.A2)) {
                     Customer.Adrs.push(argInvoiceData.BillTo.Adrs.A2);
                 }
-                if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.Ct)) {
+                if (!utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.Ct)) {
                     Customer.Adrs.push(argInvoiceData.BillTo.Adrs.Ct);
                 }
             }
             Customer.GSTIN = argInvoiceData.BillTo.GSTIN;
-            if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo.DLNo)) {
+            if (!utils_1.TrUtils.IsNull(argInvoiceData.BillTo.DLNo)) {
                 Customer.DLNo = argInvoiceData.BillTo.DLNo;
             }
-            if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Ph)) {
+            if (!utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Ph)) {
                 Customer.Cons = [
                     {
                         Type: 'M',
@@ -361,31 +361,31 @@ class InvPrintService {
             }
             InvoicePrintData.Customer = Customer;
             InvoicePrintData.Name = argInvoiceData.Name;
-            if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo.Ins_Id)) {
+            if (!utils_1.TrUtils.IsNull(argInvoiceData.BillTo.Ins_Id)) {
                 InvoicePrintData.Cust = this.GetCustomerDetails(argInvoiceData);
             }
         }
-        else if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.Cust)) {
+        else if (!utils_1.TrUtils.IsNull(argInvoiceData.Cust)) {
             Customer.Name = argInvoiceData.Cust.Name;
             Customer.Adrs = [];
             Customer.Cons = [];
             InvoicePrintData.Customer = Customer;
         }
-        if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.ShipTo)) {
+        if (!utils_1.TrUtils.IsNull(argInvoiceData.ShipTo)) {
             let location = {};
             location.Adrs = shared_print_service_1.PrintSharedService.GetAddress(argInvoiceData.ShipTo.Adrs);
             let Name;
-            if (tr_utils_1.TrUtils.IsNull(argInvoiceData.ShipTo.Name)) {
+            if (utils_1.TrUtils.IsNull(argInvoiceData.ShipTo.Name)) {
                 Name = argInvoiceData.ShipTo.ConName;
             }
             else {
                 Name = argInvoiceData.ShipTo.Name;
             }
-            if (tr_utils_1.TrUtils.IsNull(Name)) {
+            if (utils_1.TrUtils.IsNull(Name)) {
                 Name = '';
             }
             location.Name = Name;
-            if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.ShipTo.ConPh)) {
+            if (!utils_1.TrUtils.IsNull(argInvoiceData.ShipTo.ConPh)) {
                 location.Cons = [
                     {
                         Type: 'M',
@@ -401,7 +401,7 @@ class InvPrintService {
         let Customer = {};
         Customer.Name = this.GetBillToName(argInvoiceData.Cust.Title, argInvoiceData.Cust.Name);
         Customer.Cons = [];
-        if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.Cust.Ph)) {
+        if (!utils_1.TrUtils.IsEmpty(argInvoiceData.Cust.Ph)) {
             Customer.Cons = [
                 {
                     Type: 'M',
@@ -411,9 +411,9 @@ class InvPrintService {
         }
         Customer.GSTIN = argInvoiceData.Cust.GSTIN;
         Customer.Adrs = [];
-        if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.Cust.Adrs)) {
+        if (!utils_1.TrUtils.IsNull(argInvoiceData.Cust.Adrs)) {
             Customer.Adrs.push(argInvoiceData.Cust.Adrs.A1);
-            if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.Cust.Adrs.A2)) {
+            if (!utils_1.TrUtils.IsEmpty(argInvoiceData.Cust.Adrs.A2)) {
                 Customer.Adrs.push(argInvoiceData.Cust.Adrs.A2);
             }
             Customer.Adrs.push(argInvoiceData.Cust.Adrs.Ct);
@@ -423,16 +423,16 @@ class InvPrintService {
         return Customer;
     }
     static GetBillToName(Title, Name) {
-        return tr_utils_1.TrUtils.IsEmpty(Title) ? Name : Title + ' ' + Name;
+        return utils_1.TrUtils.IsEmpty(Title) ? Name : Title + ' ' + Name;
     }
     static GetPaymentsTotal(Credits, InvoicePayments, Total, InvoiceStatus) {
         var i = 0;
         let Data = {};
         let PaidTotal = 0;
-        if (tr_utils_1.TrUtils.IsNull(InvoicePayments)) {
+        if (utils_1.TrUtils.IsNull(InvoicePayments)) {
             InvoicePayments = [];
         }
-        if (tr_utils_1.TrUtils.IsNull(Credits)) {
+        if (utils_1.TrUtils.IsNull(Credits)) {
             Credits = [];
         }
         for (i = 0; i < InvoicePayments.length; i++) {
@@ -445,7 +445,7 @@ class InvPrintService {
             Data.Due = 0;
         }
         else {
-            Data.Due = tr_utils_1.TrUtils.FixedTo(Total - PaidTotal);
+            Data.Due = utils_1.TrUtils.FixedTo(Total - PaidTotal);
         }
         if (Data.Due < 0) {
             Data.Due = 0;
@@ -453,7 +453,7 @@ class InvPrintService {
         if (Data.Due === 0) {
             Data.Sts = enums_1.InvoiceStatusEnum.Closed;
         }
-        Data.Paid = tr_utils_1.TrUtils.FixedTo(PaidTotal);
+        Data.Paid = utils_1.TrUtils.FixedTo(PaidTotal);
         return Data;
     }
 }

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvoiceLandscapePdfService = void 0;
-const my_date_1 = require("../utils/my-date");
-const tr_utils_1 = require("../utils/tr-utils");
+const my_date_1 = require("../shared/my-date");
+const utils_1 = require("../shared/utils");
 const shared_pdf_service_1 = require("./shared-pdf.service");
 const shared_print_service_1 = require("./shared-print.service");
 class InvoiceLandscapePdfService {
@@ -11,7 +11,7 @@ class InvoiceLandscapePdfService {
     }
     static GetInvoiceLandscapePrint(ROPrintData, numberofCopies, moreDiscDetails) {
         var contents = [];
-        if (tr_utils_1.TrUtils.IsNull(numberofCopies) || numberofCopies.length === 0) {
+        if (utils_1.TrUtils.IsNull(numberofCopies) || numberofCopies.length === 0) {
             contents.push(this.CommonHeaderDetails(ROPrintData, null), this.PreparesparePartsTable(ROPrintData), this.CommonTotalDetails(ROPrintData, null, numberofCopies, moreDiscDetails));
         }
         else {
@@ -38,7 +38,7 @@ class InvoiceLandscapePdfService {
     }
     static GetFileName(ROPrintData) {
         let fileName = ROPrintData.HeaderName;
-        if (!tr_utils_1.TrUtils.IsNull(ROPrintData.Product) && !tr_utils_1.TrUtils.IsEmpty(ROPrintData.Product.RegNo)) {
+        if (!utils_1.TrUtils.IsNull(ROPrintData.Product) && !utils_1.TrUtils.IsEmpty(ROPrintData.Product.RegNo)) {
             fileName = fileName + '-' + ROPrintData.Product.RegNo;
         }
         return fileName;
@@ -48,14 +48,14 @@ class InvoiceLandscapePdfService {
     }
     static GetHeaderInfo(InvoicePDFData) {
         let TaxInfo = [];
-        if (!tr_utils_1.TrUtils.IsEmpty(InvoicePDFData.Entity.GSTIN)) {
+        if (!utils_1.TrUtils.IsEmpty(InvoicePDFData.Entity.GSTIN)) {
             TaxInfo.push({ text: 'GSTIN : ' + InvoicePDFData.Entity.GSTIN, marginTop: 2, marginLeft: 5, alignment: 'left', fontSize: 9, width: 'auto' });
         }
         // if (!TrUtils.IsEmpty(InvoicePDFData.Entity.PAN)) {
         //     TaxInfo.push({ text: 'PAN : ' + InvoicePDFData.Entity.PAN, marginTop: 2, marginLeft: 5, alignment: 'left', fontSize: 9, width: 'auto' },
         //     );
         // }
-        if (!tr_utils_1.TrUtils.IsEmpty(InvoicePDFData.Entity.DLNo)) {
+        if (!utils_1.TrUtils.IsEmpty(InvoicePDFData.Entity.DLNo)) {
             TaxInfo.push({ text: 'D.L.NO : ' + InvoicePDFData.Entity.DLNo, marginTop: 2, marginLeft: 5, alignment: 'left', fontSize: 9, width: '*' });
         }
         TaxInfo.push(this.GetBillofSupplyName(InvoicePDFData.Settings));
@@ -129,19 +129,19 @@ class InvoiceLandscapePdfService {
                 ]
             }
         ];
-        if (!tr_utils_1.TrUtils.IsNull(Image)) {
+        if (!utils_1.TrUtils.IsNull(Image)) {
             // Details.unshift({ text: '', width: 120 });
             if (Entity.CName.length < 28) {
                 Details[0].stack[0].columns.push({ text: '', width: 140 });
             }
-            if (!tr_utils_1.TrUtils.IsNull(text)) {
+            if (!utils_1.TrUtils.IsNull(text)) {
                 Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 10 });
             }
             Details.unshift({ image: Image, width: 120, height: 80 });
         }
         else {
             Details[0].stack[1].columns.unshift({ text: '', width: 130 });
-            if (!tr_utils_1.TrUtils.IsNull(text)) {
+            if (!utils_1.TrUtils.IsNull(text)) {
                 Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 10 });
             }
         }
@@ -160,7 +160,7 @@ class InvoiceLandscapePdfService {
         let List = [];
         if (ROPrintData.Entity.Body === 1) {
             for (let i = 0; i < ROPrintData.PrintInfo.length; i++) {
-                if (tr_utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
+                if (utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
                     ROPrintData.PrintInfo[i].Text = '';
                 }
                 // List.push(ROPrintData.PrintInfo[i].Text,
@@ -171,10 +171,10 @@ class InvoiceLandscapePdfService {
         else {
             if (ROPrintData.Entity.Body === 2) {
                 for (let i = 0; i < ROPrintData.PrintInfo.length; i++) {
-                    if (tr_utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
+                    if (utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
                         ROPrintData.PrintInfo[i].Text = '';
                     }
-                    List.push(ROPrintData.PrintInfo[i].Text, this.WithOutDiscountFieldTable(tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), ROPrintData.ShowTaxColumn, ROPrintData.Entity.MPN, ROPrintData.Entity.Body, ROPrintData.ShowIGST, ROPrintData.ConsolidateGST, ROPrintData.ShowDiscountColumn));
+                    List.push(ROPrintData.PrintInfo[i].Text, this.WithOutDiscountFieldTable(utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), ROPrintData.ShowTaxColumn, ROPrintData.Entity.MPN, ROPrintData.Entity.Body, ROPrintData.ShowIGST, ROPrintData.ConsolidateGST, ROPrintData.ShowDiscountColumn));
                 }
             }
             else {
@@ -185,10 +185,10 @@ class InvoiceLandscapePdfService {
                 }
                 else {
                     for (let i = 0; i < ROPrintData.PrintInfo.length; i++) {
-                        if (tr_utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
+                        if (utils_1.TrUtils.IsNull(ROPrintData.PrintInfo[i].Text)) {
                             ROPrintData.PrintInfo[i].Text = '';
                         }
-                        List.push(ROPrintData.PrintInfo[i].Text, this.GetWithOutDiscAndTaxFieldHeader(tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), ROPrintData.ShowTaxColumn, ROPrintData.Entity.MPN, ROPrintData.Entity.Body, ROPrintData.ShowIGST, ROPrintData.ConsolidateGST, ROPrintData.ShowDiscountColumn));
+                        List.push(ROPrintData.PrintInfo[i].Text, this.GetWithOutDiscAndTaxFieldHeader(utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), ROPrintData.ShowTaxColumn, ROPrintData.Entity.MPN, ROPrintData.Entity.Body, ROPrintData.ShowIGST, ROPrintData.ConsolidateGST, ROPrintData.ShowDiscountColumn));
                     }
                 }
             }
@@ -437,14 +437,14 @@ class InvoiceLandscapePdfService {
             // console.log('part', part);
             var dataRow = [];
             columns.forEach((column) => {
-                if ((!tr_utils_1.TrUtils.IsFixedZero(part[column.Field]) && !tr_utils_1.TrUtils.IsNull(part[column.Field]))
+                if ((!utils_1.TrUtils.IsFixedZero(part[column.Field]) && !utils_1.TrUtils.IsNull(part[column.Field]))
                     || (column.text === 'Line Total' || column.text === 'Expiry')) {
                     if (part[column.Field] === 'Spare Parts') {
                         dataRow.push({ text: part[column.Field].toString(), marginLeft: 50, style: 'InlineHeader' });
                     }
                     else {
                         if (((column.Field === 'CGSTAmt' || column.Field === 'SGSTAmt' || column.Field === 'CGSTPerc' || column.Field === 'SGSTPerc' || column.Field === 'IGSTAmt' || column.Field === 'IGSTPerc')
-                            && tr_utils_1.TrUtils.CheckInvalidSelect(part.TCode))) {
+                            && utils_1.TrUtils.CheckInvalidSelect(part.TCode))) {
                             part[column.Field] = '';
                             dataRow.push({ text: part[column.Field].toString(), alignment: 'center' });
                         }
@@ -454,7 +454,7 @@ class InvoiceLandscapePdfService {
                                 || column.Field === 'CGSTPerc' || column.Field === 'SGSTPerc' || column.Field === 'IGSTAmt' || column.Field === 'IGSTPerc') {
                                 if (column.Field === 'Disc') {
                                     if (column.type === 'percentage') {
-                                        if (!tr_utils_1.TrUtils.IsEmpty(part[column.Field])) {
+                                        if (!utils_1.TrUtils.IsEmpty(part[column.Field])) {
                                             dataRow.push({ text: part[column.Field].toString(), noWrap: true });
                                         }
                                         else {
@@ -462,7 +462,7 @@ class InvoiceLandscapePdfService {
                                         }
                                     }
                                     else {
-                                        if (!tr_utils_1.TrUtils.IsZero(part[column.Field])) {
+                                        if (!utils_1.TrUtils.IsZero(part[column.Field])) {
                                             dataRow.push({ text: part[column.Field].toString(), noWrap: true });
                                         }
                                         else {
@@ -472,7 +472,7 @@ class InvoiceLandscapePdfService {
                                 }
                                 else {
                                     if (column.Field === 'Batch') {
-                                        if (!tr_utils_1.TrUtils.IsNull(part[column.Field])) {
+                                        if (!utils_1.TrUtils.IsNull(part[column.Field])) {
                                             dataRow.push({ text: part[column.Field].BN, nowrap: true });
                                         }
                                         else {
@@ -480,7 +480,7 @@ class InvoiceLandscapePdfService {
                                         }
                                     }
                                     else if (column.Field === 'ExDate') {
-                                        if (!tr_utils_1.TrUtils.IsNull(part['Batch'])) {
+                                        if (!utils_1.TrUtils.IsNull(part['Batch'])) {
                                             dataRow.push({ text: my_date_1.MyDate.ConvertUTCDateToReadableExDate(part['Batch'].ExDt), nowrap: true });
                                         }
                                         else {
@@ -488,7 +488,7 @@ class InvoiceLandscapePdfService {
                                         }
                                     }
                                     else {
-                                        if (!tr_utils_1.TrUtils.IsZero(part[column.Field])) {
+                                        if (!utils_1.TrUtils.IsZero(part[column.Field])) {
                                             dataRow.push({ text: part[column.Field].toString(), alignment: 'right', nowrap: true });
                                         }
                                         else {
@@ -499,13 +499,13 @@ class InvoiceLandscapePdfService {
                             }
                             else {
                                 // dataRow.push(part[column.Field].toString());
-                                if (tr_utils_1.TrUtils.IsNull(part[column.Field])) {
+                                if (utils_1.TrUtils.IsNull(part[column.Field])) {
                                     part[column.Field] = '';
                                 }
                                 if (column.Field === 'Desc') {
                                     let DescData = [];
                                     DescData.push(part[column.Field].toString());
-                                    if (!tr_utils_1.TrUtils.IsEmpty(part['EDesc'])) {
+                                    if (!utils_1.TrUtils.IsEmpty(part['EDesc'])) {
                                         DescData.push({ text: part['EDesc'].toString(), color: 'grey' });
                                     }
                                     dataRow.push({ stack: DescData });
@@ -518,7 +518,7 @@ class InvoiceLandscapePdfService {
                     }
                 }
                 else {
-                    if (column.Field === 'SNo' && !tr_utils_1.TrUtils.IsNull(part.Desc)) {
+                    if (column.Field === 'SNo' && !utils_1.TrUtils.IsNull(part.Desc)) {
                         part[column.Field] = SNo;
                         SNo = SNo + 1;
                     }
@@ -838,7 +838,7 @@ class InvoiceLandscapePdfService {
         // if (ROPrintData.Type !== 'Invoice') {
         //     CommonDetails.splice(2, 0, SharedPDFService.GetUnderLine());
         // }
-        if (!tr_utils_1.TrUtils.IsNull(numberofCopies) && numberofCopies.length !== 0 && (index !== (numberofCopies.length - 1))) {
+        if (!utils_1.TrUtils.IsNull(numberofCopies) && numberofCopies.length !== 0 && (index !== (numberofCopies.length - 1))) {
             CommonDetails.push({ text: '', pageBreak: 'after' });
         }
         return CommonDetails;
@@ -875,12 +875,12 @@ class InvoiceLandscapePdfService {
         let totalDisc;
         let totalTax;
         if (!ROPrintData.Consolidate) {
-            totalTax = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborITax) + Number(ROPrintData.CustPartITax));
-            if (tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
+            totalTax = utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborITax) + Number(ROPrintData.CustPartITax));
+            if (utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax)) {
+                totalDisc = utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
             }
             else {
-                totalDisc = tr_utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
+                totalDisc = utils_1.TrUtils.FixPriceValue(Number(ROPrintData.CustLaborDiscTotal) + Number(ROPrintData.CustPartsDiscTotal));
             }
         }
         return [