shareneus 1.7.344 → 1.7.346

package/dist/accounting/invoice/invoice-total.service.js

@@ -268,6 +268,7 @@ class InvoiceTotalsService {
         finalTotalsData.CustPartCGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[0]);
         finalTotalsData.CustPartIGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[2]);
         finalTotalsData.CustPartSGST = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[1]);
+        finalTotalsData.CustPartCESS = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartTaxInfo[3]);
         finalTotalsData.CustLaborAfterTax = (0, math_operations_1.Add)(finalTotalsData.CustLaborITax, finalTotalsData.CustLaborTotalAfterDisc);
         finalTotalsData.CustPartAfterTax = (0, math_operations_1.Add)(finalTotalsData.CustPartITax, finalTotalsData.CustPartsTotalAfterDisc);
         finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForPartsByHSN(PartsList, TaxCodes, DecimalsNumber);
@@ -471,10 +472,10 @@ class InvoiceTotalsService {
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
                 if (Part.Ret === true) {
-                    RetTotalTaxAmt = (0, math_operations_1.Add)(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    RetTotalTaxAmt = (0, math_operations_1.Add)(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
                 else {
-                    TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
             });
         }
@@ -485,7 +486,7 @@ class InvoiceTotalsService {
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
                 if (Part.Ret === true) {
-                    RetTotalTaxAmt = (0, math_operations_1.Add)(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    RetTotalTaxAmt = (0, math_operations_1.Add)(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
             });
         }
@@ -496,7 +497,7 @@ class InvoiceTotalsService {
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
                 if (tr_utils_1.TrUtils.IsNull(Part.Ret) || Part.Ret === false) {
-                    NonRetTotalTaxAmt = (0, math_operations_1.Add)(NonRetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    NonRetTotalTaxAmt = (0, math_operations_1.Add)(NonRetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
             });
         }
@@ -582,21 +583,25 @@ class InvoiceTotalsService {
         let TotalIGSTAmt = 0;
         let TotalSGSTAmt = 0;
         let RetTotalSGSTAmt = 0;
+        let TotalCESSAmt = 0;
+        let RetTotalCESSAmt = 0;
         if (IsIndependentTax) {
             PartsList.forEach((Part) => {
                 if (Part.Ret === true) {
                     RetTotalCGSTAmt = (0, math_operations_1.Add)(RetTotalCGSTAmt, Part.CGST);
                     RetTotalSGSTAmt = (0, math_operations_1.Add)(RetTotalSGSTAmt, Part.SGST);
                     RetTotalIGSTAmt = (0, math_operations_1.Add)(RetTotalIGSTAmt, Part.IGST);
+                    RetTotalCESSAmt = (0, math_operations_1.Add)(RetTotalCESSAmt, Part.CESS);
                 }
                 else {
                     TotalCGSTAmt = (0, math_operations_1.Add)(TotalCGSTAmt, Part.CGST);
                     TotalSGSTAmt = (0, math_operations_1.Add)(TotalSGSTAmt, Part.SGST);
                     TotalIGSTAmt = (0, math_operations_1.Add)(TotalIGSTAmt, Part.IGST);
+                    TotalCESSAmt = (0, math_operations_1.Add)(TotalCESSAmt, Part.CESS);
                 }
             });
         }
-        return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt];
+        return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalCESSAmt, RetTotalCGSTAmt];
     }
     static GetTaxGroupingForPartsByHSN(Parts, TaxCodes, DecimalsNumber) {
         Parts = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(Parts), TaxCodes);

package/dist/shared/totals-section/pdf-totals.section.js

@@ -571,7 +571,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}, taxMode = ''
         ? itemsDiscount + servicesDiscount + overallDiscount
         : (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Disc', 'Discount', 'TotDisc']);
     const roundOff = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Round', 'RoundOff']);
-    const taxFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal', 'CustItemITax']);
+    const taxFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal', 'CustItemITax', 'CustPartITax']);
     const totalTaxValue = taxFromInvoice !== 0 ? taxFromInvoice : totalTax;
     const returnTotal = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.RetTotal);
     const finalTotalRaw = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.FinalTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Total, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.GrandTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.NetTotal);

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.344",
+  "version": "1.7.346",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/accounting/invoice/invoice-total.service.ts

