shareneus 1.7.323 → 1.7.325

package/dist/accounting/debit-note/debit-note-print.service.d.ts

@@ -1,5 +1,10 @@
 export declare class DebitNotePrintService {
     static GetDebitNotePrintInfo(OriginalInvoiceData: any, OriginalEntityData: any, image: any, IncludeGST: boolean, ConsolidateGST: boolean, TaxCodes: any, IsProforma: boolean, IsCustBillTo: boolean): any;
+    static GetLaborPrintInfo(LaborList: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number): any;
+    static getTaxName(TCode: any, TaxCodes: any): any;
+    static GetTaxAmountFromTaxes(item: any, taxCode: string): any;
+    static GetTaxRateFromTaxes(item: any, taxCode: string): any;
+    static GetTCodeFromTaxes(item: any): any;
     static GetPrintConditionsBasedOnInput(InvoicePrintData: any, IncludeGST: boolean, ConsolidateGST: boolean, SType: any, OriginalInvoiceData: any, IsProforma: boolean, IsBillTo: boolean): any;
     static GetInvoiceTypeHeading(InvoicePrintData: any, OriginalInvoiceData: any, IncludeGST: boolean, ConsolidateGST: boolean, IsProforma: boolean, IsBillTo: boolean): any;
     static GetInvoiceOtherDetailsForPrint(InvoicePrintData: any, OriginalInvoiceData: any, IsCustBillTo: boolean): any;

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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebitNotePrintService = void 0;
 const shared_print_service_1 = require("../../shared/shared-print.service");
-const debit_note_totals_service_1 = require("./debit-note-totals.service");
 const code_enums_1 = require("../../enums/code-enums");
 const tr_utils_1 = require("../../utils/tr-utils");
 const enums_1 = require("../../enums/enums");
 const my_date_1 = require("../../utils/my-date");
 const math_operations_1 = require("../../shared/math-operations");
+const invoice_total_service_1 = require("../invoice/invoice-total.service");
 class DebitNotePrintService {
     static GetDebitNotePrintInfo(OriginalInvoiceData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, IsCustBillTo) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         let InvoicePrintData = {};
         let argInvoiceData = tr_utils_1.TrUtils.Stringify(OriginalInvoiceData);
         if (!IncludeGST) {
@@ -25,13 +25,14 @@ class DebitNotePrintService {
         InvoicePrintData = shared_print_service_1.PrintSharedService.GetEntityHeaderStyles(InvoicePrintData, OriginalEntityData, image);
         InvoicePrintData = this.GetInvoiceOtherDetailsForPrint(InvoicePrintData, argInvoiceData, IsCustBillTo);
         let IsTaxable = (IncludeGST && tr_utils_1.TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
-        let finalTotalsData = debit_note_totals_service_1.DebitNoteTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable, true, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity);
+        let finalTotalsData = invoice_total_service_1.InvoiceTotalsService.GetTotalsValue(argInvoiceData.Services, argInvoiceData.Items, IsTaxable, true, null, '', null, '', argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, argInvoiceData.Adjust, true, InvoicePrintData.Entity);
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
         }
         InvoicePrintData = tr_utils_1.TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
-        InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot, (_c = InvoicePrintData.Entity) === null || _c === void 0 ? void 0 : _c.DecimalsNumber);
+        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.Entity.DecimalsNumber);
+        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, (_e = InvoicePrintData.Entity) === null || _e === void 0 ? void 0 : _e.DecimalsNumber);
         argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
         InvoicePrintData.PrintInfo = this.PrepareFormatForInvoicePrint(InvoicePrintData, code_enums_1.ROTypeEnum.Invoice, argInvoiceData.Sts);
         InvoicePrintData = this.GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData);
