shareneus 1.4.34 → 1.4.35

package/dist/services/sales-pdf.service.js

@@ -4,12 +4,12 @@ exports.SalesPdfService = void 0;
 const shared_pdf_service_1 = require("./shared-pdf.service");
 const shared_print_service_1 = require("./shared-print.service");
 const equipment_design_pdf_service_1 = require("./equipment-design-pdf.service");
-const tr_utils_1 = require("../utils/tr-utils");
+const utils_1 = require("../shared/utils");
 class SalesPdfService {
     static GetSalesPrint(ROPrintData, numberofCopies, isOtherIndustry, Entity, Sites, Items, Image, moreDiscDetails) {
         console.log('ROPrintData', ROPrintData);
         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 {
@@ -17,9 +17,9 @@ class SalesPdfService {
                 contents.push(this.CommonHeaderDetails(ROPrintData, text), this.PreparesparePartsTable(ROPrintData), this.CommonTotalDetails(ROPrintData, index, numberofCopies, moreDiscDetails));
             });
         }
-        if (isOtherIndustry && !tr_utils_1.TrUtils.IsNull(Sites) && Sites.length != 0) {
+        if (isOtherIndustry && !utils_1.TrUtils.IsNull(Sites) && Sites.length != 0) {
             contents.push({ text: '', pageBreak: 'after' });
-            contents.push(equipment_design_pdf_service_1.EquipmentDesignPdf.GetContentData(tr_utils_1.TrUtils.Stringify(Entity), Sites, Items, Image));
+            contents.push(equipment_design_pdf_service_1.EquipmentDesignPdf.GetContentData(utils_1.TrUtils.Stringify(Entity), Sites, Items, Image));
         }
         var dd = {
             info: {
@@ -42,7 +42,7 @@ class SalesPdfService {
     }
     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;
@@ -68,19 +68,19 @@ class SalesPdfService {
         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, this.GetLaborPartsTableForView(tr_utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), ROPrintData.Entity.MPN));
+                List.push(ROPrintData.PrintInfo[i].Text, this.GetLaborPartsTableForView(utils_1.TrUtils.Stringify(ROPrintData.PrintInfo[i].Items), ROPrintData.Entity.MPN));
             }
         }
         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 {
@@ -89,10 +89,10 @@ class SalesPdfService {
                 }
                 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));
                     }
                 }
             }
