shareneus 1.7.345 → 1.7.347

package/dist/accounting/credit-note/cn-print.service.js

@@ -66,6 +66,15 @@ class CNPrintService {
     }
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
         Items.forEach((Item) => {
+            const LinkCodes = Array.isArray(Item === null || Item === void 0 ? void 0 : Item.Link)
+                ? Item.Link
+                    .map((Link) => Link === null || Link === void 0 ? void 0 : Link.Code)
+                    .filter((Code) => !tr_utils_1.TrUtils.IsEmpty(Code))
+                    .join(', ')
+                : '';
+            if (!tr_utils_1.TrUtils.IsEmpty(LinkCodes)) {
+                Item.Desc = Item.Desc + ' (' + LinkCodes + ')';
+            }
             Item.TCode = this.GetTCodeFromTaxes(Item);
             const cgstAmount = this.GetTaxAmountFromTaxes(Item, 'CGST', Item.CGST);
             const sgstAmount = this.GetTaxAmountFromTaxes(Item, 'SGST', Item.SGST);

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

@@ -165,6 +165,15 @@ class DebitNotePrintService {
     }
     static GetItemsPrintInfo(Items, Consolidate, TaxCodes, LineTotal, DecimalsNumber) {
         Items.forEach((Item) => {
+            const LinkCodes = Array.isArray(Item === null || Item === void 0 ? void 0 : Item.Link)
+                ? Item.Link
+                    .map((Link) => Link === null || Link === void 0 ? void 0 : Link.Code)
+                    .filter((Code) => !tr_utils_1.TrUtils.IsEmpty(Code))
+                    .join(', ')
+                : '';
+            if (!tr_utils_1.TrUtils.IsEmpty(LinkCodes)) {
+                Item.Desc = Item.Desc + ' (' + LinkCodes + ')';
+            }
             if (Consolidate) {
                 let AfterDiscForEach = (0, math_operations_1.Divide)(Item.AfterPartDisc, Item.Qty);
                 let CTaxAmtPerItem = (0, math_operations_1.Divide)(this.GetTaxAmountFromTaxes(Item, 'CGST'), Item.Qty);

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

@@ -44,14 +44,12 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
         invPrint = (0, unified_invoice_pdf_service_1.GetInvoicePrint)(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);
     }
     else {
-        console.log("options", options);
         if (options.PartInvoice && options.LaborInvoice) {
             invoicePrintData.Round = tr_utils_1.TrUtils.FixedTo(invoiceData.Round);
             invoicePrintData.Total = tr_utils_1.TrUtils.FixedTo(invoiceData.Total);
             invoicePrintData.SubToal = tr_utils_1.TrUtils.FixedTo(invoiceData.SubToal);
             invoicePrintData.TaxTotal = tr_utils_1.TrUtils.FixedTo(invoiceData.TaxTotal);
         }
-        console.log("invoicePrintData", invoicePrintData);
         delete invoicePrintData.SIndTotal;
         invPrint = (0, invoice_pdf_service_1.CreateInvoicePDFService)(invoicePrintData, printConfigData, numberofCopies);
     }

package/dist/transaction-calculations/total-calculation.d.ts

@@ -3,4 +3,5 @@ export declare function TotalCalculations(items?: any[], ops?: any[], isTaxable?
  * Enhanced version with decimal places control
  */
 export declare function TotalCalculationsWithDecimals(items: any[] | undefined, ops: any[] | undefined, isTaxable: boolean | undefined, taxCodes: any[] | undefined, Adjust: number, decimalPlaces?: number): any;
+export declare function getTaxName(taxes: any): string;
 export declare function CalculateTaxSummary(items: any[], taxCodes: any[]): unknown[];

package/dist/transaction-calculations/total-calculation.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TotalCalculations = TotalCalculations;
 exports.TotalCalculationsWithDecimals = TotalCalculationsWithDecimals;
+exports.getTaxName = getTaxName;
 exports.CalculateTaxSummary = CalculateTaxSummary;
 const math_operations_1 = require("../shared/math-operations");
 const util_1 = require("../shared/util");
+const tr_utils_1 = require("../utils/tr-utils");
 /**
  * Safely handles null/undefined arrays and returns empty array
  */
@@ -340,12 +342,45 @@ function TotalCalculationsWithDecimals(items = [], ops = [], isTaxable = false,
     }
     return roundedResult;
 }
+function getTaxName(taxes) {
+    if (Array.isArray(taxes) && taxes.length > 0) {
+        const taxRates = taxes.reduce((rates, tax) => {
+            var _a, _b;
+            const code = (_a = tax === null || tax === void 0 ? void 0 : tax.Code) === null || _a === void 0 ? void 0 : _a.toString().trim().toUpperCase();
+            const rawCalcMethod = (_b = tax === null || tax === void 0 ? void 0 : tax.CalcMethod) === null || _b === void 0 ? void 0 : _b.toString().trim().toUpperCase();
+            const calcMethod = !rawCalcMethod || rawCalcMethod === 'PERCENTAGE' ? 'PERCENT' : rawCalcMethod;
+            if (['CGST', 'SGST', 'IGST'].includes(code)) {
+                rates.gstRate = (0, math_operations_1.Add)(rates.gstRate, tr_utils_1.TrUtils.SetValueToZeroIfNull(tax === null || tax === void 0 ? void 0 : tax.Rate));
+            }
+            else if (code === 'CESS' && calcMethod === 'PERCENT') {
+                rates.cessRate = (0, math_operations_1.Add)(rates.cessRate, tr_utils_1.TrUtils.SetValueToZeroIfNull(tax === null || tax === void 0 ? void 0 : tax.Rate));
+            }
+            else if (code === 'CESS' && calcMethod === 'PERUNIT') {
+                rates.cessPerUnit = (0, math_operations_1.Add)(rates.cessPerUnit, tr_utils_1.TrUtils.SetValueToZeroIfNull(tax === null || tax === void 0 ? void 0 : tax.PerUnitAmt));
+            }
+            return rates;
+        }, { gstRate: 0, cessRate: 0, cessPerUnit: 0 });
+        const taxNames = [];
+        if (!tr_utils_1.TrUtils.IsZero(taxRates.gstRate)) {
+            taxNames.push(tr_utils_1.TrUtils.FixedTo(taxRates.gstRate) + '%');
+        }
+        if (!tr_utils_1.TrUtils.IsZero(taxRates.cessRate)) {
+            taxNames.push(tr_utils_1.TrUtils.FixedTo(taxRates.cessRate) + '% CESS');
+        }
+        if (!tr_utils_1.TrUtils.IsZero(taxRates.cessPerUnit)) {
+            taxNames.push(tr_utils_1.TrUtils.FixPriceValue(taxRates.cessPerUnit) + ' CESS Per Unit');
+        }
+        return taxNames.join(' + ');
+    }
+    return '';
+}
 function CalculateTaxSummary(items, taxCodes) {
     return Object.values(items.reduce((acc, item) => {
         const taxes = getResolvedTaxes(item, taxCodes);
         if (taxes.length === 0)
             return acc;
-        const percent = (taxes.reduce((sum, tax) => (0, math_operations_1.Add)(sum, (0, util_1.GetNumber)(tax.Rate)), 0) + "%");
+        // const percent = (taxes.reduce((sum: number, tax: any) => Add(sum, GetNumber(tax.Rate)), 0) + "%");
+        const percent = getTaxName(taxes);
         const taxable = getLineNetAmount(item);
         const cgstAmount = getTaxAmountByCode(taxes, "CGST");
         const sgstAmount = getTaxAmountByCode(taxes, "SGST");

package/package.json

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

package/src/accounting/credit-note/cn-print.service.ts

@@ -11,7 +11,7 @@ export class CNPrintService {
 
     static GetCreditNotePrintInfo(OriginalInvoiceData: any, OriginalEntityData: any, image: any,
         IncludeGST: boolean, ConsolidateGST: boolean, TaxCodes: any, IsProforma: boolean) {
-       
+
         let ForInsurance: boolean = !TrUtils.IsNull(OriginalInvoiceData.BillTo.InsId);
         let InvoicePrintData: any = {};
         let argInvoiceData = TrUtils.Stringify(OriginalInvoiceData);
@@ -38,7 +38,7 @@ export class CNPrintService {
         }
         InvoicePrintData = TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
         InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes,
-             OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity.DecimalsNumber);
+            OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity.DecimalsNumber);
         argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
         InvoicePrintData.PrintInfo = this.PrepareFormatForInvoicePrint(InvoicePrintData, ROTypeEnum.Invoice, argInvoiceData.Sts);
         InvoicePrintData = this.GetFormattedProductDataForPrint(argInvoiceData, InvoicePrintData);
@@ -79,6 +79,15 @@ export class CNPrintService {
 
     static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number) {
         Items.forEach((Item: any) => {
+            const LinkCodes = Array.isArray(Item?.Link)
+                ? Item.Link
+                    .map((Link: any) => Link?.Code)
+                    .filter((Code: any) => !TrUtils.IsEmpty(Code))
+                    .join(', ')
+                : '';
+            if (!TrUtils.IsEmpty(LinkCodes)) {
+                Item.Desc = Item.Desc + ' (' + LinkCodes + ')';
+            }
             Item.TCode = this.GetTCodeFromTaxes(Item);
             const cgstAmount = this.GetTaxAmountFromTaxes(Item, 'CGST', Item.CGST);
             const sgstAmount = this.GetTaxAmountFromTaxes(Item, 'SGST', Item.SGST);
@@ -90,7 +99,7 @@ export class CNPrintService {
                 let STaxAmtPerItem = Divide(sgstAmount, Item.Qty);
                 let ITaxAmtPerItem = Divide(igstAmount, Item.Qty);
                 Item.UnPr = TrUtils.FixedTo(Add(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
-            }else{
+            } else {
                 Item.UnPr = TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
             }
             Item.CGSTAmt = TrUtils.FixPriceValue(cgstAmount, DecimalsNumber);

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

@@ -200,12 +200,21 @@ export class DebitNotePrintService {
         return InvoicePrintData;
     }
 
-    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(this.GetTaxAmountFromTaxes(Item, 'CGST'), Item.Qty);
-                let STaxAmtPerItem = Divide(this.GetTaxAmountFromTaxes(Item, 'SGST'), Item.Qty);
+    static GetItemsPrintInfo(Items: any, Consolidate: boolean, TaxCodes: any, LineTotal: string, DecimalsNumber: number) {
+        Items.forEach((Item: any) => {
+            const LinkCodes = Array.isArray(Item?.Link)
+                ? Item.Link
+                    .map((Link: any) => Link?.Code)
+                    .filter((Code: any) => !TrUtils.IsEmpty(Code))
+                    .join(', ')
+                : '';
+            if (!TrUtils.IsEmpty(LinkCodes)) {
+                Item.Desc = Item.Desc + ' (' + LinkCodes + ')';
+            }
+            if (Consolidate) {
+                let AfterDiscForEach = Divide(Item.AfterPartDisc, Item.Qty);
+                let CTaxAmtPerItem = Divide(this.GetTaxAmountFromTaxes(Item, 'CGST'), Item.Qty);
+                let STaxAmtPerItem = Divide(this.GetTaxAmountFromTaxes(Item, 'SGST'), Item.Qty);
                 let ITaxAmtPerItem = Divide(this.GetTaxAmountFromTaxes(Item, 'IGST'), Item.Qty);
                 Item.UnPr = TrUtils.FixedTo(Add(AfterDiscForEach, CTaxAmtPerItem, STaxAmtPerItem, ITaxAmtPerItem), DecimalsNumber);
             } else {

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

@@ -40,14 +40,12 @@ export function GetInvoicePDF(invoiceData: any, entityData: any, headerConfig: a
     if (options.ConsolidateGST) {
         invPrint = GetInvoicePrint(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);
     } else {
-        console.log("options", options);
         if(options.PartInvoice && options.LaborInvoice){
         invoicePrintData.Round = TrUtils.FixedTo(invoiceData.Round);
         invoicePrintData.Total = TrUtils.FixedTo(invoiceData.Total);
         invoicePrintData.SubToal = TrUtils.FixedTo(invoiceData.SubToal);
         invoicePrintData.TaxTotal = TrUtils.FixedTo(invoiceData.TaxTotal);
         }
-        console.log("invoicePrintData", invoicePrintData);
         delete invoicePrintData.SIndTotal;
         invPrint = CreateInvoicePDFService(invoicePrintData, printConfigData, numberofCopies);
     }

package/src/transaction-calculations/total-calculation.ts

@@ -1,5 +1,6 @@
 import { Add, Divide, Multiply, Subtract } from "../shared/math-operations";
 import { GetNumber } from "../shared/util";
+import { TrUtils } from "../utils/tr-utils";
 
 /**
  * Safely handles null/undefined arrays and returns empty array
@@ -427,13 +428,54 @@ export function TotalCalculationsWithDecimals(
     return roundedResult;
 }
 
+export function  getTaxName(taxes: any): string {
+    if (Array.isArray(taxes) && taxes.length > 0) {
+      const taxRates = taxes.reduce(
+        (rates: any, tax: any) => {
+          const code = tax?.Code?.toString().trim().toUpperCase();
+          const rawCalcMethod = tax?.CalcMethod?.toString().trim().toUpperCase();
+          const calcMethod = !rawCalcMethod || rawCalcMethod === 'PERCENTAGE' ? 'PERCENT' : rawCalcMethod;
+
+          if (['CGST', 'SGST', 'IGST'].includes(code)) {
+            rates.gstRate = Add(rates.gstRate, TrUtils.SetValueToZeroIfNull(tax?.Rate));
+          } else if (code === 'CESS' && calcMethod === 'PERCENT') {
+            rates.cessRate = Add(rates.cessRate, TrUtils.SetValueToZeroIfNull(tax?.Rate));
+          } else if (code === 'CESS' && calcMethod === 'PERUNIT') {
+            rates.cessPerUnit = Add(
+              rates.cessPerUnit,
+              TrUtils.SetValueToZeroIfNull(tax?.PerUnitAmt),
+            );
+          }
+
+          return rates;
+        },
+        { gstRate: 0, cessRate: 0, cessPerUnit: 0 },
+      );
+
+      const taxNames: string[] = [];
+      if (!TrUtils.IsZero(taxRates.gstRate)) {
+        taxNames.push(TrUtils.FixedTo(taxRates.gstRate) + '%');
+      }
+      if (!TrUtils.IsZero(taxRates.cessRate)) {
+        taxNames.push(TrUtils.FixedTo(taxRates.cessRate) + '% CESS');
+      }
+      if (!TrUtils.IsZero(taxRates.cessPerUnit)) {
+        taxNames.push(TrUtils.FixPriceValue(taxRates.cessPerUnit) + ' CESS Per Unit');
+      }
+
+      return taxNames.join(' + ');
+    }
+    return '';
+  }
+
 export function CalculateTaxSummary(items: any[], taxCodes: any[]) {
     return Object.values(
         items.reduce((acc: any, item: any) => {
             const taxes = getResolvedTaxes(item, taxCodes);
             if (taxes.length === 0) return acc;
 
-            const percent = (taxes.reduce((sum: number, tax: any) => Add(sum, GetNumber(tax.Rate)), 0) + "%");
+            // const percent = (taxes.reduce((sum: number, tax: any) => Add(sum, GetNumber(tax.Rate)), 0) + "%");
+            const percent = getTaxName(taxes);
             const taxable = getLineNetAmount(item);
             const cgstAmount = getTaxAmountByCode(taxes, "CGST");
             const sgstAmount = getTaxAmountByCode(taxes, "SGST");