@@ -335,6 +335,7 @@ export class InvoiceTotalsService {
         finalTotalsData.CustPartCGST = TrUtils.SetValueToZeroIfNull(PartTaxInfo[0]);
         finalTotalsData.CustPartIGST = TrUtils.SetValueToZeroIfNull(PartTaxInfo[2]);
         finalTotalsData.CustPartSGST = TrUtils.SetValueToZeroIfNull(PartTaxInfo[1]);
+        finalTotalsData.CustPartCESS = TrUtils.SetValueToZeroIfNull(PartTaxInfo[3]);
 
         finalTotalsData.CustLaborAfterTax = Add(finalTotalsData.CustLaborITax, finalTotalsData.CustLaborTotalAfterDisc);
         finalTotalsData.CustPartAfterTax = Add(finalTotalsData.CustPartITax, finalTotalsData.CustPartsTotalAfterDisc);
@@ -573,9 +574,9 @@ export class InvoiceTotalsService {
         if (IsIndependentTax) {
             PartsList.forEach((Part: any) => {
                 if (Part.Ret === true) {
-                    RetTotalTaxAmt = Add(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    RetTotalTaxAmt = Add(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 } else {
-                    TotalTaxAmt = Add(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    TotalTaxAmt = Add(TotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
             });
         }
@@ -587,7 +588,7 @@ export class InvoiceTotalsService {
         if (IsIndependentTax) {
             PartsList.forEach((Part: any) => {
                 if (Part.Ret === true) {
-                    RetTotalTaxAmt = Add(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    RetTotalTaxAmt = Add(RetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
             });
         }
@@ -599,7 +600,7 @@ export class InvoiceTotalsService {
         if (IsIndependentTax) {
             PartsList.forEach((Part: any) => {
                 if (TrUtils.IsNull(Part.Ret) || Part.Ret === false) {
-                    NonRetTotalTaxAmt = Add(NonRetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST);
+                    NonRetTotalTaxAmt = Add(NonRetTotalTaxAmt, Part.CGST, Part.SGST, Part.IGST, Part.CESS);
                 }
             });
         }
@@ -694,20 +695,24 @@ export class InvoiceTotalsService {
         let TotalIGSTAmt: number = 0;
         let TotalSGSTAmt: number = 0;
         let RetTotalSGSTAmt: number = 0;
+        let TotalCESSAmt: number = 0;
+        let RetTotalCESSAmt: number = 0;
         if (IsIndependentTax) {
             PartsList.forEach((Part: any) => {
                 if (Part.Ret === true) {
                     RetTotalCGSTAmt = Add(RetTotalCGSTAmt, Part.CGST);
                     RetTotalSGSTAmt = Add(RetTotalSGSTAmt, Part.SGST);
                     RetTotalIGSTAmt = Add(RetTotalIGSTAmt, Part.IGST);
+                    RetTotalCESSAmt = Add(RetTotalCESSAmt, Part.CESS);
                 } else {
                     TotalCGSTAmt = Add(TotalCGSTAmt, Part.CGST);
                     TotalSGSTAmt = Add(TotalSGSTAmt, Part.SGST);
                     TotalIGSTAmt = Add(TotalIGSTAmt, Part.IGST);
+                    TotalCESSAmt = Add(TotalCESSAmt, Part.CESS);
                 }
             });
         }
-        return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt];
+        return [TotalCGSTAmt, TotalSGSTAmt, TotalIGSTAmt, TotalCESSAmt, RetTotalCGSTAmt];
     }
 
     static GetTaxGroupingForPartsByHSN(Parts: any, TaxCodes: any, DecimalsNumber: any) {

package/src/shared/totals-section/pdf-totals.section.ts

@@ -693,7 +693,7 @@ function resolveTotals(invoiceData: any, totalTax: number, printConfigData: any
         ? itemsDiscount + servicesDiscount + overallDiscount
         : readNumericValue(invoiceData, ['Disc', 'Discount', 'TotDisc']);
     const roundOff = readNumericValue(invoiceData, ['Round', 'RoundOff']);
-    const taxFromInvoice = readNumericValue(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal', 'CustItemITax']);
+    const taxFromInvoice = readNumericValue(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal', 'CustItemITax', 'CustPartITax']);
     const totalTaxValue = taxFromInvoice !== 0 ? taxFromInvoice : totalTax;
     const returnTotal = firstValue(invoiceData?.RetTotal);
     const finalTotalRaw = firstValue(invoiceData?.FinalTotal, invoiceData?.Total, invoiceData?.GrandTotal, invoiceData?.NetTotal);

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");