@@ -188,13 +188,13 @@ class SalesPdfService {
         Parts.forEach((part) => {
             var dataRow = [];
             columns.forEach((column) => {
-                if (((!tr_utils_1.TrUtils.IsNull(part.Type) && part.Type !== 'Lab') || (!tr_utils_1.TrUtils.IsFixedZero(part[column.Field]) && !tr_utils_1.TrUtils.IsNull(part[column.Field])))
+                if (((!utils_1.TrUtils.IsNull(part.Type) && part.Type !== 'Lab') || (!utils_1.TrUtils.IsFixedZero(part[column.Field]) && !utils_1.TrUtils.IsNull(part[column.Field])))
                     || (column.text === 'Line Total')) {
                     if (part[column.Field] === 'Spare Parts') {
                         dataRow.push({ text: part[column.Field].toString(), marginLeft: 50, style: 'InlineHeader' });
                     }
                     else {
-                        if (!tr_utils_1.TrUtils.IsNull(part.Type) && part.Type !== 'Lab') {
+                        if (!utils_1.TrUtils.IsNull(part.Type) && part.Type !== 'Lab') {
                             if (column.Field === 'Desc') {
                                 if (part.Type === 'Note') {
                                     dataRow.push({ text: part[column.Field].toString(), colSpan: 11, bold: true });
@@ -219,7 +219,7 @@ class SalesPdfService {
                         }
                         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' });
                             }
@@ -229,7 +229,7 @@ class SalesPdfService {
                                     || 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 {
@@ -237,7 +237,7 @@ class SalesPdfService {
                                             }
                                         }
                                         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 {
@@ -246,7 +246,7 @@ class SalesPdfService {
                                         }
                                     }
                                     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 {
@@ -259,13 +259,13 @@ class SalesPdfService {
                                     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 });
                                     }
                                     else {
-                                        part[column.Field] = tr_utils_1.TrUtils.IsNull(part[column.Field]) ? '' : part[column.Field];
+                                        part[column.Field] = utils_1.TrUtils.IsNull(part[column.Field]) ? '' : part[column.Field];
                                         dataRow.push({ text: part[column.Field].toString() });
                                     }
                                 }
@@ -497,7 +497,7 @@ class SalesPdfService {
         Parts.forEach((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') {
                     if (part[column.Field] === 'Spare Parts') {
                         dataRow.push({ text: part[column.Field].toString(), marginLeft: 50, style: 'InlineHeader' });
@@ -518,7 +518,7 @@ class SalesPdfService {
                             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 });
@@ -611,7 +611,7 @@ class SalesPdfService {
     }
     static CommonTotalDetails(ROPrintData, index, numberofCopies, moreDiscDetails) {
         let CommonDetails = [
-            shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, '0.00', '0.00', '0.00', '0.00', '0.00', '0.00', ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustItemsTotalBeforeDisc, ROPrintData.CustItemsDiscTotal, ROPrintData.CustItemCGST, ROPrintData.CustItemSGST, ROPrintData.CustTaxGroupData, ROPrintData.ShowAccParts, '0.00', ROPrintData.CustItemAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), '0.00', ROPrintData.CustItemITax, ROPrintData.Consolidate, ROPrintData.From, null, ROPrintData.SubTotal, moreDiscDetails),
+            shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, '0.00', '0.00', '0.00', '0.00', '0.00', '0.00', ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustItemsTotalBeforeDisc, ROPrintData.CustItemsDiscTotal, ROPrintData.CustItemCGST, ROPrintData.CustItemSGST, ROPrintData.CustTaxGroupData, ROPrintData.ShowAccParts, '0.00', ROPrintData.CustItemAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), '0.00', ROPrintData.CustItemITax, ROPrintData.Consolidate, ROPrintData.From, null, ROPrintData.SubTotal, moreDiscDetails),
             shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, false),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),
@@ -620,7 +620,7 @@ class SalesPdfService {
         if (ROPrintData.Type !== 'Invoice') {
             CommonDetails.splice(2, 0, shared_pdf_service_1.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;

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

@@ -3,25 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SalesPrintService = void 0;
 const shared_print_service_1 = require("./shared-print.service");
 const sales_totals_service_1 = require("./sales-totals.service");
-const tr_utils_1 = require("../utils/tr-utils");
+const utils_1 = require("../shared/utils");
 const code_enums_1 = require("../enums/code-enums");
-const my_date_1 = require("../utils/my-date");
+const my_date_1 = require("../shared/my-date");
 const enums_1 = require("../enums/enums");
 const aggregation_1 = require("../aggregation/aggregation");
 class SalesPrintService {
     static GetSalesPrintInfo(OriginalInvoiceData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, isOtherIndustry) {
         var _a, _b;
-        let ForInsurance = !tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.InsId);
+        let ForInsurance = !utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.InsId);
         let InvoicePrintData = {};
-        let argInvoiceData = tr_utils_1.TrUtils.Stringify(OriginalInvoiceData);
+        let argInvoiceData = utils_1.TrUtils.Stringify(OriginalInvoiceData);
         if (!IncludeGST) {
             argInvoiceData.Settings.Tax = 'NO';
         }
         InvoicePrintData.IsProforma = IsProforma;
-        InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
-        InvoicePrintData.DoS = tr_utils_1.TrUtils.Stringify(argInvoiceData.DoS);
+        InvoicePrintData.Settings = utils_1.TrUtils.Stringify(argInvoiceData.Settings);
+        InvoicePrintData.DoS = utils_1.TrUtils.Stringify(argInvoiceData.DoS);
         let SType;
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.SType)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.SType)) {
             SType = OriginalInvoiceData.SType;
         }
         InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argInvoiceData, IsProforma);
@@ -29,7 +29,7 @@ class SalesPrintService {
         InvoicePrintData = shared_print_service_1.PrintSharedService.GetEntityHeaderStyles(InvoicePrintData, OriginalEntityData, image);
         InvoicePrintData = this.GetInvoiceOtherDetailsForPrint(InvoicePrintData, argInvoiceData);
         // console.log(InvoicePrintData);
-        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;
         // argInvoiceData.Items = argInvoiceData.Items.filter((item: any) => {
         //     return TrUtils.IsNull(item.Type);
         // });
@@ -37,7 +37,7 @@ class SalesPrintService {
         if (ConsolidateGST) {
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustItemAfterTax;
         }
-        InvoicePrintData = tr_utils_1.TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
+        InvoicePrintData = utils_1.TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
         // InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Ops, ConsolidateGST, TaxCodes);
         InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes, isOtherIndustry, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot);
         // argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
@@ -45,7 +45,7 @@ class SalesPrintService {
         InvoicePrintData = this.GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData);
         InvoicePrintData = this.GetBillNameForInvoicePrint(argInvoiceData, InvoicePrintData);
         InvoicePrintData = this.GetShipToForSOPrint(argInvoiceData, InvoicePrintData);
-        if (tr_utils_1.TrUtils.IsNull(argInvoiceData.Payments)) {
+        if (utils_1.TrUtils.IsNull(argInvoiceData.Payments)) {
             argInvoiceData.Payments = [];
         }
         let PaymentData = this.GetPaymentsTotal(argInvoiceData.Payments, InvoicePrintData.Total, argInvoiceData.Sts);
@@ -54,7 +54,7 @@ class SalesPrintService {
         }
         InvoicePrintData.Due = PaymentData.Due;
         InvoicePrintData.Paid = PaymentData.Paid;
-        if (!tr_utils_1.TrUtils.IsNull(PaymentData.Sts)) {
+        if (!utils_1.TrUtils.IsNull(PaymentData.Sts)) {
             InvoicePrintData.Sts = PaymentData.Sts;
         }
         InvoicePrintData.Consolidate = ConsolidateGST;
@@ -72,11 +72,11 @@ class SalesPrintService {
         InvoicePrintData.IncludeGST = IncludeGST;
         InvoicePrintData.ConsolidateGST = ConsolidateGST;
         InvoicePrintData.ShowAccParts = false;
-        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);
-        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) {
@@ -102,59 +102,59 @@ class SalesPrintService {
         let TotalAmt = 0;
         let DiscAmt = 0;
         Items.forEach((Item) => {
-            if (tr_utils_1.TrUtils.IsNull(Item.Type) || Item.Type === 'Lab') {
-                Amt = Amt + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.UnAmt);
-                DiscAmt = DiscAmt + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.Disc) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.RecDisc);
-                TaxAmt = TaxAmt + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST)
-                    + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
+            if (utils_1.TrUtils.IsNull(Item.Type) || Item.Type === 'Lab') {
+                Amt = Amt + utils_1.TrUtils.SetValueToZeroIfNull(Item.UnAmt);
+                DiscAmt = DiscAmt + utils_1.TrUtils.SetValueToZeroIfNull(Item.Disc) + utils_1.TrUtils.SetValueToZeroIfNull(Item.RecDisc);
+                TaxAmt = TaxAmt + utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST) + utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST)
+                    + utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
                 let NetAmt = (0, aggregation_1.subtraction)(Item.UnAmt, Item.Disc, Item.RecDisc);
-                TotalAmt = TotalAmt + tr_utils_1.TrUtils.SetValueToZeroIfNull(NetAmt) +
-                    tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST) + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST)
-                    + tr_utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
+                TotalAmt = TotalAmt + utils_1.TrUtils.SetValueToZeroIfNull(NetAmt) +
+                    utils_1.TrUtils.SetValueToZeroIfNull(Item.CGST) + utils_1.TrUtils.SetValueToZeroIfNull(Item.SGST)
+                    + utils_1.TrUtils.SetValueToZeroIfNull(Item.IGST);
                 if (Consolidate) {
                     let AfterDiscForEach = Item.AfterItemDisc / Item.Qty;
                     let CTaxAmtPerItem = Item.CGST / Item.Qty;
                     let STaxAmtPerItem = Item.SGST / Item.Qty;
                     let ITaxAmtPerItem = Item.IGST / Item.Qty;
-                    Item.UnPr = tr_utils_1.TrUtils.FixedTo(AfterDiscForEach + CTaxAmtPerItem + STaxAmtPerItem + ITaxAmtPerItem);
+                    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);
                 }
-                if (isOtherIndustry && tr_utils_1.TrUtils.IsNull(Item.Type) && !tr_utils_1.TrUtils.IsNull(Item.Model) && !tr_utils_1.TrUtils.IsNull(Item.TR)) {
+                if (isOtherIndustry && utils_1.TrUtils.IsNull(Item.Type) && !utils_1.TrUtils.IsNull(Item.Model) && !utils_1.TrUtils.IsNull(Item.TR)) {
                     Item.Desc = Item.Desc + '( ' + Item.Model + ',   ' + Item.TR + ' TR )';
                 }
-                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.CGSTAmt = utils_1.TrUtils.FixPriceValue(Item.CGST);
+                Item.SGSTAmt = utils_1.TrUtils.FixPriceValue(Item.SGST);
+                Item.IGSTAmt = utils_1.TrUtils.FixPriceValue(Item.IGST);
                 Item.CGSTPerc = shared_print_service_1.PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
                 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.AfterItemTax);
+                    Item.LineTotal = utils_1.TrUtils.FixPriceValue(Item.AfterItemTax);
                 }
                 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 {
                 if (Item.Type === 'Sub') {
-                    Item.LineTotal = tr_utils_1.TrUtils.FixedTo(Amt);
+                    Item.LineTotal = utils_1.TrUtils.FixedTo(Amt);
                     Amt = 0;
                 }
                 if (Item.Type === 'Tax') {
-                    Item.LineTotal = tr_utils_1.TrUtils.FixedTo(TaxAmt);
+                    Item.LineTotal = utils_1.TrUtils.FixedTo(TaxAmt);
                     TaxAmt = 0;
                 }
                 if (Item.Type === 'Disc') {
-                    Item.LineTotal = tr_utils_1.TrUtils.FixedTo(DiscAmt);
+                    Item.LineTotal = utils_1.TrUtils.FixedTo(DiscAmt);
                     DiscAmt = 0;
                 }
                 if (Item.Type === 'Tot') {
-                    Item.LineTotal = tr_utils_1.TrUtils.FixedTo(TotalAmt);
+                    Item.LineTotal = utils_1.TrUtils.FixedTo(TotalAmt);
                     TotalAmt = 0;
                 }
             }
@@ -177,15 +177,15 @@ class SalesPrintService {
         return PrintInfo;
     }
     static GetFormattedProductDataForPrint(OriginalInvoiceData, InvoicePrintData) {
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.Prod)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.Prod)) {
             InvoicePrintData.Product = OriginalInvoiceData.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 = OriginalInvoiceData.Prod.MIn;
@@ -199,17 +199,17 @@ class SalesPrintService {
         Customer.DLNo = OriginalInvoiceData.ShipTo.DLNo;
         Customer.Adrs = [];
         Customer.Cons = [];
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.ShipTo.Adrs)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.ShipTo.Adrs)) {
             Customer.Adrs.push(OriginalInvoiceData.ShipTo.Adrs.A1);
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.ShipTo.Adrs.A2)) {
+            if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.ShipTo.Adrs.A2)) {
                 Customer.Adrs.push(OriginalInvoiceData.ShipTo.Adrs.A2);
             }
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.ShipTo.Adrs.Ct)) {
+            if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.ShipTo.Adrs.Ct)) {
                 Customer.Adrs.push(OriginalInvoiceData.ShipTo.Adrs.Ct);
             }
         }
         Customer.GSTIN = OriginalInvoiceData.ShipTo.GSTIN;