@@ -39,7 +40,7 @@ class DebitNotePrintService {
         if (tr_utils_1.TrUtils.IsNull(argInvoiceData.Payments)) {
             argInvoiceData.Payments = [];
         }
-        let PaymentData = this.GetPaymentsTotal(argInvoiceData.Payments, InvoicePrintData.Total, argInvoiceData.Sts, (_d = InvoicePrintData.Entity) === null || _d === void 0 ? void 0 : _d.DecimalsNumber);
+        let PaymentData = this.GetPaymentsTotal(argInvoiceData.Payments, InvoicePrintData.Total, argInvoiceData.Sts, (_f = InvoicePrintData.Entity) === null || _f === void 0 ? void 0 : _f.DecimalsNumber);
         InvoicePrintData.Due = PaymentData.Due;
         InvoicePrintData.Paid = PaymentData.Paid;
         if (!tr_utils_1.TrUtils.IsNull(PaymentData.Sts)) {
@@ -51,6 +52,78 @@ class DebitNotePrintService {
         }
         return InvoicePrintData;
     }
+    static GetLaborPrintInfo(LaborList, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
+        LaborList.forEach((Labor) => {
+            Labor.HSN = Labor.SAC;
+            if (tr_utils_1.TrUtils.IsNull(Labor.Qty)) {
+                Labor.Qty = 1;
+            }
+            if (Consolidate) {
+                Labor.UnPr = tr_utils_1.TrUtils.FixedTo(Labor.AfterLaborTax, DecimalsNumber);
+            }
+            else {
+                Labor.UnPr = tr_utils_1.TrUtils.FixPriceValue(Labor.Pr, DecimalsNumber);
+            }
+            if (!tr_utils_1.TrUtils.IsEmpty(Labor.Perc)) {
+                Labor.DiscPerc = Labor.Perc;
+            }
+            else {
+                Labor.DiscPerc = Labor.Perc;
+                if (!tr_utils_1.TrUtils.IsZero(Number(Labor.UnPr))) {
+                    Labor.DiscPerc = (0, math_operations_1.Divide)((0, math_operations_1.Multiply)(100, Labor.Disc), Labor.UnPr);
+                }
+                else {
+                    Labor.DiscPerc = 0;
+                }
+            }
+            Labor.TCode = this.GetTCodeFromTaxes(Labor);
+            Labor.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'CGST'), DecimalsNumber);
+            Labor.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'SGST'), DecimalsNumber);
+            Labor.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'IGST'), DecimalsNumber);
+            Labor.QtyAndUoM = Labor.Qty.toString();
+            Labor.CGSTPerc = this.GetTaxRateFromTaxes(Labor, 'CGST');
+            Labor.SGSTPerc = this.GetTaxRateFromTaxes(Labor, 'SGST');
+            Labor.IGSTPerc = this.GetTaxRateFromTaxes(Labor, 'IGST');
+            Labor.TaxName = this.getTaxName(Labor.TCode, TaxCodes);
+            if (LineTotal === 'AT') {
+                Labor.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Labor.AfterLaborTax, DecimalsNumber);
+            }
+            else {
+                Labor.LineTotal = tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Subtract)(Labor.Amt, Labor.Disc), DecimalsNumber);
+            }
+        });
+        return LaborList;
+    }
+    static getTaxName(TCode, TaxCodes) {
+        let Index = TaxCodes.findIndex((TaxCode) => {
+            return Number(TCode) === TaxCode._id;
+        });
+        return (Index !== -1) ? TaxCodes[Index].Name : '';
+    }
+    static GetTaxAmountFromTaxes(item, taxCode) {
+        const taxes = Array.isArray(item === null || item === void 0 ? void 0 : item.Taxes) ? item.Taxes : [];
+        const matchedTaxes = taxes.filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === taxCode);
+        if (matchedTaxes.length !== 0) {
+            return matchedTaxes.reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Amt), 0);
+        }
+        return 0;
+    }
+    static GetTaxRateFromTaxes(item, taxCode) {
+        const taxes = Array.isArray(item === null || item === void 0 ? void 0 : item.Taxes) ? item.Taxes : [];
+        const matchedTaxes = taxes.filter((tax) => (tax === null || tax === void 0 ? void 0 : tax.Code) === taxCode);
+        if (matchedTaxes.length !== 0) {
+            return matchedTaxes.reduce((total, tax) => (0, math_operations_1.Add)(total, tax === null || tax === void 0 ? void 0 : tax.Rate), 0);
+        }
+        return 0;
+    }
+    static GetTCodeFromTaxes(item) {
+        const taxes = Array.isArray(item === null || item === void 0 ? void 0 : item.Taxes) ? item.Taxes : [];
+        const matchedTax = taxes.find((tax) => !tr_utils_1.TrUtils.IsNull(tax === null || tax === void 0 ? void 0 : tax.TaxCodeId));
+        if (!tr_utils_1.TrUtils.IsNull(matchedTax === null || matchedTax === void 0 ? void 0 : matchedTax.TaxCodeId)) {
+            return matchedTax.TaxCodeId;
+        }
+        return item === null || item === void 0 ? void 0 : item.TCode;
+    }
     static GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, SType, OriginalInvoiceData, IsProforma, IsBillTo) {
         InvoicePrintData.For = enums_1.PayTypeEnum.Customer;
         InvoicePrintData.IncludeGST = IncludeGST;
@@ -102,12 +175,21 @@ class DebitNotePrintService {
             else {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
             }
-            Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.CGST, DecimalsNumber);
-            Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.SGST, DecimalsNumber);
-            Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.IGST, DecimalsNumber);
-            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);
+            Item.TCode = this.GetTCodeFromTaxes(Item);
+            Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Item, 'CGST'), DecimalsNumber);
+            Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Item, 'SGST'), DecimalsNumber);
+            Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Item, 'IGST'), DecimalsNumber);
+            Item.QtyAndUoM = Item.Qty.toString();
+            Item.CGSTPerc = this.GetTaxRateFromTaxes(Item, 'CGST');
+            Item.SGSTPerc = this.GetTaxRateFromTaxes(Item, 'SGST');
+            Item.IGSTPerc = this.GetTaxRateFromTaxes(Item, 'IGST');
+            Item.TaxName = this.getTaxName(Item.TCode, TaxCodes);
+            // Item.CGSTAmt = TrUtils.FixPriceValue(Item.CGST, DecimalsNumber);
+            // Item.SGSTAmt = TrUtils.FixPriceValue(Item.SGST, DecimalsNumber);
+            // Item.IGSTAmt = TrUtils.FixPriceValue(Item.IGST, DecimalsNumber);
+            // Item.CGSTPerc = PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            // Item.SGSTPerc = PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            // Item.IGSTPerc = PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             if (LineTotal === 'AT') {
                 Item.LineTotal = tr_utils_1.TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
             }