-        if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.ShipTo.Ph)) {
+        if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.ShipTo.Ph)) {
             Customer.Cons = [
                 {
                     Type: 'M',
@@ -218,7 +218,7 @@ class SalesPrintService {
             ];
         }
         InvoicePrintData.ShippmentTo = Customer;
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.ShipTo.InsId)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.ShipTo.InsId)) {
             InvoicePrintData.Cust = this.GetCustomerDetails(OriginalInvoiceData);
         }
         return InvoicePrintData;
@@ -229,17 +229,17 @@ class SalesPrintService {
         Customer.DLNo = OriginalInvoiceData.BillTo.DLNo;
         Customer.Adrs = [];
         Customer.Cons = [];
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.Adrs)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.Adrs)) {
             Customer.Adrs.push(OriginalInvoiceData.BillTo.Adrs.A1);
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.BillTo.Adrs.A2)) {
+            if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.BillTo.Adrs.A2)) {
                 Customer.Adrs.push(OriginalInvoiceData.BillTo.Adrs.A2);
             }
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.BillTo.Adrs.Ct)) {
+            if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.BillTo.Adrs.Ct)) {
                 Customer.Adrs.push(OriginalInvoiceData.BillTo.Adrs.Ct);
             }
         }
         Customer.GSTIN = OriginalInvoiceData.BillTo.GSTIN;