@@ -121,12 +203,14 @@ class DebitNotePrintService {
         return Items;
     }
     static ReverseItemsForInvoicePrint(argInvoiceData) {
-        argInvoiceData.Items = argInvoiceData.Items.reverse();
+        argInvoiceData.Services = argInvoiceData.Services;
+        argInvoiceData.Items = argInvoiceData.Items;
         return argInvoiceData;
     }
     static PrepareFormatForInvoicePrint(InvoicePrintData, ROType, InvoiceStatus) {
         let PrintInfo = [];
         let ROLaborParts = {};
+        ROLaborParts.Services = InvoicePrintData.Services;
         ROLaborParts.Items = InvoicePrintData.Items;
         ROLaborParts.Sts = InvoiceStatus;
         ROLaborParts.Type = ROType;

package/dist/shared/transactions-pdf.service.d.ts

@@ -2,5 +2,6 @@ export declare function GetInvoicePDF(invoiceData: any, entityData: any, headerC
 export declare function GetSalesOrderPDF(salesOrderData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], options?: any): any;
 export declare function GetDeliveryChallanPDF(deliveryChallanData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], options?: any): any;
 export declare function GetCreditNotePDF(creditNoteData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], options?: any): any;
+export declare function GetDebitNotePDF(debitNoteData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], options?: any): any;
 export declare function GetSalesReceiptPDF(salesReceiptData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any, numberofCopies?: string[], withPass?: boolean, options?: any): any;
 export declare function GetBillPDF(billData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image?: any): any;

package/dist/shared/transactions-pdf.service.js