-        if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.BillTo.Ph)) {
+        if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.BillTo.Ph)) {
             Customer.Cons = [
                 {
                     Type: 'M',
@@ -248,7 +248,7 @@ class SalesPrintService {
             ];
         }
         InvoicePrintData.Customer = Customer;
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.InsId)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.BillTo.InsId)) {
             InvoicePrintData.Cust = this.GetCustomerDetails(OriginalInvoiceData);
         }
         return InvoicePrintData;
@@ -257,7 +257,7 @@ class SalesPrintService {
         let Customer = {};
         Customer.Name = this.GetBillToName(OriginalInvoiceData.Cust.Title, OriginalInvoiceData.Cust.Name);
         Customer.Cons = [];
-        if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.Cust.Ph)) {
+        if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.Cust.Ph)) {
             Customer.Cons = [
                 {
                     Type: 'M',
@@ -267,9 +267,9 @@ class SalesPrintService {
         }
         Customer.GSTIN = OriginalInvoiceData.Cust.GSTIN;
         Customer.Adrs = [];
-        if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.Cust.Adrs)) {
+        if (!utils_1.TrUtils.IsNull(OriginalInvoiceData.Cust.Adrs)) {
             Customer.Adrs.push(OriginalInvoiceData.Cust.Adrs.A1);
-            if (!tr_utils_1.TrUtils.IsEmpty(OriginalInvoiceData.Cust.Adrs.A2)) {
+            if (!utils_1.TrUtils.IsEmpty(OriginalInvoiceData.Cust.Adrs.A2)) {
                 Customer.Adrs.push(OriginalInvoiceData.Cust.Adrs.A2);
             }
             Customer.Adrs.push(OriginalInvoiceData.Cust.Adrs.Ct);
@@ -279,7 +279,7 @@ class SalesPrintService {
         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(InvoicePayments, Total, InvoiceStatus) {
         var i = 0;
@@ -292,7 +292,7 @@ class SalesPrintService {
             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;
@@ -300,7 +300,7 @@ class SalesPrintService {
         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;
     }
 }