@@ -4,6 +4,7 @@ exports.GetInvoicePDF = GetInvoicePDF;
 exports.GetSalesOrderPDF = GetSalesOrderPDF;
 exports.GetDeliveryChallanPDF = GetDeliveryChallanPDF;
 exports.GetCreditNotePDF = GetCreditNotePDF;
+exports.GetDebitNotePDF = GetDebitNotePDF;
 exports.GetSalesReceiptPDF = GetSalesReceiptPDF;
 exports.GetBillPDF = GetBillPDF;
 const purchase_order_print_service_1 = require("../purchases/purchase-order/purchase-order-print.service");
@@ -20,6 +21,7 @@ const credit_note_pdf_service_1 = require("../accounting/credit-note/credit-note
 const inv_print_service_1 = require("../accounting/invoice/inv-print.service");
 const invoice_pdf_service_1 = require("../accounting/invoice/invoice-pdf/invoice-pdf.service");
 const unified_invoice_pdf_service_1 = require("../accounting/invoice/unified-invoice-pdf.service");
+const debit_note_print_service_1 = require("../accounting/debit-note/debit-note-print.service");
 function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], withPass = false, options = null) {
     var _a;
     if (!options) {
@@ -133,6 +135,32 @@ function GetCreditNotePDF(creditNoteData, entityData, headerConfig, printConfig,
     }
     return cnPrint;
 }
+function GetDebitNotePDF(debitNoteData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], options = null) {
+    var _a;
+    if (!options) {
+        options = {
+            ShowGST: (((_a = debitNoteData === null || debitNoteData === void 0 ? void 0 : debitNoteData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) === 'TI') ? true : false,
+            ConsolidateGST: false,
+            Size: 'full',
+            MoreDiscDetails: false,
+            Orientation: 'portrait'
+        };
+    }
+    const printConfigData = tr_utils_1.TrUtils.ConcatObjects(tr_utils_1.TrUtils.Stringify(headerConfig), tr_utils_1.TrUtils.Stringify(printConfig));
+    const debitNotePrintData = debit_note_print_service_1.DebitNotePrintService.GetDebitNotePrintInfo(debitNoteData, entityData, image, true, false, taxCodes, false, true);
+    let dnPrint;
+    if (options.ConsolidateGST) {
+        dnPrint = debit_note_print_service_1.DebitNotePrintService.GetDebitNotePrintInfo(debitNotePrintData, entityData, image, true, true, taxCodes, false, true);
+    }
+    else {
+        debitNotePrintData.Round = tr_utils_1.TrUtils.FixedTo(debitNoteData.Round);
+        debitNotePrintData.Total = tr_utils_1.TrUtils.FixedTo(debitNoteData.Total);
+        debitNotePrintData.SubToal = tr_utils_1.TrUtils.FixedTo(debitNoteData.SubToal);
+        debitNotePrintData.TaxTotal = tr_utils_1.TrUtils.FixedTo(debitNoteData.TaxTotal);
+        dnPrint = (0, invoice_pdf_service_1.CreateInvoicePDFService)(debitNotePrintData, printConfigData, numberofCopies);
+    }
+    return dnPrint;
+}
 function GetSalesReceiptPDF(salesReceiptData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], withPass = false, options = null) {
     var _a;
     if (!options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.7.323",
+  "version": "1.7.325",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/accounting/debit-note/debit-note-print.service.ts

@@ -6,7 +6,8 @@ import { ROTypeEnum } from '../../enums/code-enums';
 import { TrUtils } from '../../utils/tr-utils';
 import { InvoiceStatusEnum, PayTypeEnum } from '../../enums/enums';
 import { MyDate } from '../../utils/my-date';
-import { Add, Divide, Subtract } from '../../shared/math-operations';
+import { Add, Divide, Multiply, Subtract } from '../../shared/math-operations';
+import { InvoiceTotalsService } from '../invoice/invoice-total.service';
 
 export class DebitNotePrintService {
 
@@ -38,8 +39,8 @@ export class DebitNotePrintService {
 
         let IsTaxable: boolean = (IncludeGST && TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
 
-        let finalTotalsData: any = DebitNoteTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable,
-            true, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity);
+        let finalTotalsData: any = InvoiceTotalsService.GetTotalsValue(argInvoiceData.Services, argInvoiceData.Items, IsTaxable,
+            true, null, '', null, '', argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, argInvoiceData.Adjust, true, InvoicePrintData.Entity);
 
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
@@ -47,8 +48,8 @@ export class DebitNotePrintService {
         }
 
         InvoicePrintData = TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
-
-        InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes,OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity?.DecimalsNumber);
+        InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Ops, ConsolidateGST, TaxCodes, OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity.DecimalsNumber);
+        InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes, OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity?.DecimalsNumber);
 
         argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
 
@@ -57,8 +58,8 @@ export class DebitNotePrintService {
         InvoicePrintData = this.GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData);
 
         InvoicePrintData = this.GetBillNameForInvoicePrint(argInvoiceData, InvoicePrintData, IsCustBillTo);
-        if(TrUtils.IsNull(argInvoiceData.Payments)){
-            argInvoiceData.Payments=[];
+        if (TrUtils.IsNull(argInvoiceData.Payments)) {
+            argInvoiceData.Payments = [];
         }
 
         let PaymentData = this.GetPaymentsTotal(argInvoiceData.Payments, InvoicePrintData.Total, argInvoiceData.Sts, InvoicePrintData.Entity?.DecimalsNumber);
@@ -74,6 +75,83 @@ export class DebitNotePrintService {
         return InvoicePrintData;
     }
 
+
+
+
+    static GetLaborPrintInfo(LaborList: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number) {
+        LaborList.forEach((Labor: any) => {
+            Labor.HSN = Labor.SAC;
+            if (TrUtils.IsNull(Labor.Qty)) {
+                Labor.Qty = 1;
+            }
+            if (Consolidate) {
+                Labor.UnPr = TrUtils.FixedTo(Labor.AfterLaborTax, DecimalsNumber);
+            } else {
+                Labor.UnPr = TrUtils.FixPriceValue(Labor.Pr, DecimalsNumber);
+            }
+            if (!TrUtils.IsEmpty(Labor.Perc)) {
+                Labor.DiscPerc = Labor.Perc;
+            } else {
+                Labor.DiscPerc = Labor.Perc;
+                if (!TrUtils.IsZero(Number(Labor.UnPr))) {
+                    Labor.DiscPerc = Divide(Multiply(100, Labor.Disc), Labor.UnPr);
+                } else {
+                    Labor.DiscPerc = 0;
+                }
+            }
+            Labor.TCode = this.GetTCodeFromTaxes(Labor);
+            Labor.CGSTAmt = TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'CGST'), DecimalsNumber);
+            Labor.SGSTAmt = TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'SGST'), DecimalsNumber);
+            Labor.IGSTAmt = TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Labor, 'IGST'), DecimalsNumber);
+            Labor.QtyAndUoM = Labor.Qty.toString();
+            Labor.CGSTPerc = this.GetTaxRateFromTaxes(Labor, 'CGST');
+            Labor.SGSTPerc = this.GetTaxRateFromTaxes(Labor, 'SGST');
+            Labor.IGSTPerc = this.GetTaxRateFromTaxes(Labor, 'IGST');
+            Labor.TaxName = this.getTaxName(Labor.TCode, TaxCodes);
+            if (LineTotal === 'AT') {
+                Labor.LineTotal = TrUtils.FixPriceValue(Labor.AfterLaborTax, DecimalsNumber);
+            } else {
+                Labor.LineTotal = TrUtils.FixPriceValue(Subtract(Labor.Amt, Labor.Disc), DecimalsNumber);
+            }
+        });
+        return LaborList;
+    }
+
+    static getTaxName(TCode: any, TaxCodes: any) {
+        let Index: any = TaxCodes.findIndex((TaxCode: any) => {
+            return Number(TCode) === TaxCode._id;
+        });
+        return (Index !== -1) ? TaxCodes[Index].Name : '';
+    }
+
+    static GetTaxAmountFromTaxes(item: any, taxCode: string) {
+        const taxes = Array.isArray(item?.Taxes) ? item.Taxes : [];
+        const matchedTaxes = taxes.filter((tax: any) => tax?.Code === taxCode);
+        if (matchedTaxes.length !== 0) {
+            return matchedTaxes.reduce((total: number, tax: any) => Add(total, tax?.Amt), 0);
+        }
+        return 0;
+    }
+
+
+    static GetTaxRateFromTaxes(item: any, taxCode: string) {
+        const taxes = Array.isArray(item?.Taxes) ? item.Taxes : [];
+        const matchedTaxes = taxes.filter((tax: any) => tax?.Code === taxCode);
+        if (matchedTaxes.length !== 0) {
+            return matchedTaxes.reduce((total: number, tax: any) => Add(total, tax?.Rate), 0);
+        }
+        return 0;
+    }
+
+    static GetTCodeFromTaxes(item: any) {
+        const taxes = Array.isArray(item?.Taxes) ? item.Taxes : [];
+        const matchedTax = taxes.find((tax: any) => !TrUtils.IsNull(tax?.TaxCodeId));
+        if (!TrUtils.IsNull(matchedTax?.TaxCodeId)) {
+            return matchedTax.TaxCodeId;
+        }
+        return item?.TCode;
+    }
+
     static GetPrintConditionsBasedOnInput(InvoicePrintData: any, IncludeGST: boolean, ConsolidateGST: boolean,
         SType: any, OriginalInvoiceData: any, IsProforma: boolean, IsBillTo: boolean) {
         InvoicePrintData.For = PayTypeEnum.Customer;
@@ -122,23 +200,32 @@ export class DebitNotePrintService {
         return InvoicePrintData;
     }
 
-    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal:string, DecimalsNumber: number) {
+    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number) {
         Items.forEach((Item: any) => {
             if (Consolidate) {
                 let AfterDiscForEach = Divide(Item.AfterPartDisc, Item.Qty);
-                let CTaxAmtPerItem = Divide(Item.CGST , Item.Qty);
-                let STaxAmtPerItem = Divide(Item.SGST , Item.Qty);
-                let ITaxAmtPerItem = Divide(Item.IGST , Item.Qty);
-                Item.UnPr = TrUtils.FixedTo(Add(AfterDiscForEach , CTaxAmtPerItem , STaxAmtPerItem , ITaxAmtPerItem), DecimalsNumber);
-            }else{
+                let CTaxAmtPerItem = Divide(Item.CGST, Item.Qty);
+                let STaxAmtPerItem = Divide(Item.SGST, Item.Qty);
+                let ITaxAmtPerItem = Divide(Item.IGST, Item.Qty);
+                Item.UnPr = TrUtils.FixedTo(Add(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
+            } else {
                 Item.UnPr = TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
             }
-            Item.CGSTAmt = TrUtils.FixPriceValue(Item.CGST, DecimalsNumber);
-            Item.SGSTAmt = TrUtils.FixPriceValue(Item.SGST, DecimalsNumber);
-            Item.IGSTAmt = TrUtils.FixPriceValue(Item.IGST, DecimalsNumber);
-            Item.CGSTPerc = PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
-            Item.SGSTPerc = PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
-            Item.IGSTPerc = PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            Item.TCode = this.GetTCodeFromTaxes(Item);
+            Item.CGSTAmt = TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Item, 'CGST'), DecimalsNumber);
+            Item.SGSTAmt = TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Item, 'SGST'), DecimalsNumber);
+            Item.IGSTAmt = TrUtils.FixPriceValue(this.GetTaxAmountFromTaxes(Item, 'IGST'), DecimalsNumber);
+            Item.QtyAndUoM = Item.Qty.toString();
+            Item.CGSTPerc = this.GetTaxRateFromTaxes(Item, 'CGST');
+            Item.SGSTPerc = this.GetTaxRateFromTaxes(Item, 'SGST');
+            Item.IGSTPerc = this.GetTaxRateFromTaxes(Item, 'IGST');
+            Item.TaxName = this.getTaxName(Item.TCode, TaxCodes);
+            // Item.CGSTAmt = TrUtils.FixPriceValue(Item.CGST, DecimalsNumber);
+            // Item.SGSTAmt = TrUtils.FixPriceValue(Item.SGST, DecimalsNumber);
+            // Item.IGSTAmt = TrUtils.FixPriceValue(Item.IGST, DecimalsNumber);
+            // Item.CGSTPerc = PrintSharedService.GetCGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            // Item.SGSTPerc = PrintSharedService.GetSGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
+            // Item.IGSTPerc = PrintSharedService.GetIGSTValueBasedOnTaxCode(Item.TCode, TaxCodes);
             if (LineTotal === 'AT') {
                 Item.LineTotal = TrUtils.FixPriceValue(Item.AfterPartTax, DecimalsNumber);
             } else {
@@ -152,7 +239,8 @@ export class DebitNotePrintService {
     }
 
     static ReverseItemsForInvoicePrint(argInvoiceData: any) {
-        argInvoiceData.Items = argInvoiceData.Items.reverse();
+         argInvoiceData.Services = argInvoiceData.Services;
+        argInvoiceData.Items = argInvoiceData.Items;
         return argInvoiceData;
     }
 
@@ -160,7 +248,7 @@ export class DebitNotePrintService {
         let PrintInfo: any[] = [];
 
         let ROLaborParts: any = {};
-
+        ROLaborParts.Services = InvoicePrintData.Services;
         ROLaborParts.Items = InvoicePrintData.Items;
 
         ROLaborParts.Sts = InvoiceStatus;

package/src/shared/transactions-pdf.service.ts

@@ -14,6 +14,7 @@ import { CreditNotePdfService } from "../accounting/credit-note/credit-note-pdf.
 import { GetInvoicePrintInfo } from "../accounting/invoice/inv-print.service";
 import { CreateInvoicePDFService } from "../accounting/invoice/invoice-pdf/invoice-pdf.service";
 import { GetInvoicePrint } from "../accounting/invoice/unified-invoice-pdf.service";
+import { DebitNotePrintService } from "../accounting/debit-note/debit-note-print.service";
 
 export function GetInvoicePDF(invoiceData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image: any = null, numberofCopies: string[] = ['Original'], withPass: boolean = false, options: any = null) {
     if (!options) {
@@ -146,6 +147,37 @@ export function GetCreditNotePDF(creditNoteData: any, entityData: any, headerCon
     return cnPrint;
 }
 
+export function GetDebitNotePDF(debitNoteData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image: any = null, numberofCopies: string[] = ['Original'], options: any = null) {
+    if (!options) {
+        options = {
+            ShowGST: (debitNoteData?.Settings?.Tax === 'TI') ? true : false,
+            ConsolidateGST: false,
+            Size: 'full',
+            MoreDiscDetails: false,
+            Orientation: 'portrait'
+        };
+    }
+    const printConfigData: any = TrUtils.ConcatObjects(
+        TrUtils.Stringify(headerConfig),
+        TrUtils.Stringify(printConfig)
+    );
+    const debitNotePrintData: any = DebitNotePrintService.GetDebitNotePrintInfo(debitNoteData, entityData, image,
+        true, false, taxCodes, false, true);
+    let dnPrint: any;
+    if (options.ConsolidateGST) {
+        dnPrint = DebitNotePrintService.GetDebitNotePrintInfo(debitNotePrintData,entityData, image,true, true, taxCodes, false, true);
+    } else {
+        debitNotePrintData.Round = TrUtils.FixedTo(debitNoteData.Round);
+        debitNotePrintData.Total = TrUtils.FixedTo(debitNoteData.Total);
+        debitNotePrintData.SubToal = TrUtils.FixedTo(debitNoteData.SubToal);
+        debitNotePrintData.TaxTotal = TrUtils.FixedTo(debitNoteData.TaxTotal);
+        dnPrint = CreateInvoicePDFService(debitNotePrintData, printConfigData, numberofCopies);
+
+    }
+
+    return dnPrint;
+}
+
 
 export function GetSalesReceiptPDF(salesReceiptData: any, entityData: any, headerConfig: any, printConfig: any, taxCodes: any, image: any = null, numberofCopies: string[] = ['Original'], withPass: boolean = false, options: any = null) {
     if (!options) {